summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Update issue_board.mdissue-board-docsVictor Wu2017-06-151-2/+3
* Merge branch '33614-try-to-fix-transient-failure' into 'master'Robert Speicher2017-06-151-2/+2
|\
| * Try to use the same pattern as other spec in this file33614-try-to-fix-transient-failureRémy Coutable2017-06-151-2/+2
|/
* Merge branch 'docs-registry-hostname-part-of-service-hostname' into 'master'33745-issue-closing-pattern-does-not-work-for-secondary-issues-when-using-full-urlsRémy Coutable2017-06-151-0/+12
|\
| * Language typos fixedMatej Zerovnik2017-06-121-2/+2
| * Service hostname also include registry name, when using non Docker Hub registry.Matej2017-05-261-0/+12
* | Merge branch '31782-fix-diff-discussion-file-title-misalignment' into 'master'Annabel Dunstone Gray2017-06-151-2/+3
|\ \
| * | Fix file diff title and renames alignment in discussions31782-fix-diff-discussion-file-title-misalignmentEric Eastwood2017-06-141-2/+3
* | | Merge branch 'deprecate-gitaly-path' into 'master'Sean McGivern2017-06-159-23/+361
|\ \ \
| * | | Stop using deprecated `path` field on Gitaly messagesAlejandro Rodríguez2017-06-149-23/+361
* | | | Merge branch '13336-multiple-broadcast-messages' into 'master'Rémy Coutable2017-06-157-19/+61
|\ \ \ \
| * | | | #13336 - display multiple messages in both the UI and git outputMike Ricketts2017-06-157-19/+61
|/ / / /
* | | | Merge branch 'docs/gb/document-new-migrations-testing-technique' into 'master'Rémy Coutable2017-06-151-0/+87
|\ \ \ \
| * | | | Document a new migrations testing techniquedocs/gb/document-new-migrations-testing-techniqueGrzegorz Bizon2017-06-151-0/+87
* | | | | Merge branch '23998-blame-age-map' into 'master'Annabel Dunstone Gray2017-06-157-3/+158
|\ \ \ \ \
| * | | | | Add blame view age mapJeff Stubler2017-06-147-3/+158
* | | | | | Merge branch 'sh-fix-spec-helper-ee-consistency' into 'master'Rémy Coutable2017-06-151-0/+1
|\ \ \ \ \ \
| * | | | | | Make spec/spec_helper consistent with EE by including a :routing typesh-fix-spec-helper-ee-consistencyStan Hu2017-06-141-0/+1
* | | | | | | Merge branch 'fix-manual-actions' into 'master'Grzegorz Bizon2017-06-155-5/+25
|\ \ \ \ \ \ \
| * | | | | | | Do not show manual actions that cannot be runfix-manual-actionsKamil Trzcinski2017-06-135-5/+25
* | | | | | | | Merge branch 'backport-merge_params-conflict-message-to-ce-master' into 'master'Sean McGivern2017-06-151-1/+2
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Improve conflict message in _merge_params.html.hamlLuke "Jared" Bennett2017-06-141-1/+2
| * | | | | | | Backport merge_params.html.haml conflict commentLuke "Jared" Bennett2017-06-141-1/+1
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'instrument-merge-request-diff-load-commits' into 'master'Sean McGivern2017-06-153-0/+8
|\ \ \ \ \ \ \
| * | | | | | | Instrument MergeRequestDiff#load_commitsinstrument-merge-request-diff-load-commitsSean McGivern2017-06-143-0/+8
* | | | | | | | Merge branch 'dm-fix-parser-cache' into 'master'Sean McGivern2017-06-153-2/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | Don't return nil for missing objects from parser cachedm-fix-parser-cacheDouwe Maan2017-06-143-2/+6
* | | | | | | | | Merge branch '33483-fix-note-highlight-being-lost-on-note-update' into 'master'Phil Hughes2017-06-152-3/+70
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix note highlight being lost after real time updateEric Eastwood2017-06-142-3/+70
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch '32861-fix-milestone-drag-and-drop-assignees' into 'master'Phil Hughes2017-06-152-11/+23
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | Fix milestone page assignees when dropped in ongoing listEric Eastwood2017-06-142-11/+23
| |/ / / / / / /
* | | | | | | | Merge branch 'dm-target-branch-slash-command-desc' into 'master'Robert Speicher2017-06-142-1/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | Update /target_branch slash command description to be more consistentdm-target-branch-slash-command-descDouwe Maan2017-06-142-1/+5
* | | | | | | | | Merge branch 'rs-fix-codeclimate-build' into 'master'Douwe Maan2017-06-142-2/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Require rubocop-rspec in the correct locationrs-fix-codeclimate-buildRobert Speicher2017-06-142-2/+3
* | | | | | | | | | Remove extra line so that it is consistent with EEClement Ho2017-06-141-1/+0
* | | | | | | | | | Merge branch '33529-fix-autocomplete-atwho-not-showing-on-note-edit-form' int...Clement Ho2017-06-142-1/+18
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Fix autocomplete not working on note edit formEric Eastwood2017-06-142-1/+18
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'pipelines-row-vue-file-fix' into 'master'Annabel Dunstone Gray2017-06-141-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fixed pipelines Vue template not ending correctlypipelines-row-vue-file-fixPhil Hughes2017-06-141-1/+1
| |/ / / / / / / /
* | | | | | | | | Merge branch 'winh-select2-remove-token' into 'master'Annabel Dunstone Gray2017-06-141-2/+4
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Move remove token of Select2 to the rightwinh2017-06-141-2/+4
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch 'rs-single-line-rspec-hook-cop' into 'master'Douwe Maan2017-06-14209-633/+2051
|\ \ \ \ \ \ \ \
| * | | | | | | | Enable RSpec/SingleLineHook copRobert Speicher2017-06-141-1/+1
| * | | | | | | | Correct RSpec/SingleLineHook cop offensesRobert Speicher2017-06-14205-633/+1940
| * | | | | | | | Add a custom RSpec/SingleLineHook copRobert Speicher2017-06-144-0/+111
|/ / / / / / / /
* | | | | | | | Merge branch '31263-fix-fenced-code-misalignment-with-activity' into 'master'Annabel Dunstone Gray2017-06-141-1/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix fenced code block misalignment in events/activity31263-fix-fenced-code-misalignment-with-activityEric Eastwood2017-06-131-1/+0
* | | | | | | | | Merge branch 'dz-add-codeclimate-job' into 'master'Dmitriy Zaporozhets2017-06-142-3/+27
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Exclude more path from codeclimate jobDmitriy Zaporozhets2017-06-142-15/+22