summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dm-more-namespace-full-path' into 'master' Sean McGivern2017-02-242-6/+7
|\
| * Use Namespace#full_path instead of #path where appropriatedm-more-namespace-full-pathDouwe Maan2017-02-232-6/+7
* | Merge branch 'api-simplify-variables-validation' into 'master' Rémy Coutable2017-02-241-8/+3
|\ \
| * | Simplyfy variables validation in triggers APIapi-simplify-variables-validationRobert Schilling2017-02-241-8/+3
| |/
* | Merge branch 'master' into 'api-remove-owned-groups'api-remove-owned-groupsSean McGivern2017-02-247-4/+24
|\ \
| * \ Merge branch '3874-correctly-return-json-on-delete-responses' into 'master' Sean McGivern2017-02-244-1/+14
| |\ \
| | * | Return 202 with JSON body on async removals on V4 API3874-correctly-return-json-on-delete-responsesOswaldo2017-02-234-1/+14
| | |/
| * | Merge remote-tracking branch 'upstream/master' into 27762-add-default-artifac...Lin Jen-Shin2017-02-24136-517/+1218
| |\ \ | | |/
| * | Merge remote-tracking branch 'upstream/master' into 27762-add-default-artifac...Lin Jen-Shin2017-02-217-47/+93
| |\ \
| * \ \ Merge remote-tracking branch 'upstream/master' into 27762-add-default-artifac...Lin Jen-Shin2017-02-2152-235/+536
| |\ \ \
| * \ \ \ Merge remote-tracking branch 'upstream/master' into 27762-add-default-artifac...Lin Jen-Shin2017-02-1612-30/+51
| |\ \ \ \
| * | | | | Fix tests and disallow 0 to make it consistent with .gitlab-ci.ymlLin Jen-Shin2017-02-152-1/+2
| * | | | | rubocop: Align the operands of an expressionLin Jen-Shin2017-02-151-2/+2
| * | | | | Use the same syntax for default expirationLin Jen-Shin2017-02-152-3/+6
| * | | | | Initial implementation for default artifacts expirationLin Jen-Shin2017-02-152-3/+6
* | | | | | Backport groups API to V3Robert Schilling2017-02-242-0/+39
* | | | | | API: Use parameter to get owned groups instead of dedicated endpointRobert Schilling2017-02-241-12/+4
| |_|_|_|/ |/| | | |
* | | | | Merge branch 'dm-meer-blauw-op-straat' into 'master' Robert Speicher2017-02-23109-417/+432
|\ \ \ \ \
| * | | | | Fix new offensesdm-meer-blauw-op-straatDouwe Maan2017-02-231-2/+2
| * | | | | Stylistic tweaksDouwe Maan2017-02-236-21/+21
| * | | | | Fix OAuth/SAML user blocking behaviorDouwe Maan2017-02-231-1/+3
| * | | | | Revert "Enable Style/DotPosition"Douwe Maan2017-02-2318-73/+73
| * | | | | Revert "Prefer leading style for Style/DotPosition"Douwe Maan2017-02-2343-209/+209
| * | | | | Revert "Enable Style/BarePercentLiterals"Douwe Maan2017-02-234-8/+8
| * | | | | Move up delegate callsDouwe Maan2017-02-231-2/+2
| * | | | | ActiveSupport delegation is preferred over ForwardableDouwe Maan2017-02-231-2/+0
| * | | | | Update rubocop and rubocop-rspec and regenerate .rubocop_todo.ymlDouwe Maan2017-02-232-7/+4
| * | | | | Don’t exclude some file in lib from rubocopDouwe Maan2017-02-2334-206/+187
| * | | | | Fix new offensesDouwe Maan2017-02-232-2/+2
| * | | | | Enable Rails/DelegateDouwe Maan2017-02-2310-40/+14
| * | | | | Enable Style/WordArrayDouwe Maan2017-02-238-8/+8
| * | | | | Enable Style/MultilineHashBraceLayoutDouwe Maan2017-02-231-2/+4
| * | | | | Enable Style/MultilineArrayBraceLayoutDouwe Maan2017-02-234-16/+20
| * | | | | Enable Style/EmptyLineBetweenDefsDouwe Maan2017-02-232-0/+45
| * | | | | Enable Style/ClassCheckDouwe Maan2017-02-232-3/+3
| * | | | | Prefer leading style for Style/DotPositionDouwe Maan2017-02-2343-207/+207
| * | | | | Fix code for copsDouwe Maan2017-02-2316-69/+81
| * | | | | Enable Style/ConditionalAssignmentDouwe Maan2017-02-2311-36/+36
| * | | | | Enable Style/ColonMethodCallDouwe Maan2017-02-234-4/+4
| * | | | | Enable Style/BarePercentLiteralsDouwe Maan2017-02-234-8/+8
| * | | | | Enable Performance/RedundantMatchDouwe Maan2017-02-234-4/+4
| * | | | | Enable Performance/RedundantBlockCallDouwe Maan2017-02-232-2/+2
| * | | | | Enable Performance/RedundantMergeDouwe Maan2017-02-232-2/+2
| * | | | | Enable Style/SpaceInsideBracketsDouwe Maan2017-02-235-5/+5
| * | | | | Enable Style/MutableConstantDouwe Maan2017-02-2332-49/+49
| * | | | | Enable Style/DotPositionDouwe Maan2017-02-2318-71/+71
* | | | | | Merge branch 'fix/gb/pipeline-retry-skipped-jobs' into 'master' Kamil Trzciński2017-02-231-1/+3
|\ \ \ \ \ \
| * | | | | | Fix Rubocop offense in OptimisticLocking modulefix/gb/pipeline-retry-skipped-jobsGrzegorz Bizon2017-02-231-1/+1
| * | | | | | Process skipped jobs in the pipeline when retrying itGrzegorz Bizon2017-02-231-1/+3
* | | | | | | Merge branch 'api-remove-attributes_for_keys' into 'master' Rémy Coutable2017-02-232-8/+6
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |