summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Backport canEdit changes for conditional remove buttonback-port-locked-milestones-to-ceEric Eastwood2017-05-2610-41/+88
* Merge branch 'dm-diff-cleanup' into 'master'Robert Speicher2017-05-2537-278/+261
|\
| * Address feedbackDouwe Maan2017-05-252-5/+3
| * Change code comment formattingdm-diff-cleanupDouwe Maan2017-05-231-1/+3
| * Remove @commit in compare and MR controllersDouwe Maan2017-05-233-11/+4
| * Pass fallback_diff_refs to Diff::File instead of using view helpersDouwe Maan2017-05-2319-116/+111
| * Clean up diff renderingDouwe Maan2017-05-2314-134/+123
| * Consistently style image in blob and diffDouwe Maan2017-05-233-3/+2
| * Rename Diff::File {old,new}_ref to {old,new}_shaDouwe Maan2017-05-232-7/+7
| * Add question mark to Gitlab::Diff::File predicate methodsDouwe Maan2017-05-2311-43/+50
* | Merge branch '32851-fix-postgres-9-1' into 'master'Douwe Maan2017-05-256-17/+49
|\ \
| * | Only use DROP INDEX CONCURRENTLY on postgreql 9.2+Nick Thomas2017-05-256-17/+49
* | | Merge branch 'fix-i18-docs' into 'master'Douwe Maan2017-05-251-1/+11
|\ \ \
| * | | Add small update for the i18n guide.fix-i18-docsRuben Davila2017-05-251-1/+11
* | | | Merge branch 'issue_19262' into 'master'Douwe Maan2017-05-253-10/+29
|\ \ \ \
| * | | | Remove unecessary commit pattern checkFelipe Artur2017-05-252-11/+1
| * | | | Prevent commits from upstream repositories to be re-processed by forksFelipe Artur2017-05-223-0/+29
* | | | | Merge branch 'winh-label-textcolor-default' into 'master'Grzegorz Bizon2017-05-253-3/+23
|\ \ \ \ \
| * | | | | Provide default for calculating label text color (!11681)winh2017-05-252-3/+6
| * | | | | Add failing test for #32728winh2017-05-251-0/+17
* | | | | | Merge branch '32748-emails-are-being-sent-with-the-wrong-language' into 'master'Douwe Maan2017-05-257-29/+62
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Bugfix: Always use the default language when generating emails.32748-emails-are-being-sent-with-the-wrong-languageRuben Davila2017-05-257-29/+62
* | | | | | Merge branch '32762-gitaly-should-be-recompiled-when-gitaly_server_version-ch...Robert Speicher2017-05-251-1/+12
|\ \ \ \ \ \
| * | | | | | Re-download and recompile Gitaly in tests if the version changed32762-gitaly-should-be-recompiled-when-gitaly_server_version-changesAlejandro Rodríguez2017-05-241-1/+12
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch '32801-fix-discussion-header-wrapping-in-parallel-diff' into 'ma...Annabel Dunstone Gray2017-05-252-3/+8
|\ \ \ \ \ \
| * | | | | | Fix note header author and time ago wrapping in parallel diff32801-fix-discussion-header-wrapping-in-parallel-diffEric Eastwood2017-05-252-3/+8
* | | | | | | Merge branch 'dm-more-dependency-linkers' into 'master'Grzegorz Bizon2017-05-2528-63/+1123
|\ \ \ \ \ \ \
| * | | | | | | Add regexp_for_value helper methoddm-more-dependency-linkersDouwe Maan2017-05-253-40/+25
| * | | | | | | Cartfile git and binary methods cannot take a GitHub repoDouwe Maan2017-05-251-8/+2
| * | | | | | | Add changelogDouwe Maan2017-05-231-0/+4
| * | | | | | | Autolink package names in requirements.txtDouwe Maan2017-05-234-0/+113
| * | | | | | | Autolink package names in Godeps.jsonDouwe Maan2017-05-234-0/+119
| * | | | | | | Autolink package names in CartfileDouwe Maan2017-05-234-0/+103
| * | | | | | | Autolink package names in podspec.jsonDouwe Maan2017-05-234-0/+137
| * | | | | | | Autolink package names in podspecDouwe Maan2017-05-234-0/+102
| * | | | | | | Autolink package names in PodfileDouwe Maan2017-05-235-0/+87
| * | | | | | | Autolink package names in composer.jsonDouwe Maan2017-05-234-0/+109
| * | | | | | | Autolink package names in package.jsonDouwe Maan2017-05-236-0/+205
| * | | | | | | Autolink package names in gemspecDouwe Maan2017-05-234-1/+94
| * | | | | | | Refactor DependencyLinker::BaseLinkerDouwe Maan2017-05-235-62/+71
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'fix-filtered-search-issuable-empty-state-exception' into 'master'Phil Hughes2017-05-252-1/+33
|\ \ \ \ \ \ \
| * | | | | | | Remove shared example and improve sub_group_issuables_spec.rbfix-filtered-search-issuable-empty-state-exceptionLuke "Jared" Bennett2017-05-252-22/+17
| * | | | | | | Remove 'should' from scenario in has_subgroup_title_spec.rbLuke "Jared" Bennett2017-05-251-1/+1
| * | | | | | | Added specs to test for subgroup titles on issue and mr pagesLuke "Jared" Bennett2017-05-122-0/+37
| * | | | | | | Check for filtered-search before constructing filteredsearchmanagerLuke "Jared" Bennett2017-05-121-1/+1
* | | | | | | | Merge branch 'add-back-margin-to-note-text' into 'master'Annabel Dunstone Gray2017-05-251-6/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove 0 margin bottom for last paragraph on note textadd-back-margin-to-note-texttauriedavis2017-05-241-6/+0
* | | | | | | | | Merge branch 'revert-b0498c17' into 'master'Robert Speicher2017-05-2532-788/+804
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Remove extra spacerevert-b0498c17Douwe Maan2017-05-241-1/+1
| * | | | | | | | | Revert "Remove changes that are not absolutely necessary"Douwe Maan2017-05-2432-788/+804
View Lorry Controller Status