summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix scroll flicker34407-flickering-scroll-v1Eric Eastwood2017-06-281-3/+5
| | | | | | | | See https://gitlab.com/gitlab-org/gitlab-ce/issues/34407 - Revert https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12399 - Update https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12299 throttle/debounce to happen immediately and cleanup
* Merge branch 'bugfix/ruby2.4-compat' into 'master'Douwe Maan2017-06-277-27/+34
|\ | | | | | | | | ruby 2.4 compat: update to webmock 2.3.2 See merge request !12471
| * rubocop fix: don't use single line blocksbugfix/ruby2.4-compathttp://jneen.net/2017-06-261-2/+6
| |
| * rm use of deprecated webmock api in teamcity_service_spechttp://jneen.net/2017-06-261-2/+4
| |
| * rm use of deprecated webmock api in campfire_service_spechttp://jneen.net/2017-06-261-5/+6
| |
| * rm use of deprecated webmock api in jira model spechttp://jneen.net/2017-06-261-11/+11
| |
| * rm use of deprecated webmock api in bamboo_service_spechttp://jneen.net/2017-06-261-2/+2
| |
| * remove use of deprecated webmock feature in jira specshttp://jneen.net/2017-06-261-7/+7
| |
| * ruby 2.4 compat: update to webmock 2.3.2http://jneen.net/2017-06-262-4/+4
| |
* | Merge branch 'cherry-pick-ecd49e82' into 'master'Clement Ho2017-06-2731-34/+234
|\ \ | | | | | | | | | | | | Update templates for 9.3 See merge request !12461
| * | Merge branch 'update-9-3-templates' into '9-3-stable'cherry-pick-ecd49e82Clement Ho2017-06-2631-34/+234
| | | | | | | | | | | | | | | Update templates for 9.3 See merge request !12041
* | | Merge branch 'cherry-pick-91c122d5' into 'master'Clement Ho2017-06-271-49/+59
|\ \ \ | | | | | | | | | | | | | | | | Update dependencies list for 9.3 See merge request !12462
| * | | Merge branch 'update-9-3-dependencies-license-list' into '9-3-stable'cherry-pick-91c122d5Clement Ho2017-06-261-49/+59
| |/ / | | | | | | | | | | | | Update dependencies list for 9.3 See merge request !12042
* | | Merge branch '34276-fix-dashboard-page-when-last-activity-at-is-nil' into ↵Robert Speicher2017-06-273-7/+19
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Fix application error when Project#last_activity_at is nil Closes #34276 See merge request !12443
| * | | Fix application error when Project#last_activity_at is nil34276-fix-dashboard-page-when-last-activity-at-is-nilRuben Davila2017-06-263-7/+19
| | | |
* | | | Merge branch 'bpj-pipeline-schedules-form-bundle-refactor' into 'master'Phil Hughes2017-06-274-156/+176
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Slightly refactor pipeline schedules form in preparation for additions See merge request !12134
| * | | | Slightly refactor pipeline schedules form in preparation for additionsBryce Johnson2017-06-274-156/+176
|/ / / /
* | | | Merge branch 'dz-refactor-group-members-tests' into 'master'Douwe Maan2017-06-2710-139/+146
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Refactor group members tests See merge request !12465
| * | | | Move another group member spec from spinachdz-refactor-group-members-testsDmitriy Zaporozhets2017-06-262-7/+17
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Fix leave_group_spec.rbDmitriy Zaporozhets2017-06-261-3/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Move "remove group member" spec from spinach to rspecDmitriy Zaporozhets2017-06-263-75/+92
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Rename group member specs for consistent namingDmitriy Zaporozhets2017-06-265-4/+8
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Fix wrong scenario title to owner_manages_access_requests_spec.rbDmitriy Zaporozhets2017-06-261-2/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Merge group request access specs under one fileDmitriy Zaporozhets2017-06-262-17/+8
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Remove group members spinach tests that we already covered with rspecDmitriy Zaporozhets2017-06-261-40/+0
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Combine group leave feature specs in one fileDmitriy Zaporozhets2017-06-263-37/+62
| |/ / / | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Merge branch 'dm-commit-row-browse-button' into 'master'Robert Speicher2017-06-272-1/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adjust commit partial cache key to fix browse buttons Closes #26899 See merge request !12393
| * | | | Update changelog itemdm-commit-row-browse-buttonDouwe Maan2017-06-271-1/+1
| | | | | | | | | | | | | | | [ci skip]
| * | | | Adjust commit partial cache key to fix browse buttonsDouwe Maan2017-06-222-1/+5
| | | | |
* | | | | Merge branch ↵Clement Ho2017-06-272-5/+18
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '34014-submitting-reply-to-existing-diff-discussion-using-cmd-ctrl-enter-submits-twice-and-refreshes-page' into 'master' Resolve "Submitting reply to existing diff discussion using Cmd/Ctrl+Enter submits twice and refreshes page" Closes #34014 See merge request !12352
| * | | | | Resolve "Submitting reply to existing diff discussion using Cmd/Ctrl+Enter ↵Luke "Jared" Bennett2017-06-272-5/+18
|/ / / / / | | | | | | | | | | | | | | | submits twice and refreshes page"
* | | | | Merge branch 'gitlab-git-find-commits' into 'master'Sean McGivern2017-06-275-130/+98
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Clean up Gitlab::Git::Commit.find_all See merge request !12476
| * | | | | Remove 'contains' option from Commit.find_allJacob Vosmaer2017-06-272-26/+1
| | | | | |
| * | | | | Remove Gitlab::Git::Repository#find_allJacob Vosmaer2017-06-275-110/+103
| | | | | |
* | | | | | Merge branch ↵Annabel Dunstone Gray2017-06-272-1/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '34115-unable-to-access-edit-comment-from-dropdown-menu-in-certain-screen-sizes' into 'master' Resolve "Unable to access edit comment from dropdown menu in certain screen sizes" Closes #34115 See merge request !12421
| * | | | | | Resolve "Unable to access edit comment from dropdown menu in certain screen ↵Luke "Jared" Bennett2017-06-272-1/+2
|/ / / / / / | | | | | | | | | | | | | | | | | | sizes"
* | | | | | Merge branch ↵Douwe Maan2017-06-273-65/+848
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '33442_supplement_traditional_chinese_in_hong_kong_translation_of_i18n' into 'master' Supplement Traditional Chinese in Hong Kong translation of Project Page & Repository Page Closes #33442 See merge request !11995
| * | | | | | Change 'Committed by' Translate黄涛2017-06-202-2/+2
| | | | | | |
| * | | | | | Translation optimization黄涛2017-06-202-27/+29
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Modify the identified translations in the discussion. 2. rebase to master
| | * | | | | | add missing translation fields黄涛2017-06-162-20/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Follow up !12052 commits.
| | * | | | | | translation optimization in synchronous reviews黄涛2017-06-152-11/+11
| | | | | | | |
| | * | | | | | translation optimization in synchronous reviews黄涛2017-06-142-63/+63
| | | | | | | |
| | * | | | | | Rebase to master黄涛2017-06-130-0/+0
| | |\ \ \ \ \ \
| | | * | | | | | Change the format in changelog黄涛2017-06-131-1/+1
| | | | | | | | |
| | | * | | | | | Optimization 'zh_HK' translation黄涛2017-06-133-11/+755
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Fix missing translations
| | | * | | | | | optimize translation based on comments黄涛2017-06-123-621/+81
| | | | | | | | |
| | | * | | | | | add changelog of supplement traditional chinese in hong kong translation黄涛2017-06-081-0/+4
| | | | | | | | |
| | | * | | | | | supplement traditional chinese in hong kong translation黄涛2017-06-083-21/+656
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix #33442
| | * | | | | | | Optimization 'zh_HK' translation黄涛2017-06-133-13/+12
| | | | | | | | |
| | * | | | | | | Change the format in changelog黄涛2017-06-131-1/+1
| | | | | | | | |