summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Refactored tests and added a breakpoint to the merge_request_tabsfix-sidebar-showing-mobile-merge-requestsJose Ivan Vargas2017-06-294-17/+42
|
* Fixed sidebar not collapsing on merge request in mobile screensJose Ivan Vargas2017-06-273-3/+9
|
* 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
| | | | |
| | * | | Optimization 'zh_HK' translation黄涛2017-06-133-11/+755
| | | | | | | | | | | | | | | | | | | | 1. Fix missing translations
| | * | | optimize translation based on comments黄涛2017-06-133-621/+81
| | | | |
| | * | | add changelog of supplement traditional chinese in hong kong translation黄涛2017-06-131-0/+4
| | | | |
| | * | | supplement traditional chinese in hong kong translation黄涛2017-06-133-83/+652
| | | | | | | | | | | | | | | | | | | | Fix #33442
| * | | | supplement traditional chinese in hong kong translation黄涛2017-06-203-65/+846
| | | | | | | | | | | | | | | | | | | | Fix #33442
* | | | | Merge branch '33561_supplement_bulgarian_translation_of_i18n' into 'master'Douwe Maan2017-06-273-12/+886
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Supplement Bulgarian translation of Project Page & Repository Page Closes #33561 See merge request !12083
| * \ \ \ \ rebase to master黄涛2017-06-270-0/+0
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merge branch '33561_supplement_bulgarian_translation_of_i18n' of gitlab.com:htve/gitlab-ce into 33561_supplement_bulgarian_translation_of_i18n
| | * \ \ \ \ Rebase to master黄涛2017-06-130-0/+0
| | |\ \ \ \ \
| | | * | | | | Optimization 'bg' translation黄涛2017-06-132-10/+786
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Fix missing translations
| | | * | | | | add changelog of supplement bulgarian translation黄涛2017-06-121-0/+4
| | | | | | | |
| | | * | | | | supplement bulgarian translation黄涛2017-06-123-6/+100
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix #33561
| | * | | | | | Optimization 'bg' translation黄涛2017-06-133-43/+46
| | | | | | | |
| | * | | | | | Optimization 'bg' translation黄涛2017-06-132-10/+786
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Fix missing translations
| | * | | | | | supplement bulgarian translation黄涛2017-06-132-786/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix #33561
| | * | | | | | Optimization 'bg' translation黄涛2017-06-132-10/+786
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Fix missing translations
| | * | | | | | add changelog of supplement bulgarian translation黄涛2017-06-131-0/+4
| | | | | | | |
| | * | | | | | supplement bulgarian translation黄涛2017-06-133-6/+100
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix #33561
| * | | | | | | supplement bulgarian translation黄涛2017-06-273-12/+886
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix #33561
* | | | | | | | Merge branch 'fix/gb/qa/use-latest-chrome-version-in-qa-dockerfile' into ↵Rémy Coutable2017-06-271-10/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Use latest chrome and chrome driver in GitLab QA See merge request !12475
| * | | | | | | | Use latest chrome and chrome driver in GitLab QAfix/gb/qa/use-latest-chrome-version-in-qa-dockerfileGrzegorz Bizon2017-06-271-10/+3
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge branch 'issue-form-multiple-line-markdown' into 'master'Filipa Lacerda2017-06-273-38/+75
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed multi-line markdown in issue edit form Closes #34318 See merge request !12458
| * | | | | | | | Fixed multi-line markdown in issue edit formissue-form-multiple-line-markdownPhil Hughes2017-06-263-38/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #34318
* | | | | | | | | Merge branch 'zj-review-apps-usage-data' into 'master'Grzegorz Bizon2017-06-274-0/+7
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add review apps to usage ping Closes #33171 See merge request !12185
| * | | | | | | | | Add in_review_folder to usage pingzj-review-apps-usage-dataZ.J. van de Weg2017-06-274-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As its hard to reliably check how many review apps there are on the clients machine, we start by checking where the type is `review`. This means the folder is called that way. This will lead to a seq scan on the table. However, this is done once a week, so the benefit of adding an index seems not to apply here.
* | | | | | | | | | Merge branch '34168-cannot-edit-prioritized-labels-issues-with-firefox' into ↵Phil Hughes2017-06-274-3/+10
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Action Buttons on Prio Labels working again by setting pointer events to none on… Closes #34168 See merge request !12473
| * | | | | | | | | | Action Buttons on Prio Labels working again by setting pointer events to ↵Tim Zallmann2017-06-274-3/+10
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | none on…
* | | | | | | | | | Merge branch '34324-gitlab-db-seed-is-broken' into 'master'Rémy Coutable2017-06-272-1/+5
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "GitLab DB seed is broken" Closes #34324 See merge request !12464
| * | | | | | | | | | Fix Gitlab::Database.bulk_insert for non-UTF-8 data34324-gitlab-db-seed-is-brokenSean McGivern2017-06-262-1/+5
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'pat-alert-when-signin-disabled' into 'master'Rémy Coutable2017-06-2711-31/+274
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Provide hint to create a personal access token for Git over HTTP See merge request !12105