summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Properly abort a merge when merge conflicts occurreject-merge-conflictsStan Hu2016-07-293-1/+19
* Merge branch 'fix/import-project-hooks' into 'master' Douwe Maan2016-07-294-2/+22
|\
| * fix repo hooks missing on importfix/import-project-hooksJames Lopez2016-07-284-2/+22
* | Merge branch 'ability-batch-issue-checking' into 'master' Robert Speicher2016-07-298-10/+355
|\ \
| * | Method for returning issues readable by a userability-batch-issue-checkingYorick Peterse2016-07-298-10/+355
* | | Merge branch 'rubocop/enable-access-modifiers-cops' into 'master' Robert Speicher2016-07-2916-177/+184
|\ \ \
| * | | Enable Rubocop cops for invalid access modifiersrubocop/enable-access-modifiers-copsGrzegorz Bizon2016-07-194-10/+11
| * | | Fix method visiblity in emoji filter classGrzegorz Bizon2016-07-191-5/+5
| * | | Fix methods visibility in markdown filter classGrzegorz Bizon2016-07-191-7/+7
| * | | Fix method visibility in gitlab metrics classGrzegorz Bizon2016-07-191-2/+2
| * | | Make banzai module that handles markdown singletonGrzegorz Bizon2016-07-191-7/+9
| * | | Fix method visibility in inline diff classGrzegorz Bizon2016-07-191-35/+39
| * | | Fix methods visibility in gitlab database moduleGrzegorz Bizon2016-07-191-2/+4
| * | | Refactor gitlab themes module to make it singletonGrzegorz Bizon2016-07-191-7/+9
| * | | Refactor system notes service to make it singletonGrzegorz Bizon2016-07-191-76/+78
| * | | Fix private method visibility in container registryGrzegorz Bizon2016-07-191-6/+6
| * | | Fix some useless access modifiers in the codeGrzegorz Bizon2016-07-194-20/+14
* | | | Merge branch 'refactor/ci-config-move-job-entries' into 'master' Rémy Coutable2016-07-2933-343/+1147
|\ \ \ \
| * | | | Improve code, remove unused validator, improve namesGrzegorz Bizon2016-07-2911-36/+22
| * | | | Merge branch 'master' into refactor/ci-config-move-job-entriesGrzegorz Bizon2016-07-22233-2300/+3694
| |\ \ \ \
| * | | | | Move job dependencies entry to the new CI configGrzegorz Bizon2016-07-203-16/+14
| * | | | | Add minor readability, style improvements in CI configGrzegorz Bizon2016-07-208-20/+21
| * | | | | Merge branch 'master' into refactor/ci-config-move-job-entriesGrzegorz Bizon2016-07-20211-8884/+15259
| |\ \ \ \ \
| * | | | | | Move job environment validation to new CI configGrzegorz Bizon2016-07-195-20/+18
| * | | | | | Move tags and allow_failure CI entries to new configGrzegorz Bizon2016-07-183-10/+10
| * | | | | | Validate allowed keys only in new CI configGrzegorz Bizon2016-07-183-19/+15
| * | | | | | Improve valid keys validation for CI config nodesGrzegorz Bizon2016-07-186-29/+28
| * | | | | | Move job artifacts configuration new CI config codeGrzegorz Bizon2016-07-188-27/+154
| * | | | | | Move job variables config entry to new CI configGrzegorz Bizon2016-07-183-18/+6
| * | | | | | Move except and only job nodes to new CI configGrzegorz Bizon2016-07-184-3/+93
| * | | | | | Move job image and services nodes to new CI configGrzegorz Bizon2016-07-183-13/+14
| * | | | | | Merge branch 'master' into refactor/ci-config-move-job-entriesGrzegorz Bizon2016-07-18606-6485/+15078
| |\ \ \ \ \ \
| * | | | | | | Simplify abstract class for CI config entry nodesGrzegorz Bizon2016-07-155-43/+33
| * | | | | | | Simplify CI config and remove logical validationGrzegorz Bizon2016-07-156-37/+12
| * | | | | | | Add metadata to new CI config and expose job nameGrzegorz Bizon2016-07-1511-69/+60
| * | | | | | | Remove job cache configfrom legacy yaml processorGrzegorz Bizon2016-07-143-25/+8
| * | | | | | | Remove references to global entry in new CI configGrzegorz Bizon2016-07-145-15/+5
| * | | | | | | Revert logical validation in CI job stage entryGrzegorz Bizon2016-07-145-84/+15
| * | | | | | | Revert references to global node in CI job entryGrzegorz Bizon2016-07-145-144/+8
| * | | | | | | Improve CI job entry validations in new configGrzegorz Bizon2016-07-149-39/+54
| * | | | | | | Expose CI job commands and use in legacy processorGrzegorz Bizon2016-07-135-21/+33
| * | | | | | | Add before script and commands to CI job entryGrzegorz Bizon2016-07-132-8/+124
| * | | | | | | Fabricate CI entry with value, set attributes laterGrzegorz Bizon2016-07-131-8/+20
| * | | | | | | Improve CI stage configuration entry validationsGrzegorz Bizon2016-07-133-10/+12
| * | | | | | | Do not raise when getting value of invalid CI nodeGrzegorz Bizon2016-07-122-5/+3
| * | | | | | | Fix using `try` on delegators in CI config entriesGrzegorz Bizon2016-07-121-2/+2
| * | | | | | | Simplify undefined node definition in CI configGrzegorz Bizon2016-07-128-116/+58
| * | | | | | | Add CI config node that is unspecified null entryGrzegorz Bizon2016-07-122-0/+59
| * | | | | | | Prevalidate CI entries recursively on processedGrzegorz Bizon2016-07-122-4/+3
| * | | | | | | Require parent when using node factory in CI configGrzegorz Bizon2016-07-105-20/+60