summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ \ | |_|/ |/| |
| * | Use grape to validate parameters in the members APIapi-remove-attributes_for_keysRobert Schilling2017-02-232-8/+6
* | | Remove last merge_request endpointRobert Schilling2017-02-231-1/+0
|/ /
* | Merge branch 'api-notes-entity-fields' into 'master' Sean McGivern2017-02-236-5/+206
|\ \
| * \ Merge branch 'master' into 'api-notes-entity-fields'api-notes-entity-fieldsRobert Schilling2017-02-226-55/+58
| |\ \
| * | | Remove deprecated `upvotes` and `downvotes` from the notes APIRobert Schilling2017-02-226-5/+206
* | | | Rebase to master for avoiding failing testsGeorge Andrinopoulos2017-02-231-1/+1
* | | | Merge branch 'improve-ee_compat_check-by-using-git-apply-3way-flag' into 'mas...Robert Speicher2017-02-221-1/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | Improve `Gitlab::EeCompatCheck` by using the `git apply --3way` flag improve-ee_compat_check-by-using-git-apply-3way-flagRémy Coutable2017-02-221-1/+1
* | | | Merge branch 'connection-pool-host' into 'master'Rémy Coutable2017-02-221-1/+6
|\ \ \ \ | |/ / / |/| | |
| * | | Allow setting of a custom connection pool hostYorick Peterse2017-02-221-1/+6
* | | | Merge branch '27032-add-a-house-keeping-api-call' into 'master' Rémy Coutable2017-02-221-0/+13
|\ \ \ \
| * | | | Add housekeeping endpoint for Projects APIMark Fletcher2017-02-221-0/+13
* | | | | Merge branch 'zj-fix-slash-command-labels' into 'master' Douwe Maan2017-02-221-1/+1
|\ \ \ \ \
| * | | | | Chat slash commands show labels correctlyzj-fix-slash-command-labelsZ.J. van de Weg2017-02-211-1/+1
| |/ / / /
* | | | | Merge branch 'grapify-ci-runners-api' into 'master' Rémy Coutable2017-02-221-26/+18
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Grapify the CI::Runners APIgrapify-ci-runners-apiRobert Schilling2017-02-221-26/+18
| | |_|/ | |/| |
* | | | Merge branch 'grapify-ci-triggers-api' into 'master' Rémy Coutable2017-02-221-27/+16
|\ \ \ \
View Lorry Controller Status