Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'zj-workhorse-to-serve-diffs' into 'master' 14722-searching-for-usernames-should-only-be-possible-for-search-strings-with-a-valid-format | Jacob Vosmaer (GitLab) | 2016-06-07 | 7 | -31/+30 |
|\ | |||||
| * | Bump workhorse version to v0.7.5zj-workhorse-to-serve-diffs | Z.J. van de Weg | 2016-06-03 | 2 | -1/+2 |
| * | Workhorse to serve raw diffs | Zeger-Jan van de Weg | 2016-06-03 | 5 | -30/+28 |
* | | Merge branch 'rename-ci-commit-phase-3' into 'master' | Douwe Maan | 2016-06-07 | 17 | -91/+91 |
|\ \ | |||||
| * | | Rename @ci_commit to @pipeline in MergeRequestControllerrename-ci-commit-phase-3 | Kamil Trzcinski | 2016-06-07 | 1 | -4/+4 |
| * | | Merge branch 'rename-ci-commit-phase-2' into rename-ci-commit-phase-3 | Kamil Trzcinski | 2016-06-07 | 2 | -8/+8 |
| |\ \ | |||||
| * \ \ | Merge branch 'rename-ci-commit-phase-2' into rename-ci-commit-phase-3 | Kamil Trzcinski | 2016-06-07 | 36 | -146/+460 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'rename-ci-commit-phase-2' into rename-ci-commit-phase-3 | Kamil Trzcinski | 2016-06-06 | 31 | -156/+1798 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'rename-ci-commit-phase-2' into rename-ci-commit-phase-3 | Kamil Trzcinski | 2016-06-06 | 53 | -184/+2031 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'rename-ci-commit-phase-2' into rename-ci-commit-phase-3 | Kamil Trzcinski | 2016-06-06 | 124 | -948/+1957 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'rename-ci-commit-phase-2' into rename-ci-commit-phase-3 | Kamil Trzcinski | 2016-06-03 | 4 | -5/+5 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | Rename all ci_commit[s] in application code to pipeline[s] | Kamil Trzcinski | 2016-06-03 | 17 | -88/+88 |
* | | | | | | | | | Merge branch 'rename-ci-commit-phase-2' into 'master' | Douwe Maan | 2016-06-07 | 82 | -894/+895 |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | | | |||||
| * | | | | | | | | Fix remaining test offensesrename-ci-commit-phase-2 | Kamil Trzcinski | 2016-06-07 | 2 | -8/+8 |
| | |_|_|_|_|/ / | |/| | | | | | | |||||
| * | | | | | | | Merge remote-tracking branch 'origin/master' into rename-ci-commit-phase-2 | Kamil Trzcinski | 2016-06-07 | 29 | -102/+416 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | Fix tests failures | Kamil Trzcinski | 2016-06-07 | 7 | -44/+44 |
| | |_|_|_|_|/ / | |/| | | | | | | |||||
| * | | | | | | | Merge remote-tracking branch 'origin/master' into rename-ci-commit-phase-2 | Kamil Trzcinski | 2016-06-06 | 22 | -136/+1501 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'rename-ci-commit' into rename-ci-commit-phase-2 | Kamil Trzcinski | 2016-06-06 | 9 | -20/+297 |
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | | | |||||
| | * | | | | | | | Merge remote-tracking branch 'origin/master' into rename-ci-commitrename-ci-commit | Kamil Trzcinski | 2016-06-06 | 1 | -3/+23 |
| | |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | Merge remote-tracking branch 'origin/master' into rename-ci-commit | Kamil Trzcinski | 2016-06-06 | 8 | -18/+274 |
| | |\ \ \ \ \ \ \ \ | |||||
| * | \ \ \ \ \ \ \ \ | Merge branch 'rename-ci-commit' into rename-ci-commit-phase-2 | Kamil Trzcinski | 2016-06-06 | 53 | -184/+2031 |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | | | / / | | |_|_|_|_|_|_|/ / | |/| | | | | | | | | |||||
| | * | | | | | | | | Use `@ci_commit` in merge_request_controller | Kamil Trzcinski | 2016-06-06 | 1 | -4/+4 |
| | * | | | | | | | | Merge remote-tracking branch 'origin/master' into rename-ci-commit | Kamil Trzcinski | 2016-06-06 | 52 | -180/+2027 |
| | |\ \ \ \ \ \ \ \ | |||||
| * | \ \ \ \ \ \ \ \ | Merge branch 'rename-ci-commit' into rename-ci-commit-phase-2 | Kamil Trzcinski | 2016-06-06 | 124 | -949/+1958 |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | | | / / | | |_|_|_|_|_|_|/ / | |/| | | | | | | | | |||||
| | * | | | | | | | | Merge remote-tracking branch 'origin/master' into rename-ci-commit | Kamil Trzcinski | 2016-06-06 | 116 | -907/+1916 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Fix tests offenses: use `pipeline` of Ci::Build and rename views | Kamil Trzcinski | 2016-06-06 | 11 | -44/+44 |
| * | | | | | | | | | | Rename remaining ci_commits in specs | Kamil Trzcinski | 2016-06-03 | 4 | -5/+5 |
| | |_|_|_|_|_|_|/ / | |/| | | | | | | | | |||||
| * | | | | | | | | | Merge branch 'rename-ci-commit' into rename-ci-commit-phase-2 | Kamil Trzcinski | 2016-06-03 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |||||
| | * | | | | | | | | Fix merge_request handling | Kamil Trzcinski | 2016-06-03 | 1 | -1/+1 |
| * | | | | | | | | | Rename `commit` to `pipeline` in application code | Kamil Trzcinski | 2016-06-03 | 2 | -16/+16 |
| * | | | | | | | | | Rename all `[ci_]commit` to `[ci_]pipeline` in specs and features | Kamil Trzcinski | 2016-06-03 | 39 | -375/+373 |
| |/ / / / / / / / | |||||
| * | | | | | | | | Merge commit 'ca3c5c295ed653b483fe81c3918ffe60f46666b9' into rename-ci-commit | Kamil Trzcinski | 2016-06-03 | 21 | -22/+270 |
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | | | |||||
| * | | | | | | | | Fix other places where we still use commit attribute of Build | Kamil Trzcinski | 2016-06-03 | 5 | -27/+27 |
| * | | | | | | | | Fix more places where we should rename ci_commit to pipeline | Kamil Trzcinski | 2016-06-03 | 8 | -18/+18 |
| * | | | | | | | | Use foreign_key to define column name | Kamil Trzcinski | 2016-06-03 | 1 | -2/+2 |
| * | | | | | | | | Delegate to pipeline instead of commit | Kamil Trzcinski | 2016-06-03 | 1 | -1/+1 |
| * | | | | | | | | Use pipelines in context of Project | Kamil Trzcinski | 2016-06-03 | 13 | -20/+20 |
| * | | | | | | | | Merge remote-tracking branch 'origin/master' into rename-ci-commit | Kamil Trzcinski | 2016-06-03 | 40 | -204/+270 |
| |\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Try to use `pipeline` where applicable | Kamil Trzcinski | 2016-06-03 | 5 | -10/+10 |
| * | | | | | | | | | Rename Ci::Build commit to pipeline | Kamil Trzcinski | 2016-06-03 | 24 | -100/+100 |
| * | | | | | | | | | Use ci_commits table | Kamil Trzcinski | 2016-06-03 | 1 | -0/+2 |
| * | | | | | | | | | Rename Ci::Commit to Ci::Pipeline and rename some of the ci_commit to pipeline | Kamil Trzcinski | 2016-06-02 | 35 | -81/+81 |
* | | | | | | | | | | Merge branch 'gh-disable-webhooks' | Douwe Maan | 2016-06-07 | 5 | -4/+115 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Update CHANGELOG | Douglas Barbosa Alexandre | 2016-06-06 | 1 | -0/+1 |
| * | | | | | | | | | | Add a message warning user that Webhooks will be disabled | Douglas Barbosa Alexandre | 2016-06-06 | 1 | -0/+4 |
| * | | | | | | | | | | Disable Webhooks before proceeding with the GitHub import | Douglas Barbosa Alexandre | 2016-06-06 | 3 | -4/+110 |
| | |_|_|_|_|_|/ / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'gh-fix-comments-on-diff' | Douwe Maan | 2016-06-07 | 3 | -0/+8 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Fix importer for GitHub comments on diffgh-fix-comments-on-diff | Douglas Barbosa Alexandre | 2016-06-06 | 3 | -0/+8 |
| |/ / / / / / / / / | |||||
* | | | | | | | | | | Merge branch 'gh-rate-limit' | Douwe Maan | 2016-06-07 | 7 | -36/+97 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |||||
| * | | | | | | | | | Update CHANGELOG | Douglas Barbosa Alexandre | 2016-06-06 | 1 | -0/+1 |