summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix test failure by accessing Content-Type header directly.cs-upgrade-deviseConnor Shea2016-09-271-1/+1
|
* Upgrade Devise from 4.1.1 to 4.2.0.Connor Shea2016-09-2712-14/+14
| | | | | | | | This fixes an issue with Rails 5 and brings us up-to-date with the latest Devise release. This also replaces the deprecated Devise::TestHelpers with Devise::Test::ControllerHelpers. Changelog: https://github.com/plataformatec/devise/blob/v4.2.0/CHANGELOG.md#420---2016-07-01
* Merge branch 'is-v-cloak-causing-master-to-fail-pls-no-why' into 'master' Jacob Schatz2016-09-281-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed to v-cloak attr to hash rocket and string 'true' ## What does this MR do? Changed to v-cloak attr to hash rocket and string 'true' ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? Maybe it's killing `master`? :confused: ## Screenshots (if relevant) ## 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 you do - 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? See merge request !6553
| * Remove test for Ruby 2.1.Jacob Schatz2016-09-271-2/+2
| |
| * Run Ruby 2.1 tests on non-master branches too.is-v-cloak-causing-master-to-fail-pls-no-whyConnor Shea2016-09-271-2/+2
| |
| * Changed to hash rocket and string 'true'Luke Bennett2016-09-271-1/+1
|/
* Merge branch 'label-update-check-new' into 'master' Jacob Schatz2016-09-274-8/+35
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Send ajax request for label update only if they are changed ## What does this MR do? At the moment we send requests to update the labels on issue even if nothing has been changed. This fixes that and only sends requests when something has actually been changed. The code gets the initial selected values based on the inputs & then compares that to the selected values when submitting. If they are equal, then no request is sent. ## What are the relevant issue numbers? Closes #19472 See merge request !5071
| * Send ajax request for label update only if they are changed (#19472 !5071)label-update-check-newPhil Hughes2016-09-274-8/+35
| |
* | Merge branch 'fix/optimize-github-importer-for-speed-and-memory' into 'master' Yorick Peterse2016-09-275-78/+87
|\ \ | | | | | | | | | | | | Optimize GitHub importer for speed and memory See merge request !6552
| * | Call after_remove_branch only once after importing all GitHub PRsfix/optimize-github-importer-for-speed-and-memoryAhmad Sherif2016-09-272-2/+3
| | |
| * | Import all GitHub comments after importing issues and PRsAhmad Sherif2016-09-272-12/+17
| | |
| * | Speed up label-applying process for GitHub importingAhmad Sherif2016-09-272-14/+15
| | | | | | | | | | | | | | | | | | | | | * No need to re-fetch issues from GH to read their labels, the labels are already there from the index request. * No need to look up labels on the database for every application, so we cache them.
| * | Process each page of GitHub resources instead of concating them then processingAhmad Sherif2016-09-273-56/+58
| | | | | | | | | | | | | | | This should avoid having large memory growth when importing GitHub repos with lots of resources.
* | | Merge branch '22472-wrong-table-head' into 'master' Fatih Acet2016-09-271-7/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix pipelines table headers ## What does this MR do? Removed stages loop for a single 'Stages' header. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? The headers were messing the table up. Note the redundant headers and squished cells. ![Screen_Shot_2016-09-27_at_14.40.51](/uploads/331b08c30a4af59cefc460ab4f3c2a61/Screen_Shot_2016-09-27_at_14.40.51.png) ## Screenshots (if relevant) ![Screen_Shot_2016-09-27_at_14.39.04](/uploads/687895e9152d4fe8d8f3bfc1233af39b/Screen_Shot_2016-09-27_at_14.39.04.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 you do - 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 #22472 See merge request !6542
| * | | Removed stages loop for a single 'Stages' header22472-wrong-table-headLuke Bennett2016-09-271-7/+1
| | | |
* | | | Merge branch 'includes-projects-to-render-issue-notes' into 'master' Yorick Peterse2016-09-272-1/+2
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | Fix IssuesController#show degradation including project on loaded notes See merge request !6540
| * | | Fix IssuesController#show degradation including project on loaded notesincludes-projects-to-render-issue-notesPaco Guzman2016-09-272-1/+2
| | |/ | |/|
* | | Merge branch 'add-calendar-tests' into 'master' Jacob Schatz2016-09-272-9/+101
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add more tests for calendar contribution ## What does this MR do? Add more tests for calendar contribution ## Are there points in the code the reviewer needs to double check? Shouldn't be ## Why was this MR needed? Improve test coverage for calendar ## Screenshots (if relevant) None ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry 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 you do - 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 #22347 See merge request !6421
| * | | Add more tests for calendar contributionClement Ho2016-09-262-9/+101
| | | |
* | | | Merge branch '22053-bump-gitlab-shell-to-have-git-trace' into 'master' Rémy Coutable2016-09-272-1/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use gitlab-shell v3.6.2 ## What does this MR do? Bump gitlab-shell to v3.6.2 to be able to enable GIT_TRACE_PERFORMANCE output to a log file Relates #22053 See merge request !6367
| * | | | Use gitlab-shell v3.6.2 (GIT TRACE logging)22053-bump-gitlab-shell-to-have-git-tracePaco Guzman2016-09-262-1/+2
| | | | |
* | | | | Merge branch 'be-nice-to-docker-client' into 'master' Rémy Coutable2016-09-274-9/+28
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Be nice to Docker Clients talking to JWT/auth ## What does this MR do? Makes all errors returned by JWT endpoint to be docker-compatible. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/22465 See merge request !6536
| * | | | Be nice to Docker Clients talking to JWT/authKamil Trzcinski2016-09-274-9/+28
|/ / / /
* | | | Merge branch 'issue-boards-label-filter-fix' into 'master' Fatih Acet2016-09-273-3/+27
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed issue board label filtering not removing labels ## What does this MR do? When trying to remove a label filter it would actually add it instead making it impossible to remove the label filter without modifying the URL. This fixes that by correctly removing the label from the filter. ## What are the relevant issue numbers? Closes #21417 See merge request !6208
| * | | | Tests fixissue-boards-label-filter-fixPhil Hughes2016-09-071-0/+2
| | | | |
| * | | | tests updatePhil Hughes2016-09-071-0/+2
| | | | |
| * | | | Fixed issue board label filtering not removing labelsPhil Hughes2016-09-073-3/+23
| | | | | | | | | | | | | | | | | | | | Closes #21417
* | | | | Merge branch 'fix/import-new-models-error' into 'master' Rémy Coutable2016-09-275-5/+54
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Import/Export milestone and 1to1 models issue Fix 1to1 relations on project failing to be importing and milestone ordering issue. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/22585 See merge request !6521
| * | | | | fix model order in import/export config and 1to1 relation issue. Added ↵James Lopez2016-09-275-5/+54
|/ / / / / | | | | | | | | | | | | | | | relevant specs.
* | | | | Merge branch 'rs-merge_commit_message' into 'master' doc-setup-sshRobert Speicher2016-09-272-7/+41
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve how MergeCommit#merge_commit_message builds the message Now a merge request with a blank description will no longer produce a merge commit message like this: ``` Merge branch 'foo' into 'master' Bring the wonders of foo into the world See merge request !7283 ``` What an improvement! :tada: See merge request !6450
| * | | | | Improve how MergeCommit#merge_commit_message builds the messageRobert Speicher2016-09-272-7/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now a merge request with a blank description will no longer produce a merge commit message like this: ``` Merge branch 'foo' into 'master' Bring the wonders of foo into the world See merge request !7283 ``` What an improvement! :tada:
* | | | | | Merge branch 'dz-profile-organization' into 'master' Dmitriy Zaporozhets2016-09-2711-7/+49
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add organization field to the user profile ## What does this MR do? Add organization field to the user profile ## Are there points in the code the reviewer needs to double check? no ## Why was this MR needed? So we can let users fill organization information separately ## Screenshots (if relevant) ![Screen_Shot_2016-09-26_at_7.32.27_PM](/uploads/d11a9a86aa22227f9c9915d195106c5f/Screen_Shot_2016-09-26_at_7.32.27_PM.png) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [x] ~~[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 - [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 you do - 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? https://gitlab.com/gitlab-org/gitlab-ce/issues/21903 See merge request !6526
| * | | | | Add extra check for api users specDmitriy Zaporozhets2016-09-271-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | Improvements to user organization field feature after code reviewDmitriy Zaporozhets2016-09-272-17/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add newline to user organization spec according to test guide * Remove unnecessary comments from user organization database migration Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | Add User#organization to users apiDmitriy Zaporozhets2016-09-274-4/+20
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | Dispaly organization name at user pageDmitriy Zaporozhets2016-09-271-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | Add organization field to user profileDmitriy Zaporozhets2016-09-276-2/+39
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | Merge branch 'rc-new-members-approve-request-access-service' into 'master' Douwe Maan2016-09-275-13/+131
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New `Members::ApproveAccessRequestService` Part of #21979. ## Does this MR meet the acceptance criteria? - [x] API support added - Tests - [x] Added for this feature/bug - [x] 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) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !6266
| * | | | | Inverse condition in Members::ApproveAccessRequestServicerc-new-members-approve-request-access-serviceRémy Coutable2016-09-221-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | Ensure Members::ApproveAccessRequestService can fin a requester by IDRémy Coutable2016-09-224-3/+13
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | New Members::ApproveAccessRequestServiceRémy Coutable2016-09-224-12/+120
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | Merge branch 'lfs-helper-doc-link' into 'master' Douwe Maan2016-09-271-3/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use GitLab Routing helpers for the documentation URL in `LfsHelper` To reduce conflicts from changes introduced in gitlab-org/gitlab-ee!740 https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/740#note_15782550 See merge request !6529
| * | | | | | Use GitLab Routing helpers for the documentation URL in `LfsHelper`lfs-helper-doc-linkPatricio Cano2016-09-261-3/+5
| | | | | | |
* | | | | | | Merge branch '22578-cycle-analytics-incorrect-commit-count'Douwe Maan2016-09-274-16/+45
|\ \ \ \ \ \ \
| * | | | | | | Update CHANGELOG22578-cycle-analytics-incorrect-commit-countTimothy Andrew2016-09-261-0/+1
| | | | | | | |
| * | | | | | | Fix the "Commits" section of the cycle analytics summary.Timothy Andrew2016-09-263-16/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - The commit count was capped at 10, due to `Gitlab::Git::Repository#log` enforcing a limit, with the default set to 10. - Reimplement a small portion of this `log` function to get just the data we need.
* | | | | | | | Merge branch 'fix-unsubscribe-header'Douwe Maan2016-09-274-3/+5
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Wrap List-Unsubscribe link in angle bracketsfix-unsubscribe-headerSean McGivern2016-09-264-3/+5
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'zj-remove-deprecation-warnings-sprockets' into 'master' Rémy Coutable2016-09-272-6/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove Sprockets deprecation warning See merge request !6535
| * | | | | | | Remove Sprockets deprecation warningZ.J. van de Weg2016-09-272-6/+6
| | | | | | | |
View Lorry Controller Status