summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Remove unnecessary top padding on group MR indexdm-unnecessary-top-paddingDouwe Maan2017-06-222-2/+5
* Merge branch 'workhorse-2.2.0' into 'master'Sean McGivern2017-06-221-1/+1
|\
| * Use gitlab-workhorse 2.2.0Jacob Vosmaer2017-06-221-1/+1
* | Merge branch 'backport-projects-mr-controller-changes' into 'master'Douwe Maan2017-06-221-3/+7
|\ \
| * | Backport changes to Projects::MergeRequestsController for gitlab-org/gitlab-e...Nick Thomas2017-06-211-3/+7
* | | Merge branch 'commits-internationalise' into 'master'Douwe Maan2017-06-226-19/+75
|\ \ \
| * | | Added internationalization to commits listcommits-internationalisePhil Hughes2017-06-226-19/+75
* | | | Merge branch '33489-rename-settings-panel-close-action-to-collapse-to-avoid-c...Annabel Dunstone Gray2017-06-224-4/+4
|\ \ \ \
| * | | | Resolve "Rename settings panel "close" action to "collapse" to avoid confusion"Mike Greiling2017-06-224-4/+4
|/ / / /
* | | | Merge branch 'gitaly-0.13.0' into 'master'Sean McGivern2017-06-221-1/+1
|\ \ \ \
| * | | | 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 issue33904-edit-issue-warningSimon Knox2017-06-222-10/+6
* | | | Merge branch 'patch-17' into 'master'Marin Jankovski2017-06-221-20/+26
|\ \ \ \ | |_|/ / |/| | |
| * | | 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 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 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 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
* | | | | | | Merge branch 'dm-restore-capybara-screenshot' into 'master'Robert Speicher2017-06-221-2/+3
|\ \ \ \ \ \ \
| * | | | | | | Don't reset the session when the example failed, because we need capybara-scr...dm-restore-capybara-screenshotDouwe Maan2017-06-211-2/+3
* | | | | | | | Merge branch '33833-issue-and-mr-state-tabs-don-t-work-on-dashboard' into 'ma...Jacob Schatz2017-06-225-34/+21
|\ \ \ \ \ \ \ \
| * | | | | | | | 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 '33917-mr-comment-system-note-highlight-don-t-have-the-same-widt...Annabel Dunstone Gray2017-06-225-40/+75
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | 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 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 gradientsystem-note-commits-list-gradient-fixPhil Hughes2017-06-202-1/+5
* | | | | | | | | 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 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 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 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 fixEric Eastwood2017-06-211-0/+3
* | | | | | | | | | | Merge branch '33441_supplement_simplified_chinese_translation_of_i18n' into '...Douwe Maan2017-06-213-60/+842
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Change 'Committed by' Translate黄涛2017-06-202-2/+2
| * | | | | | | | | | | Translation optimization黄涛2017-06-202-30/+27
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | add missing translation fields黄涛2017-06-162-20/+32
| | * | | | | | | | | | | 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
| | |\ \ \ \ \ \ \ \ \ \ \