Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'fix-escaping' into 'master' | Sean McGivern | 2016-10-19 | 1 | -1/+1 |
|\ | |||||
| * | fix: commit messages being double-escaped in activies tab | amaia | 2016-10-18 | 1 | -1/+1 |
* | | Merge branch 'grapify-commit-statuses-api' into 'master' | Rémy Coutable | 2016-10-19 | 1 | -26/+27 |
|\ \ | |||||
| * | | Grapify the commit status APIgrapify-commit-statuses-api | Robert Schilling | 2016-10-19 | 1 | -26/+27 |
* | | | Merge branch 'fix-system-hook-api' into 'master' | Rémy Coutable | 2016-10-19 | 1 | -6/+4 |
|\ \ \ | |||||
| * | | | API: Fix Sytem hooks delete behaviorfix-system-hook-api | Robert Schilling | 2016-10-14 | 1 | -6/+4 |
* | | | | Merge branch '22191-delete-dynamic-envs-mr' into 'master' | Rémy Coutable | 2016-10-19 | 2 | -2/+46 |
|\ \ \ \ | |||||
| * \ \ \ | Merge remote-tracking branch 'origin/master' into 22191-delete-dynamic-envs-mr22191-delete-dynamic-envs-mr | Kamil Trzcinski | 2016-10-18 | 2 | -5/+9 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| * | | | | Add logical validation to gitlab-ci.yml | Kamil Trzcinski | 2016-10-18 | 1 | -0/+30 |
| * | | | | Merge remote-tracking branch 'origin/master' into 22191-delete-dynamic-envs-mr | Kamil Trzcinski | 2016-10-18 | 4 | -12/+75 |
| |\ \ \ \ | |||||
| * | | | | | Add specs to test on_stop and action on environments | Kamil Trzcinski | 2016-10-17 | 1 | -0/+4 |
| * | | | | | Improve after code review | Kamil Trzcinski | 2016-10-17 | 1 | -2/+2 |
| * | | | | | Merge remote-tracking branch 'origin/master' into 22191-delete-dynamic-envs-mr | Kamil Trzcinski | 2016-10-17 | 2 | -1/+18 |
| |\ \ \ \ \ | |||||
| * | | | | | | Add `action` and `on_stop` to `environment` in .gitlab-ci.yml | Kamil Trzcinski | 2016-10-17 | 1 | -3/+11 |
| * | | | | | | Merge remote-tracking branch 'origin/master' into 22191-delete-dynamic-envs-mr | Kamil Trzcinski | 2016-10-17 | 38 | -403/+924 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | Initial support for closing environments | Kamil Trzcinski | 2016-10-06 | 1 | -1/+3 |
* | | | | | | | | Merge branch '22782-external-link-filter-with-non-lowercase-scheme' into 'mas... | Sean McGivern | 2016-10-18 | 1 | -4/+30 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Add Nofollow for uppercased scheme in external url | the-undefined | 2016-10-18 | 1 | -4/+30 |
| | |_|_|/ / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'pipeline-emails' into 'master' | Kamil Trzciński | 2016-10-18 | 3 | -0/+49 |
|\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' into pipeline-emailspipeline-emails | Lin Jen-Shin | 2016-10-18 | 6 | -13/+93 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |||||
| * | | | | | | | | Merge remote-tracking branch 'upstream/master' into pipeline-emails | Lin Jen-Shin | 2016-10-17 | 2 | -11/+10 |
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | | | |||||
| * | | | | | | | | Merge remote-tracking branch 'upstream/master' into pipeline-emails | Lin Jen-Shin | 2016-10-14 | 22 | -254/+517 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' into pipeline-emails | Lin Jen-Shin | 2016-10-08 | 43 | -264/+628 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' into pipeline-emails | Lin Jen-Shin | 2016-10-04 | 36 | -393/+309 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' into pipeline-emails | Lin Jen-Shin | 2016-09-21 | 29 | -151/+619 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Make various trace methods take last_lines argument: | Lin Jen-Shin | 2016-09-21 | 1 | -0/+49 |
| * | | | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into pipeline-emails | Lin Jen-Shin | 2016-09-19 | 8 | -27/+35 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' into pipeline-emails | Lin Jen-Shin | 2016-09-14 | 15 | -41/+114 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' into pipeline-emails | Lin Jen-Shin | 2016-09-12 | 68 | -420/+904 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | We don't need them | Lin Jen-Shin | 2016-09-01 | 2 | -0/+0 |
* | | | | | | | | | | | | | | | | Merge branch 'zj-grapify-commits' into 'master' | Rémy Coutable | 2016-10-18 | 1 | -60/+69 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Use GrapeDSL for commits | Z.J. van de Weg | 2016-10-18 | 1 | -60/+69 |
| | |_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | Merge branch 'adam-fix-mr-diff-symlink-file-conversion' into 'master' | Sean McGivern | 2016-10-18 | 2 | -5/+9 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Fix the diff in the merge request view when converting a symlink to a regular...adam-fix-mr-diff-symlink-file-conversion | Adam Niedzielski | 2016-10-17 | 2 | -5/+9 |
| | |_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | Merge branch 'master' into merge-conflicts-editor-2 | Alfredo Sumaran | 2016-10-17 | 2 | -1/+18 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | Add RTL support to markdown renderer | Ebrahim Byagowi | 2016-10-16 | 2 | -1/+18 |
| |/ / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | Merge branch 'master' into merge-conflicts-editor-2 | Sean McGivern | 2016-10-17 | 6 | -101/+105 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | Improve ExtractsPath logic related to atom formatdz-fix-extract-path | Dmitriy Zaporozhets | 2016-10-15 | 1 | -8/+9 |
| * | | | | | | | | | | | | Use module_function in Banzai::Rendererfix-banzai-renderer-instrumentation | Yorick Peterse | 2016-10-14 | 1 | -3/+1 |
| | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | Merge branch 'grapify-boards-api' into 'master' | Rémy Coutable | 2016-10-14 | 1 | -31/+45 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | Grapify boards API | Robert Schilling | 2016-10-14 | 1 | -31/+45 |
| | | |_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | |||||
| * | | | | | | | | | | | Merge branch 'fix/reassign-secret-token-on-generate' into 'master' | Douwe Maan | 2016-10-14 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |||||
| | * | | | | | | | | | | Reassign secret token when regenerating onefix/reassign-secret-token-on-generate | Grzegorz Bizon | 2016-10-13 | 1 | -2/+2 |
| * | | | | | | | | | | | Merge branch 'grapify-todos-api' into 'master' | Rémy Coutable | 2016-10-14 | 1 | -26/+19 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | Grapify todos APIgrapify-todos-api | Robert Schilling | 2016-10-14 | 1 | -26/+19 |
| | | |/ / / / / / / / / | | |/| | | | | | | | | | |||||
| * | | | | | | | | | | | Merge branch 'grapify-system-hooks' into 'master' | Rémy Coutable | 2016-10-14 | 1 | -31/+29 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | Grapify system hooks APIgrapify-system-hooks | Robert Schilling | 2016-10-13 | 1 | -31/+29 |
| | |/ / / / / / / / / / | |||||
* | | | | | | | | | | | | Add blob_ace_mode to conflict content response | Sean McGivern | 2016-10-13 | 1 | -0/+5 |
* | | | | | | | | | | | | Simplify conflict file JSON creation | Sean McGivern | 2016-10-13 | 1 | -7/+15 |
* | | | | | | | | | | | | Allow setting content for resolutions | Sean McGivern | 2016-10-13 | 4 | -13/+63 |
|/ / / / / / / / / / / |