summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Remove the custom Resque setup for `migration paths` CI jobtroubleshoot-migration-paths-failureRémy Coutable2016-10-241-2/+1
| | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* 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
| * | | | | | Implement third round of review comments from @DouweM.21513-fix-branch-protection-apiTimothy Andrew2016-10-242-13/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract/mutate `params` in the `execute` method of the API services, rather than in `initialize`.
| * | | | | | Implement second round of review comments from @DouweM.Timothy Andrew2016-10-243-14/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Pass `developers_and_merge` and `developers_can_push` in `params` instead of using keyword arguments. - Refactor a slightly complex boolean check to a simple `nil?` check.
| * | | | | | Implement review comments from @DouweM.Timothy Andrew2016-10-243-14/+19
| | | | | | |
| * | | | | | Implement review comments from @dbalexandre.Timothy Andrew2016-10-241-37/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Don't have any EE-only code in CE. Ok to have CE-only code in EE. 2. Use `case` instead of `if/elsif`
| * | | | | | Update CHANGELOGTimothy Andrew2016-10-241-0/+1
| | | | | | |
| * | | | | | Fix branch protection API.Timothy Andrew2016-10-245-98/+253
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Previously, we were not removing existing access levels before creating new ones. This is not a problem for EE, but _is_ for CE, since we restrict the number of access levels in CE to 1. 2. The correct approach is: CE -> delete all access levels before updating a protected branch EE -> delete developer access levels if "developers_can_{merge,push}" is switched off 3. The dispatch is performed by checking if a "length: 1" validation is present on the access levels or not. 4. Another source of problems was that we didn't put multiple queries in a transaction. If the `destroy_all` passes, but the `update` fails, we should have a rollback. 5. Modifying the API to provide users direct access to CRUD access levels will make things a lot simpler. 6. Create `create/update` services separately for this API, which perform the necessary data translation, before calling the regular `create/update` services. The translation code was getting too large for the API endpoint itself, so this move makes sense.
* | | | | | Merge branch 'dz-fix-constrainer-for-relative-url' into 'master' Sean McGivern2016-10-243-1/+23
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix constrainers for relative url Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/23675 See merge request !7071
| * | | | | | Add changelog item for groups 404 on relative urldz-fix-constrainer-for-relative-urlDmitriy Zaporozhets2016-10-241-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | Add relative url support to routing contrainersDmitriy Zaporozhets2016-10-242-1/+22
| | |/ / / / | |/| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | Merge branch 'issue-boards-user-url' into 'master' Fatih Acet2016-10-242-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use root_url for issue boards user link ## What does this MR do? Rather than using `/` as the root path, it now correctly sends the root URL from Rails to prevent errors with installations in subdirectories. ## What are the relevant issue numbers? Closes #23556 See merge request !7018
| * | | | | | Use root_url for issue boards user linkPhil Hughes2016-10-242-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #23556
* | | | | | | Merge branch 'remove-callback' into 'master' Rémy Coutable2016-10-243-4/+8
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This MR removes AR before_validation callback in favor setter. ## Why was this MR needed? Because setters is good practice to normalize model attributes instead AR callbacks. Because new object should be valid right after initialization. If it MR interested I can try to find other places where we can use setters. See merge request !6763
| * | | | | | | refactor(email): use setter method instead AR callbacksSemyon Pupkov2016-10-233-4/+8
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch '#22609' into 'master' Rémy Coutable2016-10-245-4/+0
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moves `spec/mailers/shared/notify.rb` to `spec/support/notify_shared_examples.rb` Closes #22609 See merge request !6605
| * | | | | | Move spec/mailers/shared/notify.rb to spec/supportJared Ready2016-10-225-4/+0
| | | | | | |
* | | | | | | Merge remote-tracking branch 'origin/sh-flush-cache-after-import'Yorick Peterse2016-10-243-28/+21
|\ \ \ \ \ \ \