summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* hot reloading for .vue fileshot-reloadSimon Knox2017-06-151-0/+4
* 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
| * | | | Improve codeclimate.yml to avoid timeoutsDmitriy Zaporozhets2017-06-141-3/+3
| * | | | Add codeclimate job to .gitlab-ci.ymlDmitriy Zaporozhets2017-06-141-0/+15
| * | | | Add yarn cache to code climate ignore listDmitriy Zaporozhets2017-06-141-0/+2
* | | | | Merge branch '32470-pag-links' into 'master'Annabel Dunstone Gray2017-06-142-3/+7
|\ \ \ \ \
| * | | | | more visual contrast for active page in pagination widget32470-pag-linksSimon Knox2017-06-132-3/+7
* | | | | | Merge branch 'help-landing-page-customizations' into 'master'Douwe Maan2017-06-1416-14/+129
|\ \ \ \ \ \
| * | | | | | Help landing page customizationsRobin Bobbitt2017-06-1413-14/+108
| * | | | | | Help landing page customizations - db changesRobin Bobbitt2017-06-133-0/+21
* | | | | | | Merge branch 'dm-diff-viewers' into 'master'Sean McGivern2017-06-1440-39/+1153
|\ \ \ \ \ \ \
| * | | | | | | Implement diff viewersDouwe Maan2017-06-1440-39/+1153
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch '2525-backport-kubernetes-service-changes' into 'master'Kamil Trzciński2017-06-145-57/+107
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Backport EE changes to the Kubernetes serviceNick Thomas2017-06-145-57/+107
* | | | | | | Merge branch '33149-rename-more-builds' into 'master'Kamil Trzciński2017-06-144-200/+202
|\ \ \ \ \ \ \
| * | | | | | | Fix other renamingLin Jen-Shin2017-06-141-1/+1
| * | | | | | | Merge remote-tracking branch 'upstream/master' into 33149-rename-more-buildsLin Jen-Shin2017-06-14117-393/+1485
| |\ \ \ \ \ \ \
| * | | | | | | | 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-13843-4496/+15172
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Fix raw_path with the new job path, rename to jobLin Jen-Shin2017-06-064-195/+197
* | | | | | | | | | Merge branch 'zj-raise-etag-route-regex-miss' into 'master'Kamil Trzciński2017-06-147-56/+36
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Revert to passing the path when matching key to the routerzj-raise-etag-route-regex-missZ.J. van de Weg2017-06-125-55/+32
| * | | | | | | | | | Fix etag route missesZ.J. van de Weg2017-06-122-3/+4
| * | | | | | | | | | Raise exception on invalid pipeline cacheKamil Trzcinski2017-06-121-0/+2
* | | | | | | | | | | Merge branch 'vue-pipelines-code' into 'master'Phil Hughes2017-06-1425-836/+847
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Move vue components to vue files and match docsFilipa Lacerda2017-06-1425-836/+847
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch 'patch-24' into 'master'Sean McGivern2017-06-141-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Fix Markdown in JIRA integration docsAdam Niedzielski2017-06-141-1/+1
|/ / / / / / / / / /
* | | | | | | | | | Merge branch '33639-whitespace' into 'master'32795-internationalise-project-activity-pagePhil Hughes2017-06-141-0/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Adds back whitespace for job's traceFilipa Lacerda2017-06-141-0/+1
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'backport-empty-panel-heading-styles-from-related-issues' into '...Filipa Lacerda2017-06-141-0/+4
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | |
| * | | | | | | | | Backport empty panel heading from EE related issuesbackport-empty-panel-heading-styles-from-related-issuesEric Eastwood2017-06-131-0/+4
| | |_|_|_|_|_|/ / | |/| | | | | | |