summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | | | | | | | | | | | | | | This reverts commit e00fb2bdc2090e9cabeb1eb35a2672a882cc96e9. # Conflicts: # .rubocop.yml # .rubocop_todo.yml # lib/gitlab/ci/config/entry/global.rb # lib/gitlab/ci/config/entry/jobs.rb # spec/lib/gitlab/ci/config/entry/factory_spec.rb # spec/lib/gitlab/ci/config/entry/global_spec.rb # spec/lib/gitlab/ci/config/entry/job_spec.rb # spec/lib/gitlab/ci/status/build/factory_spec.rb # spec/lib/gitlab/incoming_email_spec.rb
* Revert "Prefer leading style for Style/DotPosition"Douwe Maan2017-02-2343-209/+209
| | | | This reverts commit cb10b725c8929b8b4460f89c9d96c773af39ba6b.
* Revert "Enable Style/BarePercentLiterals"Douwe Maan2017-02-234-8/+8
| | | | This reverts commit 96bef54154e669f9a3e92c3a4bc76c0be3a52e48.
* 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
|
* Remove last merge_request endpointRobert Schilling2017-02-231-1/+0
|
* Merge branch 'api-notes-entity-fields' into 'master' Sean McGivern2017-02-236-5/+206
|\ | | | | | | | | | | | | Remove deprecated `upvotes` and `downvotes` from the notes API Closes #28441 See merge request !9384
| * Merge branch 'master' into 'api-notes-entity-fields'api-notes-entity-fieldsRobert Schilling2017-02-226-55/+58
| |\ | | | | | | | | | # Conflicts: # doc/api/v3_to_v4.md
| * | 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 ↵Robert Speicher2017-02-221-1/+1
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | 'master' Improve `Gitlab::EeCompatCheck` by using the `git apply --3way` flag See merge request !9447
| * | 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
| | | | | | | | | This should solve 99% of the false-positive of the `ee_compat_check` job.
* | | Merge branch 'connection-pool-host' into 'master'Rémy Coutable2017-02-221-1/+6
|\ \ \ | |/ / |/| | | | | | | | Allow setting of a custom connection pool host See merge request !9445
| * | Allow setting of a custom connection pool hostYorick Peterse2017-02-221-1/+6
| | | | | | | | | | | | | | | | | | | | | This allows you to set a custom host when calling Gitlab::Database.create_connection_pool. This is necessary for load balancing as in this case we want to inherit all settings except for the hostname.
* | | Merge branch '27032-add-a-house-keeping-api-call' into 'master' Rémy Coutable2017-02-221-0/+13
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add housekeeping endpoint for Projects API Closes #27032 See merge request !9421
| * | | 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 correctly Closes #28358 See merge request !9408
| * | | | 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 API See merge request !9440
| * | | 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
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Grapfiy the CI::Triggers API See merge request !9439
| * | | | Grapfiy the CI::Triggers APIgrapify-ci-triggers-apiRobert Schilling2017-02-221-27/+16
| |/ / /
* | | | Merge branch '26087-asciidoc-cicd-badges-snippet' into 'master'Rémy Coutable2017-02-221-0/+4
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | Add AsciiDoc snippet for CI/CD Badges Closes #26087 See merge request !9164
| * | | Add AsciiDoc snippet for CI/CD BadgesJan Christophersen2017-02-201-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit adds CI/CD Badges Snippets for AsciiDoc as requested in #26087. I've however run into an issue in highlighting the snippet, it seems as if AsciiDoc is currently not being highlighted properly (displayed as plaintext) Add testcase for to_asciidoc Update test case for Badges list
* | | | Merge branch '22132-rename-branch-name-params-to-branch' into 'master' Rémy Coutable2017-02-226-11/+355
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Standardize branch name params as `branch` on V4 API Closes #22132 See merge request !8936
| * | | | Change branch_name param to branch throughout V4 API22132-rename-branch-name-params-to-branchOswaldo Ferreira2017-02-216-11/+355
| | | | |
* | | | | Merge branch 'api-subscription-restful' into 'master' Sean McGivern2017-02-223-2/+56
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | API: Make subscription API more RESTfuL Closes #28327 See merge request !9325
View Lorry Controller Status