summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'deserialize-custom-notifications' into 'master'Robert Speicher2017-06-154-4/+157
|\
| * Deserialise existing custom notification settingsdeserialize-custom-notificationsSean McGivern2017-06-154-4/+151
| * Add columns for custom notification settingsSean McGivern2017-06-151-2/+8
* | 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 'deprecate-gitaly-path' into 'master'Sean McGivern2017-06-156-12/+34
|\ \ | |/ |/|
| * Stop using deprecated `path` field on Gitaly messagesAlejandro Rodríguez2017-06-146-12/+34
* | #13336 - display multiple messages in both the UI and git outputMike Ricketts2017-06-152-15/+44
* | 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-151-0/+59
|\ \ \
| * | | Add blame view age mapJeff Stubler2017-06-141-0/+59
* | | | 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-153-3/+19
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Do not show manual actions that cannot be runfix-manual-actionsKamil Trzcinski2017-06-133-3/+19
* | | | | Merge branch 'instrument-merge-request-diff-load-commits' into 'master'Sean McGivern2017-06-151-0/+1
|\ \ \ \ \
| * | | | | Instrument MergeRequestDiff#load_commitsinstrument-merge-request-diff-load-commitsSean McGivern2017-06-141-0/+1
* | | | | | Merge branch 'dm-fix-parser-cache' into 'master'Sean McGivern2017-06-151-1/+1
|\ \ \ \ \ \
| * | | | | | Don't return nil for missing objects from parser cachedm-fix-parser-cacheDouwe Maan2017-06-141-1/+1
* | | | | | | Merge branch '33483-fix-note-highlight-being-lost-on-note-update' into 'master'Phil Hughes2017-06-151-0/+45
|\ \ \ \ \ \ \
| * | | | | | | Fix note highlight being lost after real time updateEric Eastwood2017-06-141-0/+45
* | | | | | | | Merge branch '32861-fix-milestone-drag-and-drop-assignees' into 'master'Phil Hughes2017-06-151-1/+9
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | Fix milestone page assignees when dropped in ongoing listEric Eastwood2017-06-141-1/+9
| |/ / / / / /
* | | | | | | Merge branch 'rs-fix-codeclimate-build' into 'master'Douwe Maan2017-06-141-1/+0
|\ \ \ \ \ \ \
| * | | | | | | Require rubocop-rspec in the correct locationrs-fix-codeclimate-buildRobert Speicher2017-06-141-1/+0
* | | | | | | | Merge branch '33529-fix-autocomplete-atwho-not-showing-on-note-edit-form' int...Clement Ho2017-06-141-0/+17
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Fix autocomplete not working on note edit formEric Eastwood2017-06-141-0/+17
| |/ / / / / /
* | | | | | | Correct RSpec/SingleLineHook cop offensesRobert Speicher2017-06-14205-633/+1940
* | | | | | | Add a custom RSpec/SingleLineHook copRobert Speicher2017-06-141-0/+67
* | | | | | | Merge branch 'help-landing-page-customizations' into 'master'Douwe Maan2017-06-144-2/+53
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Help landing page customizationsRobin Bobbitt2017-06-144-2/+53
* | | | | | | Merge branch 'dm-diff-viewers' into 'master'Sean McGivern2017-06-148-2/+733
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Implement diff viewersDouwe Maan2017-06-148-2/+733
| | |/ / / / | |/| | | |
* | | | | | Merge branch '2525-backport-kubernetes-service-changes' into 'master'Kamil Trzciński2017-06-143-32/+83
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Backport EE changes to the Kubernetes serviceNick Thomas2017-06-143-32/+83
| | |/ / / | |/| | |
* | | | | Merge branch '33149-rename-more-builds' into 'master'Kamil Trzciński2017-06-143-199/+201
|\ \ \ \ \
| * | | | | Fix other renamingLin Jen-Shin2017-06-141-1/+1
| * | | | | Merge remote-tracking branch 'upstream/master' into 33149-rename-more-buildsLin Jen-Shin2017-06-1427-176/+898
| |\ \ \ \ \
| * | | | | | Fix other renamingLin Jen-Shin2017-06-141-11/+11
| * | | | | | Merge remote-tracking branch 'upstream/master' into 33149-rename-more-builds33149-rename-more-buildsLin Jen-Shin2017-06-13221-1456/+5384
| |\ \ \ \ \ \
| * | | | | | | Fix raw_path with the new job path, rename to jobLin Jen-Shin2017-06-063-194/+196
* | | | | | | | Merge branch 'zj-raise-etag-route-regex-miss' into 'master'Kamil Trzciński2017-06-142-52/+25
|\ \ \ \ \ \ \ \
| * | | | | | | | Revert to passing the path when matching key to the routerzj-raise-etag-route-regex-missZ.J. van de Weg2017-06-122-52/+25
* | | | | | | | | Move vue components to vue files and match docsFilipa Lacerda2017-06-147-7/+7
| |_|_|_|/ / / / |/| | | | | | |
* | | | | | | | Merge branch 'backport-related-issues-board-issue-count-badge-styles' into 'm...Filipa Lacerda2017-06-141-8/+8
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Backport issue count badge style refactor for re-usebackport-related-issues-board-issue-count-badge-stylesEric Eastwood2017-06-131-8/+8
* | | | | | | | Merge branch 'feature/add-support-for-services-configuration' into 'master'Grzegorz Bizon2017-06-1410-128/+414
|\ \ \ \ \ \ \ \
| * | | | | | | | Improve specs for GitlabCiYamlProcessorTomasz Maczukin2017-06-121-50/+105
| * | | | | | | | Ensure that old API v1 generates still the same outputTomasz Maczukin2017-06-121-0/+12
| * | | | | | | | Send new configuration options with job's payloadTomasz Maczukin2017-06-123-12/+60