Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-11-22Merge branch ↵Rémy Coutable
'23532-define-common-helper-for-describe-pagination-params-in-api' into 'master' Add concern for reuse pagination params declaration in API Closes #23532 See merge request !7646
2016-11-22Merge branch 'zj-mattermost-command-help-message' into 'master' Fatih Acet
Add help section for MM commands ## What should this MR do Check @pedroms' design for the Mattermost service screen: https://gitlab.com/gitlab-org/gitlab-ce/issues/22540 Now this has to be implemented, I've created a clean canvas for you, @lbennett, to draw on. ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - Tests - [x] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if it does - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !7558
2016-11-22Merge branch 'fix/ci-linter-undefined-error' into 'master' Kamil Trzciński
Fix undefined error in CI linter ## What does this MR do? This MR fixes undefined error in CI linter. ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [x] Tests added for this feature/bug ## What are the relevant issue numbers? Closes #24759 See merge request !7650
2016-11-22Add Changelog entry for CI linter validation fixGrzegorz Bizon
2016-11-22Merge branch 'remove-require-from-services' into 'master' Robert Speicher
Remove unnecessary require_relative calls from service classes. See merge request !7601
2016-11-22Remove unnecessary require_relative calls from service classesSemyon Pupkov
Rails by default use autoload for all dirs from app folder. require_relative not needed. See ActiveSupport::Dependencies.autoload_paths
2016-11-22Define common helper for describe pagination params in apiSemyon Pupkov
2016-11-22Merge branch '18136-ui-for-restricting-global-visibility-levels-is-unclear' ↵Jacob Schatz
into 'master' Restricted visibility buttons to checkboxes ## What does this MR do? Changes the `Restricted visibility levels` settings to use checkboxes instead of a button group. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? ## Screenshots (if relevant) ![Screen_Shot_2016-11-14_at_19.25.48](/uploads/0c6ee415ee0c89c0a7e3ffd98f88df71/Screen_Shot_2016-11-14_at_19.25.48.png) ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if it does - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #18136 See merge request !7463
2016-11-22Merge branch '23449-cycle-analytics-2-frontend' into 'master' Jacob Schatz
Cycle analytics second iteration frontend ## Are there points in the code the reviewer needs to double check? Mostly typos and code guidelines. ## Why was this MR needed? This implements the frontend part of !6859 for #23449 ## Screenshots **Initial view** ![Screen_Shot_2016-11-21_at_5.28.43_PM](/uploads/ff9cfa9c9d6c2da28c24e03e384f89af/Screen_Shot_2016-11-21_at_5.28.43_PM.png) **Cycle Analytics with data** ![Screen_Shot_2016-11-21_at_2.09.24_PM](/uploads/18d9786c090bdd554cf786c879543302/Screen_Shot_2016-11-21_at_2.09.24_PM.png) **User doesn't have access for a stage** ![Screen_Shot_2016-11-21_at_2.11.01_PM](/uploads/d1ea76a63f2de2224954b5f40038c488/Screen_Shot_2016-11-21_at_2.11.01_PM.png) ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if it does - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #23449 See merge request !7366
2016-11-21Merge branch 'dz-fix-500-group-git' into 'master' Sean McGivern
Fix 500 error when group name ends with git Closes https://gitlab.com/gitlab-com/support-forum/issues/1298 Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/24742 See merge request !7630
2016-11-21Merge branch 'chatops-deploy-command' into 'master' Rémy Coutable
Add deploy chat command This adds a new ChatOps command: ``` /trigger deploy <environment> to <environment> ``` See merge request !7619
2016-11-21Merge branch 'feature/send-registry-address-with-build-payload' into 'master' Kamil Trzciński
Send registry address with build payload ## What does this MR do? Adds `registry_url` as a part of a build payload, when sending a response to a GitLab Runner which requested a new build. ## Are there points in the code the reviewer needs to double check? Change in `lib/ci/api/entities.rb`. ## Why was this MR needed? This is one of the steps needed to add support for private/protected registries hosted with GitLab CE/EE. ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [x] API support added - Tests - [x] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if it does - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Related to gitlab-org/gitlab-ci-multi-runner#1828, gitlab-org/gitlab-ci-multi-runner!386, gitlab-org/gitlab-ci-multi-runner#1434 See merge request !7474
2016-11-21Merge branch '24499-fix-activity-autoload-on-large-viewports' into 'master' Fatih Acet
Resolve "Activity entries are not loaded fully to cover full window's height" ## What does this MR do? Fixes a bug in which a browser window large enough to encompass the default number of items in an auto-loading endless-scroll list could not trigger the loading of additional items. ## Are there points in the code the reviewer needs to double check? I refactored activities.js and pager.js into es6 syntax while I was investigating the issue. No changes were made other than some es6 flourishes and eslint conformity, so nothing should be effected, but perhaps best to double check other pages which utilize these scripts. ## Screenshots (if relevant) ![endless-scroll-fixed](/uploads/b672b606826af745528c209ab6cfe95c/endless-scroll-fixed.gif) ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - Tests - [x] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if it does - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #24499 See merge request !7608
2016-11-21Merge branch 'hide-empty-merge-request-diffs' into 'master' Sean McGivern
Fix errors happening when source branch of merge request is removed and then restored See merge request !7568
2016-11-21Removed button styling from restricted visibility levels and added ↵Luke "Jared" Bennett
checkboxes with icons Review changes
2016-11-21Fix 500 error when group name ends with gitDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-11-21Add CHANGELOG fileAlfredo Sumaran
2016-11-21Merge branch 'smarter-cache-invalidation' into 'master' Sean McGivern
Smarter cache invalidation Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/23550 See merge request !7360
2016-11-21Merge branch 'issue_24303' into 'master' Sean McGivern
Allow JIRA references for project snippets closes #24303 See merge request !7541
2016-11-21Improve the mattermost help boxZ.J. van de Weg
Also added tests, and moved the slack test to a better location.
2016-11-21Introduce deploy command that allows to start deployment from one ↵Kamil Trzcinski
environment to second one
2016-11-21Merge branch 'fix/cycle-analytics-permissions' into 'master' Sean McGivern
Added permissions per stage to cycle analytics endpoint See merge request !7613
2016-11-21Merge branch ↵Kamil Trzciński
'24616-mr-shows-the-build-for-this-merge-request-failed-although-builds-still-running' into 'master' Resolve "MR shows "The build for this merge request failed" although builds still running" Closes #24616 See merge request !7579
2016-11-21Allow JIRA references for project snippetsFelipe Artur
2016-11-21Added CHANGELOG entry for !7360Yorick Peterse
2016-11-21Send credentials array with build dataTomasz Maczukin
2016-11-21Merge branch 'fix/do-not-add-todo-when-build-allowed-to-fail' into 'master' Kamil Trzciński
Do not create TODO when build is allowed to fail ## What does this MR do? Do not create a TODO when build that failed is allowed to fail. ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - Tests - [x] Added for this feature/bug - [ ] All builds are passing ## What are the relevant issue numbers? Closes #22280 See merge request !7618
2016-11-21Fix a wrong "The build for this merge request failed" messageRémy Coutable
Also allow merge request to be merged with skipped pipeline and the "only allow merge when pipeline is green" feature enabled Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-11-21Add Changelog entry for failed builds todos fixGrzegorz Bizon
2016-11-21Hide empty merge request diffs when comparing versionsAdam Niedzielski
2016-11-21Revert "Do not create a MergeRequestDiff record when source branch is deleted"Adam Niedzielski
This reverts commit f913170e2f76ef44800f0272cb7fb40b9d6709ee.
2016-11-21Merge branch 'dz-fix-group-name-dot' into 'master' Rémy Coutable
Add constraints to group id in routing To prevent 404 when visit page like https://gitlab.com/groups/group.with.dot/activity Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/24622 See merge request !7614
2016-11-21Merge branch 'create-pipeline-endpoint' into 'master' Rémy Coutable
Add API endpoint for creating a pipeline Fixes #23468 See merge request !7209
2016-11-21Merge branch 'issue_5541' into 'master' Sean McGivern
Allow to block JIRA events for commits and merge requests implements #5541 See merge request !7469
2016-11-21Merge branch 'remove-unnecessary-self-from-user-model' into 'master' Rémy Coutable
Remove unnecessary self from user model self keyword nod needed. Code is more clean and understandable. https://github.com/bbatsov/ruby-style-guide#no-self-unless-required See merge request !7551
2016-11-21Fix 404 on some group pages when name contains dotDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-11-21Added permissions per stage to cycle analytics endpointJames Lopez
2016-11-21Merge branch '24627-fix-bad-mr-error-message' into 'master' Rémy Coutable
Fixes regression causing an error message to appear when user first enters the Merge Request form. Closes #24627 See merge request !7599
2016-11-20add CHANGELOG entry for !7608Mike Greiling
2016-11-19Merge branch '22539-display-folders' into 'master' Fatih Acet
Resolve "Display "folders" for environments" ## What does this MR do? Adds the ability to show the grouped environments inside "folders". Adds several reusable vue components in order to accomplish the recursive tree data structure presented. For the individual components, Jasmine tests were added. For the ones that depend of an API response, rspec tests are used. ## Screenshots (if relevant) ![Screen_Shot_2016-11-16_at_02.00.13](/uploads/1278012c8639b999b53f080728d283e1/Screen_Shot_2016-11-16_at_02.00.13.png) ![Screen_Shot_2016-11-16_at_02.00.25](/uploads/a3d65416ddb553e1b8f0f4c8897a75dc/Screen_Shot_2016-11-16_at_02.00.25.png) ![Screen_Shot_2016-10-17_at_16.08.50](/uploads/af63efe1d2cbd5fc069408622ef4b607/Screen_Shot_2016-10-17_at_16.08.50.png) ![environments](/uploads/b5a1801766d82ab176fc60f96b6968cb/environments.gif) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [x] Added for this feature/bug - [ ] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if it does - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #22539 See merge request !7015
2016-11-19Fix regression in Merge request formAlex Sanford
Merge request !7163 caused an error message to appear on the Merge Request form when it was first loaded by the user. This commit fixes that regression bug.
2016-11-19Merge branch 'fix/require-build-script-configuration-entry' into 'master' Kamil Trzciński
Make job script a required configuration entry ## What does this MR do? This MR makes a job script a required configuration entry. ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - Tests - [x] Added for this feature/bug - [x] All builds are passing ## What are the relevant issue numbers? Closes #24575 See merge request !7566
2016-11-19Merge branch 'fix-slack-pipeline-event' into 'master' Kamil Trzciński
Fix pipeline author for Slack and use pipeline id for pipeline link [Context](https://gitlab.slack.com/archives/runner-builds/p1479238493000018) Pipeline Slack message: > gitlab-org/gitlab-ci-multi-runner: Pipeline 8bed2a3b of fix/handle-failed-state-while-patching-trace branch by failed in 1389 seconds Quotes: > @godfat Take a look at these notifications, they seems to be missing author and should probably use Pipeline ID instead of SHA See merge request !7506
2016-11-19Merge branch 'add-logging-to-rack-attack' into 'master' Douwe Maan
Add logging for rack attack events Patch for issue: https://gitlab.com/gitlab-org/gitlab-ce/issues/15612 and partial patch for https://gitlab.com/gitlab-com/support/issues/119. Also related: https://gitlab.com/gitlab-org/gitlab-ce/issues/22527 Adds logging for throttle and blacklist rack attack events to the production log. @stanhu @MrChrisW See merge request !7585
2016-11-19Merge branch 'fix-Build-timeFor' into 'master' Alfredo Sumaran
Fix typo in Build page JavaScript ## What does this MR do? fixes #24614 See merge request !7563
2016-11-19Remove unnecessary self from user modelSemyon Pupkov
2016-11-19Add api endpoint for creating a pipelineIdo Leibovich
Add a new endpoint in the new API for creating a new pipeline, and return the details of that pipeline.
2016-11-18Merge branch '24070-project-margins' into 'master' Annabel Dunstone Gray
Resolve "Margins look weird in Project page with pinned sidebar in project stats bar" ## What does this MR do? Fixes the margins of the project buttons in small screens and when the sidebar is pinned. Both top and left margin were not aligned with the rest of the page. ## Screenshots (if relevant) ![Screen_Shot_2016-11-18_at_16.39.01](/uploads/9213cbbfba5fd4a57716c09d1807d2ea/Screen_Shot_2016-11-18_at_16.39.01.png) ![margins](/uploads/86bfad4fb48e67224e8bc8f9b8e38520/margins.gif) ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if it does - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #24070 See merge request !7580
2016-11-18Add logging for rack attack eventsBrian Neel
2016-11-18Merge branch 'feature/precalculate-authorized-projects' into 'master' Douwe Maan
Precalculate authorized projects in database ## What does this MR do? It caches user's authorized projects in database instead of using multiple unions, which should simplify and speed-up things since this operation (getting authorized projects) is used a lot. ## Are there points in the code the reviewer needs to double check? Did we miss a scenario where we need to refresh the list of projects? ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] ~~[Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)~~ - [ ] ~~API support added~~ - Tests - [x] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if it does - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? #23150 See merge request !6839