summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Align links and tabs18058-sub-navAnnabel Dunstone2016-06-071-3/+6
* Add scrolling tabs to code subnavAnnabel Dunstone2016-06-072-20/+41
* Finish styling sub navAnnabel Dunstone2016-06-0711-211/+234
* Start styling sub navAnnabel Dunstone2016-06-074-52/+80
* Merge branch 'zj-workhorse-to-serve-diffs' into 'master' 14722-searching-for-usernames-should-only-be-possible-for-search-strings-with-a-valid-formatJacob Vosmaer (GitLab)2016-06-072-10/+10
|\
| * Workhorse to serve raw diffsZeger-Jan van de Weg2016-06-032-10/+10
* | Merge branch 'rename-ci-commit-phase-3' into 'master' Douwe Maan2016-06-0716-86/+86
|\ \
| * | Rename @ci_commit to @pipeline in MergeRequestControllerrename-ci-commit-phase-3Kamil Trzcinski2016-06-071-4/+4
| * | Merge branch 'rename-ci-commit-phase-2' into rename-ci-commit-phase-3Kamil Trzcinski2016-06-0713-62/+85
| |\ \
| * \ \ Merge branch 'rename-ci-commit-phase-2' into rename-ci-commit-phase-3Kamil Trzcinski2016-06-0617-129/+237
| |\ \ \
| * \ \ \ Merge branch 'rename-ci-commit-phase-2' into rename-ci-commit-phase-3Kamil Trzcinski2016-06-0627-112/+520
| |\ \ \ \
| * \ \ \ \ Merge branch 'rename-ci-commit-phase-2' into rename-ci-commit-phase-3Kamil Trzcinski2016-06-0658-414/+819
| |\ \ \ \ \
| * | | | | | Rename all ci_commit[s] in application code to pipeline[s]Kamil Trzcinski2016-06-0316-83/+83
* | | | | | | Merge branch 'rename-ci-commit-phase-2' into 'master' Douwe Maan2016-06-0731-132/+134
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | Merge remote-tracking branch 'origin/master' into rename-ci-commit-phase-2Kamil Trzcinski2016-06-0712-61/+84
| |\ \ \ \ \ \
| * | | | | | | Fix tests failuresKamil Trzcinski2016-06-071-1/+1
| | |_|_|_|/ / | |/| | | | |
| * | | | | | Merge remote-tracking branch 'origin/master' into rename-ci-commit-phase-2Kamil Trzcinski2016-06-0613-123/+230
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'rename-ci-commit' into rename-ci-commit-phase-2Kamil Trzcinski2016-06-064-6/+7
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| | * | | | | | Merge remote-tracking branch 'origin/master' into rename-ci-commitKamil Trzcinski2016-06-064-6/+7
| | |\ \ \ \ \ \
| * | \ \ \ \ \ \ Merge branch 'rename-ci-commit' into rename-ci-commit-phase-2Kamil Trzcinski2016-06-0627-112/+520
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | / / | | |_|_|_|_|/ / | |/| | | | | |
| | * | | | | | Use `@ci_commit` in merge_request_controllerKamil Trzcinski2016-06-061-4/+4
| | * | | | | | Merge remote-tracking branch 'origin/master' into rename-ci-commitKamil Trzcinski2016-06-0626-108/+516
| | |\ \ \ \ \ \
| * | \ \ \ \ \ \ Merge branch 'rename-ci-commit' into rename-ci-commit-phase-2Kamil Trzcinski2016-06-0658-415/+820
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | / / | | |_|_|_|_|/ / | |/| | | | | |
| | * | | | | | Merge remote-tracking branch 'origin/master' into rename-ci-commitKamil Trzcinski2016-06-0651-374/+779
| | |\ \ \ \ \ \
| | * | | | | | | Fix tests offenses: use `pipeline` of Ci::Build and rename viewsKamil Trzcinski2016-06-068-41/+41
| * | | | | | | | Merge branch 'rename-ci-commit' into rename-ci-commit-phase-2Kamil Trzcinski2016-06-031-1/+1
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Fix merge_request handlingKamil Trzcinski2016-06-031-1/+1
| * | | | | | | | Rename `commit` to `pipeline` in application codeKamil Trzcinski2016-06-032-16/+16
| |/ / / / / / /
| * | | | | | | Merge commit 'ca3c5c295ed653b483fe81c3918ffe60f46666b9' into rename-ci-commitKamil Trzcinski2016-06-037-6/+29
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| * | | | | | | Fix other places where we still use commit attribute of BuildKamil Trzcinski2016-06-032-4/+4
| * | | | | | | Fix more places where we should rename ci_commit to pipelineKamil Trzcinski2016-06-032-2/+2
| * | | | | | | Use foreign_key to define column nameKamil Trzcinski2016-06-031-2/+2
| * | | | | | | Delegate to pipeline instead of commitKamil Trzcinski2016-06-031-1/+1
| * | | | | | | Use pipelines in context of ProjectKamil Trzcinski2016-06-037-13/+13
| * | | | | | | Merge remote-tracking branch 'origin/master' into rename-ci-commitKamil Trzcinski2016-06-0322-59/+113
| |\ \ \ \ \ \ \
| * | | | | | | | Try to use `pipeline` where applicableKamil Trzcinski2016-06-032-7/+7
| * | | | | | | | Use ci_commits tableKamil Trzcinski2016-06-031-0/+2
| * | | | | | | | Rename Ci::Commit to Ci::Pipeline and rename some of the ci_commit to pipelineKamil Trzcinski2016-06-0216-49/+49
* | | | | | | | | Merge branch 'gh-disable-webhooks'Douwe Maan2016-06-071-0/+4
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | |
| * | | | | | | | Add a message warning user that Webhooks will be disabledDouglas Barbosa Alexandre2016-06-061-0/+4
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Use better_errors editor links in sherlock18254-use-better_errors-editor-links-in-sherlockAlejandro Rodríguez2016-06-062-3/+11
* | | | | | | | Merge branch 'wiki-bottom-padding' into 'master' Jacob Schatz2016-06-061-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Add padding to bottom of wiki page, fix #12921.Connor Shea2016-06-061-1/+1
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge branch 'activity-links' into 'master' Jacob Schatz2016-06-061-3/+7
|\ \ \ \ \ \ \ \
| * | | | | | | | Fixed issue with activity links not being consistentactivity-linksPhil Hughes2016-06-021-3/+7
* | | | | | | | | Merge branch 'edit-mobile' into 'master' Jacob Schatz2016-06-063-9/+26
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Shows the edit comment button on mobileedit-mobilePhil Hughes2016-06-023-9/+26
| |/ / / / / / / /
* | | | | | | | | Merge branch '18026-consider-removing-issue-merge-request-previous-next-butto...Jacob Schatz2016-06-063-45/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Remove prev/next buttons on issues and merge requests18026-consider-removing-issue-merge-request-previous-next-buttonsAlejandro Rodríguez2016-06-063-45/+0
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'confidential-issue-notice' into 'master' Jacob Schatz2016-06-062-0/+39
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
View Lorry Controller Status