summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Pass before_script and script as-is preserving arrayspass-before-script-as-isKamil Trzcinski2017-07-075-25/+80
* Merge branch 'foreign-keys-for-project-model' into 'master'Sean McGivern2017-07-0656-248/+627
|\
| * Rename ActiverecordSerialize copYorick Peterse2017-07-0618-31/+31
| * Update CI runner factories to not use invalid IDsYorick Peterse2017-07-061-2/+2
| * Added Cop to blacklist the use of `dependent:`Yorick Peterse2017-07-0629-73/+140
| * Add many foreign keys to the projects tableYorick Peterse2017-07-0614-146/+458
* | Merge branch '34636-update-prometheus-metrics-library' into 'master'Tim Zallmann2017-07-061-18/+68
|\ \
| * | Add NGINX metrics and other minor changes34636-update-prometheus-metrics-libraryJoshua Lambert2017-07-041-37/+53
| * | Add ELB metricsJoshua Lambert2017-07-031-2/+36
* | | Merge branch '34698-fix-stubbing-cached-markdown-fields' into 'master'Rémy Coutable2017-07-061-1/+1
|\ \ \ | |_|/ |/| |
| * | Fix stubbing attributes alongside cache_markdown_fieldNick Thomas2017-07-051-1/+1
* | | Merge branch '33657-user-projects-api' into 'master'Rémy Coutable2017-07-066-50/+257
|\ \ \
| * | | Add user projects APIvanadium232017-07-066-50/+257
* | | | Merge branch '34698-fix-transient-failure' into 'master'Grzegorz Bizon2017-07-061-8/+17
|\ \ \ \
| * | | | Fix project_path helper arguments in wiki specs34698-fix-transient-failureGrzegorz Bizon2017-07-061-1/+1
| * | | | Fix Rubocop offenses in gitaly client ref specsGrzegorz Bizon2017-07-061-2/+2
| * | | | Fix a nasty transient failure happening is a subsequent specRémy Coutable2017-07-051-9/+18
* | | | | Merge branch 'additional-commits-integer-fix' into 'master'Sean McGivern2017-07-061-1/+1
|\ \ \ \ \
| * | | | | Fix invalid integer value when more than 1000 commitsadditional-commits-integer-fixPhil Hughes2017-07-051-1/+1
* | | | | | Merge branch '33772-readonly-gitlab-ci-cache' into 'master'Kamil Trzciński2017-07-0610-26/+120
|\ \ \ \ \ \
| * | | | | | Introduce cache policies for CI jobsNick Thomas2017-07-0510-26/+120
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch '32815--Add-Custom-CI-Config-Path' into 'master'Grzegorz Bizon2017-07-0620-13/+161
|\ \ \ \ \ \
| * \ \ \ \ \ Merge commit 'a8a4ca17e444c761ed9fc5dca4542cfec79abe55' into 32815--Add-Custo...32815--Add-Custom-CI-Config-PathGrzegorz Bizon2017-07-0549-1449/+1061
| |\ \ \ \ \ \
| * | | | | | | Use a previous approach for cycle analytics dummy pipelineGrzegorz Bizon2017-07-052-4/+3
| * | | | | | | Merge remote-tracking branch 'upstream/master' into 32815--Add-Custom-CI-Conf...Lin Jen-Shin2017-07-05192-974/+4252
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| * | | | | | | Rename ci_config_file to ci_config_pathLin Jen-Shin2017-07-0515-36/+36
| * | | | | | | Add back Pipeline#ci_yaml_file_path due to all the troublesLin Jen-Shin2017-07-057-39/+37
| * | | | | | | Fix cycle analytics tests by making pipeline validLin Jen-Shin2017-07-051-1/+4
| * | | | | | | Make sure we remove null charactersLin Jen-Shin2017-07-041-2/+2
| * | | | | | | Fix config pathLin Jen-Shin2017-07-043-3/+3
| * | | | | | | Also remove null characterLin Jen-Shin2017-07-041-1/+1
| * | | | | | | Follow feedback on the merge requestLin Jen-Shin2017-07-046-40/+41
| * | | | | | | Fix various descriptions given the feedbackLin Jen-Shin2017-07-045-8/+8
| * | | | | | | Give project to the dummy pipelineLin Jen-Shin2017-07-031-1/+3
| * | | | | | | Merge remote-tracking branch 'upstream/master' into 32815--Add-Custom-CI-Conf...Lin Jen-Shin2017-07-03117-614/+1060
| |\ \ \ \ \ \ \
| * | | | | | | | We don't need to disable transaction in this caseLin Jen-Shin2017-07-011-7/+0
| * | | | | | | | Introduce CI_CONFIG_PATHLin Jen-Shin2017-06-303-1/+14
| * | | | | | | | Add changelog entryLin Jen-Shin2017-06-301-0/+4
| * | | | | | | | Update wordings, allow only full path, add testsLin Jen-Shin2017-06-307-38/+49
| * | | | | | | | Merge remote-tracking branch 'upstream/master' into 32815--Add-Custom-CI-Conf...Lin Jen-Shin2017-06-30335-4880/+13644
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Fix the test and implement missing updateLin Jen-Shin2017-06-282-2/+18
| * | | | | | | | | Try to report where the file should beLin Jen-Shin2017-06-281-1/+1
| * | | | | | | | | Fix doc, test, and formLin Jen-Shin2017-06-284-90/+13
| * | | | | | | | | Inline what it was before for the regexp and messageLin Jen-Shin2017-06-281-2/+2
| * | | | | | | | | Merge remote-tracking branch 'upstream/master' into 15041-Add-Custom-CI-Confi...15041-Add-Custom-CI-Config-PathLin Jen-Shin2017-06-289734-129764/+459899
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add config option to project to allow custom .gitlab-ci.yml locationKeith Pope2016-10-0813-3/+147
* | | | | | | | | | | Merge branch 'fix-static-analysis' into 'master'Robert Speicher2017-07-051-2/+2
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix Rubocop offensefix-static-analysisRémy Coutable2017-07-051-2/+2
| | |_|_|_|_|_|_|/ / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'synchronize_changes_in_community_translation_of_msgid' into 'ma...Douwe Maan2017-07-057-11/+11
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | synchronize changes in community translation of msgid黄涛2017-07-057-11/+11
| | |_|_|_|_|_|_|/ / / | |/| | | | | | | | |
View Lorry Controller Status