- 27 Sep, 2016 24 commits
-
-
Jacob Schatz authored
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
-
Rémy Coutable authored
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
-
Rémy Coutable authored
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
-
Kamil Trzcinski authored
-
Fatih Acet authored
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
-
Rémy Coutable authored
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
-
James Lopez authored
-
Robert Speicher authored
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!
🎉 See merge request !6450 -
Dmitriy Zaporozhets authored
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
-
Douwe Maan authored
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
-
Robert Speicher authored
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!
🎉 -
Douwe Maan authored
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
-
Dmitriy Zaporozhets authored
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-
Douwe Maan authored
-
Douwe Maan authored
-
Dmitriy Zaporozhets authored
* 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>
-
Dmitriy Zaporozhets authored
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-
Dmitriy Zaporozhets authored
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-
Dmitriy Zaporozhets authored
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-
Rémy Coutable authored
Remove Sprockets deprecation warning See merge request !6535
-
Fatih Acet authored
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
-
Robert Speicher authored
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
-
Robert Speicher authored
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
-
Z.J. van de Weg authored
-
- 26 Sep, 2016 16 commits
-
-
Jacob Schatz authored
Pass the full project path for resolve buttons ## What does this MR do? The full project path is passed from the HTML into the JS rather than the resolve button JS generating the URL based on the the namespaces. @smcgivern @stanhu Do we have anyway of adding tests for installs with relative URLs? ## What are the relevant issue numbers? Closes #21704 See merge request !6129
-
Jacob Schatz authored
Added v-cloak to resolve disc button ## What does this MR do? Adds `v-cloak` to the `Resolve discussion` button to avoid handlebar syntax displaying before the component compiles. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? ## 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? Closes #22640 See merge request !6528
-
Patricio Cano authored
-
Fatih Acet authored
Fixed awards dropdown search text from repeating ## What does this MR do? Thanks @zeiv for this! >This fixes #20463 by adding the .emoji-search class to the "Search results" h5 element. AwardsHandler.prototype.setupSearch() was trying to remove the element before creating a new one, but wasn't because the it was attempting to select it with the .emoji-search class, which wasn't being added. ## Are there points in the code the reviewer needs to double check? >I don't believe so. ## Why was this MR needed? >See #20463 _(and #22525)_ ## Screenshots (if relevant) ![2016-09-23_15.56.04](/uploads/b421400a08b3d9fa32c577e7d8952504/2016-09-23_15.56.04.gif) ## 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 #22525 See merge request !6498
-
Luke Bennett authored
-
Fatih Acet authored
Fixed list issues not loading with spaces in filtered values ## What does this MR do? Vue resource is very kindly encoding our URL params when sending. However - we didn't actually want the `+` to be encoded because Rails reads that as a space, but doesn't read the encoded value as a space
😕 This converts the `+` into spaces👍 ## What are the relevant issue numbers? Closes #21920 See merge request !6258 -
Luke Bennett authored
-
Fatih Acet authored
Added full-width new snippet button on mobile and corrected capitalization ## What does this MR do? Adds full-width `New snippet` button to snippet mobile views and corrects `New Snippet` to `New snippet` throughout. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? @connorshea Spotted that I missed this in !6210 :) ## Screenshots (if relevant) ![Screen_Shot_2016-09-16_at_10.40.21](/uploads/ddca2da3a5ef787298bfc87e129db820/Screen_Shot_2016-09-16_at_10.40.21.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? See merge request !6380
-
Fatih Acet authored
Revoke button in Applications Settings underlines on hover ## What does this MR do? Removes the `btn-link` class from the "Revoke" button ## Why was this MR needed? The button was being underlined on hover and it shouldn't. ## Does this MR meet the acceptance criteria? - [x] [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 - [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) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? fixes #18932 See merge request !6522
-
Douglas Barbosa Alexandre authored
-
Clement Ho authored
-
Robert Speicher authored
Fix snippets pagination ## What are the relevant issue numbers? Closes #22500 See merge request !6500
-
Sean McGivern authored
-
Rémy Coutable authored
Robots and browsers should not crawl and remember deploy page ## What does this MR do? Changing meta information for robots and browsers not to remember a page during deployment ## Why was this MR needed? User browsers and robots takes the page content as accurate during deployment - HTTP code 200 is send to browser, it's all being remembered. See merge request !5842
-
Timothy Andrew authored
-
Timothy Andrew authored
- 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.
-