summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update grape to 0.18.0gem-update-grapeRobert Schilling2016-12-143-7/+14
|
* Merge branch '25651-fix-master' into 'master' Rémy Coutable2016-12-141-1/+1
|\ | | | | | | | | | | | | | | | | Fix wrong error message expectation in API::Commits spec See commit message or https://gitlab.com/gitlab-org/gitlab-ce/issues/25651#note_19996076 for the explanation. Closes #25651 See merge request !8083
| * Fix wrong error message expectation in API::Commits spec25651-fix-masterRémy Coutable2016-12-141-1/+1
| | | | | | | | | | | | | | This was because the MR was a bit behind master and the error message got updated in the meantime by 79aad815. Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Merge branch 'process-commit-worker-migration-encoding' into 'master' Rémy Coutable2016-12-143-7/+44
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Encode when migrating ProcessCommitWorker jobs ## What does this MR do? This adds encoding logic to the migration for ProcessCommitWorker, ensuring it doesn't throw errors when the input can not be converted to UTF-8 without extra help. ## What are the relevant issue numbers? https://gitlab.com/gitlab-org/gitlab-ce/issues/25489 See merge request !8064
| * | Encode when migrating ProcessCommitWorker jobsprocess-commit-worker-migration-encodingYorick Peterse2016-12-133-7/+44
| | | | | | | | | | | | | | | | | | | | | | | | If the source encoding is not UTF-8 we need to encode the data as `JSON.dump` may throw an error if the input can not be converted to UTF-8. We only encode when necessary to reduce the overhead. Fixes gitlab-org/gitlab-ce#25489
* | | Merge branch '25136-last-deployment-link' into 'master' Grzegorz Bizon2016-12-144-4/+46
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix broken link for latest deployment ## What does this MR do? Creates a new helper for the latest deployment link. ## Why was this MR needed? A helper that returns a link was being called inside another helper that creates a link, resulting in `builds/<a href="builds/ID>#id</a>` ## What are the relevant issue numbers? Closes #25136 See merge request !7839
| * | Changes after review25136-last-deployment-linkFilipa Lacerda2016-12-073-24/+19
| | |
| * | Changes after reviewFilipa Lacerda2016-12-073-13/+11
| | | | | | | | | | | | Fix error
| * | Updates testsFilipa Lacerda2016-12-071-12/+30
| | | | | | | | | | | | | | | | | | | | | | | | Fix tests Fix rubocop error Fix broken test
| * | Fix broken link for latest deploymentFilipa Lacerda2016-12-074-2/+33
| | | | | | | | | | | | Updates changelog with MR ID
* | | Merge branch '20052-actions-table-vscroll' into 'master' Annabel Dunstone Gray2016-12-133-13/+16
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent overflow with vertical scroll when we have space to show content ## What does this MR do? Removes vertical and horizontal scroll from builds, environments and pipelines tables by adding a media query since this is only necessary in smaller screens. ## Screenshots (if relevant) ![scroll](/uploads/6b9e3584df6e4ca29553d2ff576b794e/scroll.jpg) ## Does this MR meet the acceptance criteria? - [ ] [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 #20052 See merge request !8061
| * | | Prevent overflow with vertical scroll when we have space to show content20052-actions-table-vscrollFilipa Lacerda2016-12-133-13/+16
| | | | | | | | | | | | | | | | Adds changelog
* | | | Merge branch 'backport/group-policies' into 'master' Rémy Coutable2016-12-132-0/+12
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport hooks on group policies for the EE-specific implementation See https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/822#note_19955431 See merge request !8066
| * | | | Backport hooks on group policies for the EE-specific implementationbackport/group-policiesDouglas Barbosa Alexandre2016-12-132-0/+12
| | | | |
* | | | | Merge branch 'api-cherry-pick' into 'master' Rémy Coutable2016-12-134-1/+148
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds the ability to cherry pick a commit via the API. Right now it only supports to directly cherry pick a commit and not starting a MR from it. Shall we do that also for the API? Closes #25450 See merge request !8047
| * | | | | Make rubocop happyapi-cherry-pickRobert Schilling2016-12-131-1/+1
| | | | | |
| * | | | | API: Ability to cherry-pick a commitRobert Schilling2016-12-134-1/+148
| | |_|_|/ | |/| | |
* | | | | Merge branch 'jzinn/gitlab-ce-chomp-git-status-message' into 'master' Rémy Coutable2016-12-133-2/+7
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For single line Git commit messages, the close quote should be on the same line as the open quote _Originally opened at !7299 by @jzinn._ - - - ## What does this MR do? Chomps merge commit messages so that there is not a dangling close quote. A better solution would be not to use quotes at all, but to set off the message in a `<div>` with a background color. ## Screenshots (if relevant) ![Screen_Shot_2016-11-04_at_8.06.54_PM](/uploads/6e749c5227d88a9bfea64e70cccaf14a/Screen_Shot_2016-11-04_at_8.06.54_PM.png) See merge request !7975
| * | | | | For single line git commit messages, the close quote should be on the same ↵jzinn/gitlab-ce-chomp-git-status-messageJulian Zinn2016-12-133-2/+7
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | line as the open quote Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | Merge branch '25482-fix-api-sudo' into 'master' Sean McGivern2016-12-137-113/+149
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | API: Memoize the current_user so that the sudo can work properly Closes #25482 See merge request !8017
| * | | | | Be smarter when finding a sudoed user in API::Helpers25482-fix-api-sudoRémy Coutable2016-12-135-32/+15
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | API: Memoize the current_user so that the sudo can work properlyRémy Coutable2016-12-125-96/+149
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The issue was arising when `#current_user` was called a second time after a user was impersonated: the `User#is_admin?` check would be performed on it and it would fail. Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | Merge branch 'move-admin-settings-feature-to-rspec' into 'master' Rémy Coutable2016-12-133-57/+25
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace the Spinach specs for admin settings with RSpec feature specs as per #23036 Part of #23036 See merge request !8058
| * | | | | | Move admin settings spinach feature to rspecjurre2016-12-133-57/+25
| | | | | | |
* | | | | | | Merge branch 'api-simple-group-project' into 'master' Rémy Coutable2016-12-134-9/+32
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | API: Ability to get group's project in simple representation Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/25412 See merge request !8060
| * | | | | | | API: Ability to get group's project in simple representationapi-simple-group-projectRobert Schilling2016-12-134-9/+32
| | | | | | | |
* | | | | | | | Merge branch 'dz-create-routes-lower-index' into 'master' Dmitriy Zaporozhets2016-12-133-1/+27
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add index to routes table on lower path for postgresql Improve performance of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7121 See merge request !8041
| * | | | | | | | Add AddLowerPathIndexToRoutes to setup_postgresql.rakeDmitriy Zaporozhets2016-12-131-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | Add index to routes table on lower path for postgresqldz-create-routes-lower-indexDmitriy Zaporozhets2016-12-122-1/+23
| | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | | Merge branch 'allow-more-filenames' into 'master' Rémy Coutable2016-12-133-2/+50
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow all alphanumeric characters in file names ## What does this MR do? Allow more characters in file names such as Chinese symbols. ## Why was this MR needed? It is annoying that some files which can be uploaded using Git CLI cannot be created with the web editor. ## What are the relevant issue numbers? fixes #20190 See merge request !8002
| * | | | | | | | Allow all alphanumeric characters in file names (!8002)winniehell2016-12-132-2/+6
| | | | | | | | |
| * | | | | | | | Add failing test for #20190winniehell2016-12-131-0/+44
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge branch '25518-uniquely-style-labels' into 'master' Fatih Acet2016-12-133-1/+4
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | added border-radius and padding to labels ## What does this MR do? It creates a pill like style for labels. ## Are there points in the code the reviewer needs to double check? - ## Why was this MR needed? get a unique label look/style ## Screenshots (if relevant) ![image](/uploads/2cf347984ae4e36cd061c5a761ee99c9/image.png) ![image](/uploads/c23bbeba4b2525b4f36dac5a0fa1037c/image.png) ## Does this MR meet the acceptance criteria? - [ ] [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) - [ ] 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 #25518 See merge request !8054
| * | | | | | | | added border-radius and padding to labels25518-uniquely-style-labelsDimitrie Hoekstra2016-12-133-1/+4
| | | | | | | | |
* | | | | | | | | Merge branch 'dz-nested-group-improvements-2' into 'master' Sean McGivern2016-12-135-9/+25
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Minor improvements to nested groups code See merge request !8011
| * | | | | | | | Rename Routable.where_paths_in to Routable.where_full_path_indz-nested-group-improvements-2Dmitriy Zaporozhets2016-12-113-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | Create nested group factoryDmitriy Zaporozhets2016-12-112-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | | | | Validate presence of route by Routable concernDmitriy Zaporozhets2016-12-112-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | | | Merge branch '3478-copy-commit-hash-to-clipboard' into 'master' Sean McGivern2016-12-135-17/+9
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Copy commit hash to clipboard Closes #3478 See merge request !8020
| * | | | | | | | | Fix test3478-copy-commit-hash-to-clipboardVictor Wu2016-12-121-1/+1
| | | | | | | | | |
| * | | | | | | | | Tweak style and add back wordingvictorwu2016-12-121-1/+2
| | | | | | | | | |
| * | | | | | | | | Clean up commit copy to clipboard and make consistentvictorwu2016-12-124-15/+6
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch ↵Fatih Acet2016-12-134-4/+11
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '24949-view-2-up-swipe-onion-skin-controls-for-merge-request-diff-containing-an-image' into 'master' Add image controls to MR diffs ## What does this MR do? Instantiates `ImageFile` in `Diff` which is instantiated in `MergeRequestTabs`. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? ## Screenshots (if relevant) ![Screen_Shot_2016-12-04_at_11.11.21](/uploads/738c68ad3fa682c1c132421abce7165e/Screen_Shot_2016-12-04_at_11.11.21.png) ## Does this MR meet the acceptance criteria? - [ ] [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) - [ ] 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 #24949 See merge request !7919
| * | | | | | | | | Instantiate ImageFile for diff-files in Diff24949-view-2-up-swipe-onion-skin-controls-for-merge-request-diff-containing-an-imageLuke "Jared" Bennett2016-12-044-4/+11
| | | | | | | | | |
* | | | | | | | | | Merge branch 'issue_13270' into 'master' Sean McGivern2016-12-133-1/+67
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow to delete tag release note closes #13270 See merge request !8001
| * | | | | | | | | | Allow to delete tag release noteissue_13270Felipe Artur2016-12-123-1/+67
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'api-dont-allow-blank-mr-titles' into 'master' Sean McGivern2016-12-132-2/+18
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't allow blank MR titles in API Closes #25033 See merge request !7848
| * | | | | | | | | | Don't allow blank MR titles in APIapi-dont-allow-blank-mr-titlesRobert Schilling2016-12-132-2/+18
| | |_|_|_|_|/ / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'fix-autoloading-issue' into 'master' Sean McGivern2016-12-131-1/+0
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't require `API::API` in routes Closes #18312. See merge request !8045
| * | | | | | | | | | Don't require `API::API` in routesfix-autoloading-issueRémy Coutable2016-12-121-1/+0
| | |_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `API::API` is autoloaded and shouldn't be required in non-autoloaded code. Otherwise, we get the following dreaded error: A copy of API::Helpers has been removed from the module tree but is still active! Signed-off-by: Rémy Coutable <remy@rymai.me>