summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update .nvmrc to 7.5Luke "Jared" Bennett2017-06-221-1/+1
|
* added .nvmrcLuke "Jared" Bennett2017-06-221-0/+1
|
* Merge branch 'gitaly-0.13.0' into 'master'Sean McGivern2017-06-221-1/+1
|\ | | | | | | | | Use Gitaly 0.13.0 See merge request !12377
| * Use Gitaly 0.13.0Jacob Vosmaer2017-06-221-1/+1
| |
* | Merge branch '33904-edit-issue-warning' into 'master'Phil Hughes2017-06-222-10/+6
|\ \ | |/ |/| | | | | | | | | don't show "Someone edited the issue" warning when saving issue Closes #33904 See merge request !12371
| * don't show "Someone edited the issue" warning when saving issue33904-edit-issue-warningSimon Knox2017-06-222-10/+6
| | | | | | | | don't need to check for form visible because error message isn't rendered otherwise
* | Merge branch 'patch-17' into 'master'Marin Jankovski2017-06-221-20/+26
|\ \ | | | | | | | | | | | | clarify NFS option details See merge request !12257
| * | clarify NFS option detailsBen Bodenmiller2017-06-191-20/+26
| | |
* | | Merge branch '25102-files-view-button' into 'master'Phil Hughes2017-06-226-108/+166
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | File view buttons Closes #25102 See merge request !12111
| * | | File view buttonsAnnabel Dunstone Gray2017-06-226-108/+166
|/ / /
* | | Merge branch '33853-environments-buttons' into 'master'Phil Hughes2017-06-221-2/+13
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Only show gray footer space if environment actions exist Closes #33853 See merge request !12315
| * | | Only show gray footer space if environment actions exist33853-environments-buttonsAnnabel Dunstone Gray2017-06-211-2/+13
| | | |
* | | | Merge branch '32301-filter-archive-project-on-param-present' into 'master'Rémy Coutable2017-06-224-2/+39
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Filter archived project in API only if param present Closes #32301 See merge request !12245
| * | | | Filter archived project in API v3 only if param presentvanadium232017-06-214-2/+39
| | | | |
* | | | | Merge remote-tracking branch 'dev/master'Stan Hu2017-06-210-0/+0
|\ \ \ \ \
| * | | | | Update CHANGELOG.md for 9.2.7Timothy Andrew2017-06-212-4/+4
| | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | Merge branch 'dm-restore-capybara-screenshot' into 'master'Robert Speicher2017-06-221-2/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't reset the session when the example failed to fix capybara-screenshot See merge request !12370
| * | | | | | Don't reset the session when the example failed, because we need ↵dm-restore-capybara-screenshotDouwe Maan2017-06-211-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | capybara-screenshot to have access to it
* | | | | | | Merge branch '33833-issue-and-mr-state-tabs-don-t-work-on-dashboard' into ↵Jacob Schatz2017-06-225-34/+21
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "Issue and MR state tabs don't work on dashboard" Closes #33833 See merge request !12278
| * | | | | | | Add feature spec for dashboard state filter tabs33833-issue-and-mr-state-tabs-don-t-work-on-dashboardEric Eastwood2017-06-212-1/+6
| | | | | | | |
| * | | | | | | Revert to using links instead of buttons in Issuable Index tabs.Bryce Johnson2017-06-214-34/+16
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch ↵Annabel Dunstone Gray2017-06-225-40/+75
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '33917-mr-comment-system-note-highlight-don-t-have-the-same-width' into 'master' Resolve "MR comment + system note highlight don't have the same width" Closes #33917 See merge request !12364
| * | | | | | Resolve "MR comment + system note highlight don't have the same width"Mike Greiling2017-06-225-40/+75
|/ / / / / /
* | | | | | Merge branch 'feature/migrate-blob-find-to-gitaly' into 'master'Robert Speicher2017-06-227-6/+80
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Migrate Gitlab::Git::Blob.find to Gitaly See merge request !12104
| * | | | | | Migrate Gitlab::Git::Blob.find to Gitalyfeature/migrate-blob-find-to-gitalyAhmad Sherif2017-06-217-6/+80
| | | | | | |
* | | | | | | Merge branch 'system-note-commits-list-gradient-fix' into 'master'Annabel Dunstone Gray2017-06-212-1/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed commit list system not gradient Closes #33896 See merge request !12306
| * | | | | | | Fixed commit list system not gradientsystem-note-commits-list-gradient-fixPhil Hughes2017-06-202-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #33896
* | | | | | | | Wording of Mysql support.sytses2017-06-211-3/+3
| | | | | | | |
* | | | | | | | Merge branch 'docs/exclude-codeclimate' into 'master'Rémy Coutable2017-06-211-0/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not run the codeclimate job on docs-only changes See merge request !12360
| * | | | | | | | Do not run the codeclimate job on docs-only changesAchilleas Pipinellis2017-06-211-0/+1
| | | | | | | | |
* | | | | | | | | Merge branch 'docs/add-missing-link' into 'master'Robert Speicher2017-06-211-0/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add missing link in Redis HA source docs Closes #33374 See merge request !12342
| * | | | | | | | | Add missing link in Redis HA source docsdocs/add-missing-linkAchilleas Pipinellis2017-06-211-0/+1
| | | | | | | | | |
* | | | | | | | | | Merge branch 'feature-checklist' into 'master'Marcia Ramos2017-06-211-6/+18
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a new feature checklist and more elaborate documentation requirements Closes #33750 See merge request !12220
| * | | | | | | | | | a new feature checklist and more elaborate documentation requirementsJob van der Voort2017-06-211-6/+18
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'backport-filtered-search-lazy-token-transient' into 'master'Clement Ho2017-06-211-0/+3
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport filtered search lazy token consistent state fix See merge request !12335
| * | | | | | | | | | Backport filtered search lazy token consistent state fixEric Eastwood2017-06-211-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2142 Didn't actually fix the spec but is worthwhile to get things in a consistent state no matter how fast the test runs.
* | | | | | | | | | | Merge branch '33441_supplement_simplified_chinese_translation_of_i18n' into ↵Douwe Maan2017-06-213-60/+842
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Supplement Simplified Chinese translation of Project Page & Repository Page Closes #33441 See merge request !11994
| * | | | | | | | | | | Change 'Committed by' Translate黄涛2017-06-202-2/+2
| | | | | | | | | | | |
| * | | | | | | | | | | Translation optimization黄涛2017-06-202-30/+27
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Modify the identified translations in the discussion. 2. rebase to master
| | * | | | | | | | | | | add missing translation fields黄涛2017-06-162-20/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Follow up !12052 commits.
| | * | | | | | | | | | | translation optimization in synchronous reviews黄涛2017-06-152-25/+25
| | | | | | | | | | | | |
| | * | | | | | | | | | | translation optimization in synchronous reviews黄涛2017-06-142-59/+59
| | | | | | | | | | | | |
| | * | | | | | | | | | | Rebase to master黄涛2017-06-130-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | Change the format in changelog黄涛2017-06-131-1/+1
| | | | | | | | | | | | | |
| | | * | | | | | | | | | | Optimization 'zh_CN' translation黄涛2017-06-133-11/+755
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Fix missing translations
| | | * | | | | | | | | | | optimize translation based on comments黄涛2017-06-123-614/+74
| | | | | | | | | | | | | |
| | | * | | | | | | | | | | add changelog of supplement simplified chinese translation黄涛2017-06-081-0/+4
| | | | | | | | | | | | | |
| | | * | | | | | | | | | | supplement simplified chinese translation黄涛2017-06-083-21/+656
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix #33441
| | * | | | | | | | | | | | Optimization 'zh_CN' translation黄涛2017-06-133-29/+28
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | Change the format in changelog黄涛2017-06-131-1/+1
| | | | | | | | | | | | | |