summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Resolve merge request commentsadd-university-contentSean Packham2016-09-281-5/+5
|
* Fix linksSean Packham2016-09-271-3/+3
|
* Resolve merge request commentsSean Packham2016-09-274-35/+27
|
* Merge branch 'master' into add-university-contentSean Packham2016-09-2712-27/+212
|\
| * 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.
* | | | | Readded imagesSean Packham2016-09-2715-0/+0
| | | | |
* | | | | Removed lfsSean Packham2016-09-2716-46/+0
| | | | |
* | | | | Fix lint errorSean Packham2016-09-271-1/+1
| | | | |
* | | | | Migrate university to use lfs for imagesSean Packham2016-09-2716-0/+1
| | | | |
* | | | | Merge branch 'master' into add-university-contentSean Packham2016-09-2778-223/+575
|\ \ \ \ \ | |/ / / /
| * | | | 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
| | | | | | | | |
| * | | | | | | | Merge branch 'cs-inline-js-search' into 'master' Fatih Acet2016-09-273-31/+47
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove inline JavaScript for Search autocomplete ## What does this MR do? Remove inline JavaScript from the search partial for Search autocomplete. ## Are there points in the code the reviewer needs to double check? That this doesn't break anything (it didn't when I tested it!) ## Why was this MR needed? Inline scripts are bad, this removes a few of them. ## What are the relevant issue numbers? #18231 and #19866 ## Does this MR meet the acceptance criteria? - Tests - [ ] 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 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 !5284
| | * | | | | | | | Tidy up the code a bitcs-inline-js-searchAlfredo Sumaran2016-08-262-22/+20
| | | | | | | | | |
| | * | | | | | | | Fix dropdown vertical positionAlfredo Sumaran2016-08-261-1/+1
| | | | | | | | | |
| | * | | | | | | | Move data attribute information to relevant elements.Connor Shea2016-08-261-11/+9
| | | | | | | | | |
| | * | | | | | | | Remove inline JavaScript for Search autocomplete.Connor Shea2016-08-262-21/+41
| | | | | | | | | |
| * | | | | | | | | Merge branch 'cs-upgrade-unicorn' into 'master' Robert Speicher2016-09-272-7/+6
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade unicorn and unicorn-worker-killer. Upgrade unicorn from 4.9.0 to 5.1.0 and unicorn-worker-killer from 0.4.2 to 0.4.4. This includes Rack 2.0 support which is necessary for Rails 5. Changelog for unicorn: http://unicorn.bogomips.org/NEWS.html Changelog for unicorn-worker-killer: https://github.com/kzk/unicorn-worker-killer/blob/bdec225f028d1bda01b5888578c479b0c705f1a8/ChangeLog See merge request !6463
| | * | | | | | | | | Upgrade unicorn and unicorn-worker-killer.cs-upgrade-unicornConnor Shea2016-09-212-7/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade unicorn from 4.9.0 to 5.1.0 and unicorn-worker-killer from 0.4.2 to 0.4.4. Changelog for unicorn: http://unicorn.bogomips.org/NEWS.html Changelog for unicorn-worker-killer: https://github.com/kzk/unicorn-worker-killer/blob/bdec225f028d1bda01b5888578c479b0c705f1a8/ChangeLog
| * | | | | | | | | | Merge branch 'improvement/project-with-board-factory' into 'master' Robert Speicher2016-09-279-24/+23
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve project_with_board factory to create the default lists ## What does this MR do? Create the default lists after creating a project with the `project_with_board` factory. This makes the setup phase on tests be more simpler. ## Why was this MR needed? These two lists are present in every issue board, so we don't have to create them manually in every test. See merge request !6480