summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'fix-escaping' into 'master' Sean McGivern2016-10-191-1/+1
|\
| * fix: commit messages being double-escaped in activies tabamaia2016-10-181-1/+1
* | Merge branch 'grapify-commit-statuses-api' into 'master' Rémy Coutable2016-10-191-26/+27
|\ \
| * | Grapify the commit status APIgrapify-commit-statuses-apiRobert Schilling2016-10-191-26/+27
* | | Merge branch 'fix-system-hook-api' into 'master' Rémy Coutable2016-10-191-6/+4
|\ \ \
| * | | API: Fix Sytem hooks delete behaviorfix-system-hook-apiRobert Schilling2016-10-141-6/+4
* | | | Merge branch '22191-delete-dynamic-envs-mr' into 'master' Rémy Coutable2016-10-192-2/+46
|\ \ \ \
| * \ \ \ Merge remote-tracking branch 'origin/master' into 22191-delete-dynamic-envs-mr22191-delete-dynamic-envs-mrKamil Trzcinski2016-10-182-5/+9
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Add logical validation to gitlab-ci.ymlKamil Trzcinski2016-10-181-0/+30
| * | | | Merge remote-tracking branch 'origin/master' into 22191-delete-dynamic-envs-mrKamil Trzcinski2016-10-184-12/+75
| |\ \ \ \
| * | | | | Add specs to test on_stop and action on environmentsKamil Trzcinski2016-10-171-0/+4
| * | | | | Improve after code reviewKamil Trzcinski2016-10-171-2/+2
| * | | | | Merge remote-tracking branch 'origin/master' into 22191-delete-dynamic-envs-mrKamil Trzcinski2016-10-172-1/+18
| |\ \ \ \ \
| * | | | | | Add `action` and `on_stop` to `environment` in .gitlab-ci.ymlKamil Trzcinski2016-10-171-3/+11
| * | | | | | Merge remote-tracking branch 'origin/master' into 22191-delete-dynamic-envs-mrKamil Trzcinski2016-10-1738-403/+924
| |\ \ \ \ \ \
| * | | | | | | Initial support for closing environmentsKamil Trzcinski2016-10-061-1/+3
* | | | | | | | Merge branch '22782-external-link-filter-with-non-lowercase-scheme' into 'mas...Sean McGivern2016-10-181-4/+30
|\ \ \ \ \ \ \ \
| * | | | | | | | Add Nofollow for uppercased scheme in external urlthe-undefined2016-10-181-4/+30
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch 'pipeline-emails' into 'master' Kamil Trzciński2016-10-183-0/+49
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into pipeline-emailspipeline-emailsLin Jen-Shin2016-10-186-13/+93
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| * | | | | | | | Merge remote-tracking branch 'upstream/master' into pipeline-emailsLin Jen-Shin2016-10-172-11/+10
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | |
| * | | | | | | | Merge remote-tracking branch 'upstream/master' into pipeline-emailsLin Jen-Shin2016-10-1422-254/+517
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into pipeline-emailsLin Jen-Shin2016-10-0843-264/+628
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into pipeline-emailsLin Jen-Shin2016-10-0436-393/+309
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into pipeline-emailsLin Jen-Shin2016-09-2129-151/+619
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Make various trace methods take last_lines argument:Lin Jen-Shin2016-09-211-0/+49
| * | | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into pipeline-emailsLin Jen-Shin2016-09-198-27/+35
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into pipeline-emailsLin Jen-Shin2016-09-1415-41/+114
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into pipeline-emailsLin Jen-Shin2016-09-1268-420/+904
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | We don't need themLin Jen-Shin2016-09-012-0/+0
* | | | | | | | | | | | | | | | Merge branch 'zj-grapify-commits' into 'master' Rémy Coutable2016-10-181-60/+69
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Use GrapeDSL for commitsZ.J. van de Weg2016-10-181-60/+69
| | |_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'adam-fix-mr-diff-symlink-file-conversion' into 'master' Sean McGivern2016-10-182-5/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Fix the diff in the merge request view when converting a symlink to a regular...adam-fix-mr-diff-symlink-file-conversionAdam Niedzielski2016-10-172-5/+9
| | |_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'master' into merge-conflicts-editor-2Alfredo Sumaran2016-10-172-1/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | Add RTL support to markdown rendererEbrahim Byagowi2016-10-162-1/+18
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge branch 'master' into merge-conflicts-editor-2Sean McGivern2016-10-176-101/+105
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | Improve ExtractsPath logic related to atom formatdz-fix-extract-pathDmitriy Zaporozhets2016-10-151-8/+9
| * | | | | | | | | | | | Use module_function in Banzai::Rendererfix-banzai-renderer-instrumentationYorick Peterse2016-10-141-3/+1
| | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Merge branch 'grapify-boards-api' into 'master' Rémy Coutable2016-10-141-31/+45
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Grapify boards APIRobert Schilling2016-10-141-31/+45
| | | |_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | |
| * | | | | | | | | | | Merge branch 'fix/reassign-secret-token-on-generate' into 'master' Douwe Maan2016-10-141-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
| | * | | | | | | | | | Reassign secret token when regenerating onefix/reassign-secret-token-on-generateGrzegorz Bizon2016-10-131-2/+2
| * | | | | | | | | | | Merge branch 'grapify-todos-api' into 'master' Rémy Coutable2016-10-141-26/+19
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Grapify todos APIgrapify-todos-apiRobert Schilling2016-10-141-26/+19
| | | |/ / / / / / / / / | | |/| | | | | | | | |
| * | | | | | | | | | | Merge branch 'grapify-system-hooks' into 'master' Rémy Coutable2016-10-141-31/+29
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Grapify system hooks APIgrapify-system-hooksRobert Schilling2016-10-131-31/+29
| | |/ / / / / / / / / /
* | | | | | | | | | | | Add blob_ace_mode to conflict content responseSean McGivern2016-10-131-0/+5
* | | | | | | | | | | | Simplify conflict file JSON creationSean McGivern2016-10-131-7/+15
* | | | | | | | | | | | Allow setting content for resolutionsSean McGivern2016-10-134-13/+63
|/ / / / / / / / / / /