summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Improve readability and add specs for label filteringsh-fix-labels-move-issueStan Hu2016-10-242-10/+21
|
* Improve label filtering implementationStan Hu2016-10-241-10/+4
|
* Allow the use of params[:name] when filtering labelsStan Hu2016-10-242-3/+22
|
* Fix Rubocop offenses in issue move specsGrzegorz Bizon2016-10-241-3/+3
|
* Add spec in Issues::MoveService to fix label assignment regressionStan Hu2016-10-241-5/+26
|
* Fix bug where labels would be assigned to issues that were movedStan Hu2016-10-243-0/+11
| | | | | | | | | | If you attempt to move an issue from one project to another and leave labels blank, LabelsFinder would assign all labels in the new project to that issue. The issue is that :title is passed along to the Finder, but since it appears empty no filtering is done. As a result, all labels in the group are returned. This fix handles that case. Closes #23668
* Merge branch 'enable-scss-lint-space-after-variable-colon' into 'master' Annabel Dunstone Gray2016-10-244-89/+89
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable SpaceAfterVariableColon in scss-lint ## What does this MR do? Enables `SpaceAfterVariableColon` in `.scss-lint.yml` ## Are there points in the code the reviewer needs to double check? None ## Why was this MR needed? Improve SCSS maintainability and consistency ## Screenshots (if relevant) None ## Does this MR meet the acceptance criteria? - 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? #23485 See merge request !7080
| * Enable SpaceAfterVariableColon in scss-lintenable-scss-lint-space-after-variable-colonClement Ho2016-10-244-89/+89
| |
* | Merge branch 'enable-scss-lint-space-around-operator' into 'master' Annabel Dunstone Gray2016-10-243-3/+3
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable SpaceAroundOperator in scss-lint ## What does this MR do? Enables `SpaceAroundOperator` in .`scss-lint.yml` ## Are there points in the code the reviewer needs to double check? None ## Why was this MR needed? Improve SCSS maintainability and consistency ## Screenshots (if relevant) None ## Does this MR meet the acceptance criteria? - 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? #23485 See merge request !7078
| * | Enable SpaceAroundOperator in scss-lintClement Ho2016-10-243-3/+3
| |/
* | Merge branch 'enable-scss-lint-trailing-whitespace' into 'master' Annabel Dunstone Gray2016-10-2412-26/+26
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable trailingWhitespace in scss-lint ## What does this MR do? Enables `trailingWhitespace` in `.scss-lint.yml` ## Are there points in the code the reviewer needs to double check? None ## Why was this MR needed? Improve SCSS maintainability and consistency ## Screenshots (if relevant) None ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) entry 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? #23485 See merge request !7077
| * | Enable trailingWhitespace in scss-lintClement Ho2016-10-2412-26/+26
| |/
* | Merge branch '23325-pipeline-graph-hidden' into 'master' Alfredo Sumaran2016-10-243-0/+5
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix pipeline graph hidden on commit and mr pages ## What does this MR do? Dynamically invokes `new gl.Pipelines();` when an MR `builds` tab is clicked. Dispatches `new gl.Pipelines();` on a `commit#builds` page. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? The pipeline graph was hidden on commit and mr pages ## Screenshots (if relevant) Commit page: ![Screen_Shot_2016-10-14_at_18.16.18](/uploads/ee11dea0825d1489dc167292e16c8f41/Screen_Shot_2016-10-14_at_18.16.18.png) MR: ![Screen_Shot_2016-10-14_at_18.16.39](/uploads/602c2fce2397c799bedb757bfd3010af/Screen_Shot_2016-10-14_at_18.16.39.png) ## Does this MR meet the acceptance criteria? - [ ] [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 - [ ] 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? Closes #23325 See merge request !6895
| * | invoked the pipelines class when builds are dynamically loaded and ↵Luke Bennett2016-10-243-0/+5
| |/ | | | | | | dispatched for commit builds page
* | Merge branch '23665-build-sidebar-has-extra-space-on-firefox' into 'master' Alfredo Sumaran2016-10-242-1/+2
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Build sidebar has extra space on Firefox" ## What does this MR do? Accounts for the deprecated use of `document.body.scrollTop` on FF that was breaking the `translateSidebar` method. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? ## Screenshots (if relevant) ![2016-10-22_23.16.31](/uploads/496810a9bb4fa4c3762023ff175572cb/2016-10-22_23.16.31.gif) ## Does this MR meet the acceptance criteria? - [ ] [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 - [ ] 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? Closes #23665 See merge request !7060
| * Update CHANGELOG23665-build-sidebar-has-extra-space-on-firefoxAlfredo Sumaran2016-10-241-0/+1
| |
| * Replaced deprecated use of document.body.scrollTopLuke Bennett2016-10-241-1/+1
|/
* Merge branch 'fix-container-registry-project-settings' into 'master' Sean McGivern2016-10-241-1/+1
|\ | | | | | | | | Fixes #23575 See merge request !7037
| * Fix typo in project settings that prevents users from enabling container ↵fix-container-registry-project-settingsAdam Niedzielski2016-10-241-1/+1
| | | | | | | | | | | | registry. Fixes #23575.
* | Merge branch 'grapify-labels-api' into 'master' Rémy Coutable2016-10-242-56/+41
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Grapify the labels API Add the Grape-DSL to the labels API. Since the input validation messages are checked, two tests are modified slightly. ## What are the relevant issue numbers? Related to #22928 See merge request !7070
| * | Grapify the labels APIgrapify-labels-apiRobert Schilling2016-10-242-56/+41
| | |
* | | Merge branch 'sign_in_forgot_password' into 'master' Fatih Acet2016-10-243-1/+9
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix sign in page Forgot your password link overlap ## What does this MR do? Fix Sign in page 'Forgot your password?' link overlaping on medium-large screens ## Why was this MR needed? Overlapping text as per #23630 ## Screenshots (if relevant) ![sign-in-page](/uploads/a94084297e447fe58f0af6f199e74248/sign-in-page.png) ## 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 - [ ] 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? #23630 See merge request !7059
| * \ \ Merge branch 'master' into sign_in_forgot_passwordBernardo Anderson2016-10-2215-42/+209
| |\ \ \
| * | | | Add empty line before media queryBernardo Anderson2016-10-221-0/+1
| | | | |
| * | | | Fix sign in page Forgot your password link overlapBernardo Anderson2016-10-223-1/+8
| | | | |
* | | | | Merge branch 'grapify-builds-api' into 'master' Rémy Coutable2016-10-241-83/+79
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Grapify builds API ## What does this MR do? Add the Grape-DSL to the builds API. ## What are the relevant issue numbers? Related to #22928 The artifacts API directly downloads a file rather then returning a JSON entity. See merge request !6877
| * | | | | Grapify builds APIgrapify-builds-apiRobert Schilling2016-10-241-83/+79
| | |_|/ / | |/| | |
* | | | | Merge branch 'docs/fix-link-to-monitoring' into 'master' Achilleas Pipinellis2016-10-245-5/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix old monitoring links to point to the new location See merge request !7075
| * | | | | Fix old monitoring links to point to the new locationdocs/fix-link-to-monitoringAchilleas Pipinellis2016-10-245-5/+5
| | | | | |
* | | | | | Merge branch 'backup-docker-docs' into 'master' Achilleas Pipinellis2016-10-241-0/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add an example of how to run the backups when using docker to the docs ## What are the relevant issue numbers? https://gitlab.com/gitlab-org/omnibus-gitlab/issues/1616 See merge request !7046
| * | | | | | Add an example of how to run the backups when using docker to the docsbackup-docker-docsDJ Mountney2016-10-211-0/+4
| | | | | | |
* | | | | | | Merge branch 'luishgo/gitlab-ce-18898-filter-commits-per-path'Rémy Coutable2016-10-243-0/+14
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | | | | | | | See merge request !4814.
| * | | | | | Added path parameter to Commits APILuis HGO2016-10-243-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | Merge branch 'cache-clear-build-fix' into 'master' Douwe Maan2016-10-241-0/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixes build with cache:clear issue ## What does this MR do? Fixes a build issue that was probably introduced in commit 0c0caede. See merge request !7074
| * | | | | | fixes build with cache:clear issuetiagonbotelho2016-10-241-0/+1
| | | | | | |
* | | | | | | Merge branch 'security-fix-leaking-namespace-name' into 'security' Douwe Maan2016-10-242-4/+4
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Check that user has access to a given namespace to prevent leaking namespace names. See merge request !2009
* | | | | | Merge branch 'barthc/gitlab-ce-prevent_authored_vote_from_notes'Rémy Coutable2016-10-243-4/+18
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | See merge request !6544.
| * | | | | | Fix authored vote from notesbarthc2016-10-243-4/+18
| | |/ / / / | |/| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | Merge branch ↵Dmitriy Zaporozhets2016-10-2411-30/+124
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'yesbabyyes/gitlab-ce-22967-adding-zero-users-to-group-reports-success' Merge request - https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6979
| * | | | | | Update project member controller to match recent master logicyesbabyyes/gitlab-ce-22967-adding-zero-users-to-group-reports-successDmitriy Zaporozhets2016-10-241-9/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | Add parentheses around return redirect_to methodDmitriy Zaporozhets2016-10-242-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | Trigger change even in select2 test helper to produce production-like behaviourDmitriy Zaporozhets2016-10-241-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | Refactor js that disable form submit if no members selectedDmitriy Zaporozhets2016-10-243-6/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | Improve create project member test at project_members_controller_specDmitriy Zaporozhets2016-10-241-25/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | Move changelog item to 8.14Dmitriy Zaporozhets2016-10-241-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | Refactor create member tests from group_members_controller_specDmitriy Zaporozhets2016-10-241-41/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | Refactor groups/projects members controllerDmitriy Zaporozhets2016-10-242-9/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | Gracefully handle adding of no users to projects and groupsLinus G Thiel2016-10-248-3/+130
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Disable {project, group} members submit button if no users If no users are selected, the submit button should be disabled. - Alert user when no users were added to {project, group}. When no users were selected for adding, an alert message is flashed that no users were added. - Also, this commit adds a feedback when users were actually added to a project, in symmetry with how group members are handled. Closes #22967, #23270.
| * | | | | | Revert "Change "Group#web_url" to return "/groups/twitter" rather than ↵Dmitriy Zaporozhets2016-10-243-25/+16
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "/twitter"." This reverts commit c81ff152e08d58c13efbd50c40dd2e083ac65083.
* | | | | | Merge branch '21513-fix-branch-protection-api' into 'master' Douwe Maan2016-10-246-100/+220
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix branch protection API. ## What does this MR do? - Fixes the branch protection API. - Closes #21513 - EE Merge Request: gitlab-org/gitlab-ee!718 ## Tasks - [ ] #21513 !6215 Protected branches API bug - [x] Investigate - [x] Test + Fix - [x] Changelog - [x] MR - [x] Wait for build to pass - [x] Review - [x] Check for EE conflicts - [x] Create EE MR - [x] Refactor + Fix - [x] Rebase EE MR against EE master - [x] Wait for builds to pass - [x] Assign to dbalexandre/douwe - [x] Implement latest review comments - [x] Wait for Douwe's review - [x] Implement changes - [x] Port changes to EE MR - [x] Assign both back to Douwe - [ ] Wait for merge - [ ] Merge gitlab-org/gitlab-ee!718 See merge request !6215