summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* updated gitlab-ci.yml to compile localeignore-generated-i18n-json-filesPhil Hughes2017-06-271-0/+3
* Ignore JSON files generated from PO filesRuben Davila2017-06-2710-9/+1
* Merge branch 'bugfix/ruby2.4-compat' into 'master'Douwe Maan2017-06-277-27/+34
|\
| * 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
|\ \
| * | Merge branch 'update-9-3-templates' into '9-3-stable'cherry-pick-ecd49e82Clement Ho2017-06-2631-34/+234
* | | Merge branch 'cherry-pick-91c122d5' into 'master'Clement Ho2017-06-271-49/+59
|\ \ \
| * | | Merge branch 'update-9-3-dependencies-license-list' into '9-3-stable'cherry-pick-91c122d5Clement Ho2017-06-261-49/+59
| |/ /
* | | Merge branch '34276-fix-dashboard-page-when-last-activity-at-is-nil' into 'ma...Robert Speicher2017-06-273-7/+19
|\ \ \
| * | | 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 additionsBryce Johnson2017-06-274-156/+176
|/ / / /
* | | | Merge branch 'dz-refactor-group-members-tests' into 'master'Douwe Maan2017-06-2710-139/+146
|\ \ \ \
| * | | | Move another group member spec from spinachdz-refactor-group-members-testsDmitriy Zaporozhets2017-06-262-7/+17
| * | | | Fix leave_group_spec.rbDmitriy Zaporozhets2017-06-261-3/+3
| * | | | Move "remove group member" spec from spinach to rspecDmitriy Zaporozhets2017-06-263-75/+92
| * | | | Rename group member specs for consistent namingDmitriy Zaporozhets2017-06-265-4/+8
| * | | | Fix wrong scenario title to owner_manages_access_requests_spec.rbDmitriy Zaporozhets2017-06-261-2/+2
| * | | | Merge group request access specs under one fileDmitriy Zaporozhets2017-06-262-17/+8
| * | | | Remove group members spinach tests that we already covered with rspecDmitriy Zaporozhets2017-06-261-40/+0
| * | | | Combine group leave feature specs in one fileDmitriy Zaporozhets2017-06-263-37/+62
| |/ / /
* | | | Merge branch 'dm-commit-row-browse-button' into 'master'Robert Speicher2017-06-272-1/+5
|\ \ \ \
| * | | | Update changelog itemdm-commit-row-browse-buttonDouwe Maan2017-06-271-1/+1
| * | | | Adjust commit partial cache key to fix browse buttonsDouwe Maan2017-06-222-1/+5
* | | | | Merge branch '34014-submitting-reply-to-existing-diff-discussion-using-cmd-ct...Clement Ho2017-06-272-5/+18
|\ \ \ \ \
| * | | | | Resolve "Submitting reply to existing diff discussion using Cmd/Ctrl+Enter su...Luke "Jared" Bennett2017-06-272-5/+18
|/ / / / /
* | | | | Merge branch 'gitlab-git-find-commits' into 'master'Sean McGivern2017-06-275-130/+98
|\ \ \ \ \
| * | | | | 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 '34115-unable-to-access-edit-comment-from-dropdown-menu-in-certa...Annabel Dunstone Gray2017-06-272-1/+2
|\ \ \ \ \ \
| * | | | | | Resolve "Unable to access edit comment from dropdown menu in certain screen s...Luke "Jared" Bennett2017-06-272-1/+2
|/ / / / / /
* | | | | | Merge branch '33442_supplement_traditional_chinese_in_hong_kong_translation_o...Douwe Maan2017-06-273-65/+848
|\ \ \ \ \ \
| * | | | | | Change 'Committed by' Translate黄涛2017-06-202-2/+2
| * | | | | | Translation optimization黄涛2017-06-202-27/+29
| |\ \ \ \ \ \
| | * | | | | | add missing translation fields黄涛2017-06-162-20/+28
| | * | | | | | 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
| | | * | | | | | 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
| | * | | | | | | Optimization 'zh_HK' translation黄涛2017-06-133-13/+12
View Lorry Controller Status