Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | Merge branch 'rename-ci-commit-phase-2' into rename-ci-commit-phase-3 | Kamil Trzcinski | 2016-06-06 | 58 | -414/+819 | |
| |\ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Rename all ci_commit[s] in application code to pipeline[s] | Kamil Trzcinski | 2016-06-03 | 16 | -83/+83 | |
* | | | | | | | | | Merge branch 'rename-ci-commit-phase-2' into 'master' | Douwe Maan | 2016-06-07 | 31 | -132/+134 | |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | | | ||||||
| * | | | | | | | | Merge remote-tracking branch 'origin/master' into rename-ci-commit-phase-2 | Kamil Trzcinski | 2016-06-07 | 12 | -61/+84 | |
| |\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Fix tests failures | Kamil Trzcinski | 2016-06-07 | 1 | -1/+1 | |
| | |_|_|_|/ / / / | |/| | | | | | | | ||||||
| * | | | | | | | | Merge remote-tracking branch 'origin/master' into rename-ci-commit-phase-2 | Kamil Trzcinski | 2016-06-06 | 13 | -123/+230 | |
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | | | ||||||
| * | | | | | | | | Merge branch 'rename-ci-commit' into rename-ci-commit-phase-2 | Kamil Trzcinski | 2016-06-06 | 4 | -6/+7 | |
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | | | ||||||
| | * | | | | | | | Merge remote-tracking branch 'origin/master' into rename-ci-commit | Kamil Trzcinski | 2016-06-06 | 4 | -6/+7 | |
| | |\ \ \ \ \ \ \ | ||||||
| * | \ \ \ \ \ \ \ | Merge branch 'rename-ci-commit' into rename-ci-commit-phase-2 | Kamil Trzcinski | 2016-06-06 | 27 | -112/+520 | |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | / / / | | |_|_|_|_|/ / / | |/| | | | | | | | ||||||
| | * | | | | | | | 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 | 26 | -108/+516 | |
| | |\ \ \ \ \ \ \ | | | | |_|_|_|_|/ | | | |/| | | | | | ||||||
| * | | | | | | | | Merge branch 'rename-ci-commit' into rename-ci-commit-phase-2 | Kamil Trzcinski | 2016-06-06 | 58 | -415/+820 | |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | / / | | |_|_|_|_|/ / | |/| | | | | | | ||||||
| | * | | | | | | Merge remote-tracking branch 'origin/master' into rename-ci-commit | Kamil Trzcinski | 2016-06-06 | 51 | -374/+779 | |
| | |\ \ \ \ \ \ | ||||||
| | * | | | | | | | Fix tests offenses: use `pipeline` of Ci::Build and rename views | Kamil Trzcinski | 2016-06-06 | 8 | -41/+41 | |
| * | | | | | | | | 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 | |
| |/ / / / / / / | ||||||
| * | | | | | | | Merge commit 'ca3c5c295ed653b483fe81c3918ffe60f46666b9' into rename-ci-commit | Kamil Trzcinski | 2016-06-03 | 7 | -6/+29 | |
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | | | ||||||
| * | | | | | | | Fix other places where we still use commit attribute of Build | Kamil Trzcinski | 2016-06-03 | 2 | -4/+4 | |
| * | | | | | | | Fix more places where we should rename ci_commit to pipeline | Kamil Trzcinski | 2016-06-03 | 2 | -2/+2 | |
| * | | | | | | | 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 | 7 | -13/+13 | |
| * | | | | | | | Merge remote-tracking branch 'origin/master' into rename-ci-commit | Kamil Trzcinski | 2016-06-03 | 22 | -59/+113 | |
| |\ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Try to use `pipeline` where applicable | Kamil Trzcinski | 2016-06-03 | 2 | -7/+7 | |
| * | | | | | | | | 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 | 16 | -49/+49 | |
* | | | | | | | | | Merge branch 'gh-disable-webhooks' | Douwe Maan | 2016-06-07 | 1 | -0/+4 | |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | | ||||||
| * | | | | | | | | Add a message warning user that Webhooks will be disabled | Douglas Barbosa Alexandre | 2016-06-06 | 1 | -0/+4 | |
| | |_|_|_|_|/ / | |/| | | | | | | ||||||
* | | | | | | | | Use better_errors editor links in sherlock18254-use-better_errors-editor-links-in-sherlock | Alejandro RodrÃguez | 2016-06-06 | 2 | -3/+11 | |
* | | | | | | | | Merge branch 'wiki-bottom-padding' into 'master' | Jacob Schatz | 2016-06-06 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Add padding to bottom of wiki page, fix #12921. | Connor Shea | 2016-06-06 | 1 | -1/+1 | |
| | |_|_|_|_|_|/ | |/| | | | | | | ||||||
* | | | | | | | | Merge branch 'activity-links' into 'master' | Jacob Schatz | 2016-06-06 | 1 | -3/+7 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Fixed issue with activity links not being consistentactivity-links | Phil Hughes | 2016-06-02 | 1 | -3/+7 | |
* | | | | | | | | | Merge branch 'edit-mobile' into 'master' | Jacob Schatz | 2016-06-06 | 3 | -9/+26 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Shows the edit comment button on mobileedit-mobile | Phil Hughes | 2016-06-02 | 3 | -9/+26 | |
| |/ / / / / / / / | ||||||
* | | | | | | | | | Merge branch '18026-consider-removing-issue-merge-request-previous-next-butto... | Jacob Schatz | 2016-06-06 | 3 | -45/+0 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Remove prev/next buttons on issues and merge requests18026-consider-removing-issue-merge-request-previous-next-buttons | Alejandro RodrÃguez | 2016-06-06 | 3 | -45/+0 | |
| | |_|/ / / / / / | |/| | | | | | | | ||||||
* | | | | | | | | | Merge branch 'confidential-issue-notice' into 'master' | Jacob Schatz | 2016-06-06 | 2 | -0/+39 | |
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | Fix error on non-issue pages with comment areas. | Connor Shea | 2016-06-05 | 1 | -1/+1 | |
| * | | | | | | | | Add confidential issue notice in comment box. | Connor Shea | 2016-06-03 | 2 | -0/+39 | |
* | | | | | | | | | Merge branch 'notes-are-awardables' into 'master' | Douwe Maan | 2016-06-06 | 13 | -123/+230 | |
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | Updated MR notes.notes-are-awardables | Fatih Acet | 2016-06-06 | 4 | -18/+16 | |
| * | | | | | | | | Fix scss-lint. | Fatih Acet | 2016-06-06 | 1 | -1/+1 | |
| * | | | | | | | | Added tests for award emoji feature. | Fatih Acet | 2016-06-06 | 2 | -11/+11 | |
| * | | | | | | | | Create and show emoji loader on the fly. | Fatih Acet | 2016-06-06 | 2 | -6/+21 | |
| * | | | | | | | | Some design related tweaks. | Fatih Acet | 2016-06-06 | 6 | -7/+24 | |
| * | | | | | | | | Be consistent on naming. | Fatih Acet | 2016-06-06 | 1 | -22/+22 | |
| * | | | | | | | | Animate emoji when rendered. | Fatih Acet | 2016-06-06 | 1 | -1/+12 | |
| * | | | | | | | | Fix mutual exclusivity for emoji only comments. | Fatih Acet | 2016-06-06 | 1 | -1/+4 |