Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'dm-meer-blauw-op-straat' into 'master' | Robert Speicher | 2017-02-23 | 15 | -20/+23 |
|\ | | | | | | | | | Enable (and disable) more RuboCops See merge request !9432 | ||||
| * | Fix new offensesdm-meer-blauw-op-straat | Douwe Maan | 2017-02-23 | 1 | -2/+2 |
| | | |||||
| * | Revert "Enable Style/DotPosition" | Douwe Maan | 2017-02-23 | 3 | -20/+20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 Maan | 2017-02-23 | 11 | -60/+60 |
| | | | | | | | | This reverts commit cb10b725c8929b8b4460f89c9d96c773af39ba6b. | ||||
| * | Enable Style/WordArray | Douwe Maan | 2017-02-23 | 5 | -5/+5 |
| | | |||||
| * | Enable Style/MultilineArrayBraceLayout | Douwe Maan | 2017-02-23 | 3 | -4/+7 |
| | | |||||
| * | Prefer leading style for Style/DotPosition | Douwe Maan | 2017-02-23 | 11 | -60/+60 |
| | | |||||
| * | Fix code for cops | Douwe Maan | 2017-02-23 | 2 | -2/+2 |
| | | |||||
| * | Enable Style/ColonMethodCall | Douwe Maan | 2017-02-23 | 1 | -1/+1 |
| | | |||||
| * | Enable Performance/RedundantMerge | Douwe Maan | 2017-02-23 | 1 | -1/+1 |
| | | |||||
| * | Enable Style/SpaceInsideBrackets | Douwe Maan | 2017-02-23 | 5 | -5/+5 |
| | | |||||
| * | Enable Style/MutableConstant | Douwe Maan | 2017-02-23 | 5 | -5/+5 |
| | | |||||
| * | Enable Style/DotPosition | Douwe Maan | 2017-02-23 | 3 | -20/+20 |
| | | |||||
* | | Merge branch 'api-remove-attributes_for_keys' into 'master' | Rémy Coutable | 2017-02-23 | 2 | -8/+6 |
|\ \ | |/ |/| | | | | | Use grape validation in the members API. See merge request !9471 | ||||
| * | Use grape to validate parameters in the members APIapi-remove-attributes_for_keys | Robert Schilling | 2017-02-23 | 2 | -8/+6 |
| | | |||||
* | | Remove last merge_request endpoint | Robert Schilling | 2017-02-23 | 1 | -1/+0 |
|/ | |||||
* | Merge branch 'api-notes-entity-fields' into 'master' | Sean McGivern | 2017-02-23 | 6 | -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-fields | Robert Schilling | 2017-02-22 | 1 | -0/+13 |
| |\ | | | | | | | | | | # Conflicts: # doc/api/v3_to_v4.md | ||||
| * | | Remove deprecated `upvotes` and `downvotes` from the notes API | Robert Schilling | 2017-02-22 | 6 | -5/+206 |
| | | | |||||
* | | | Rebase to master for avoiding failing tests | George Andrinopoulos | 2017-02-23 | 1 | -1/+1 |
| |/ |/| | |||||
* | | Merge branch '27032-add-a-house-keeping-api-call' into 'master' | Rémy Coutable | 2017-02-22 | 1 | -0/+13 |
|\ \ | |/ |/| | | | | | | | | | Add housekeeping endpoint for Projects API Closes #27032 See merge request !9421 | ||||
| * | Add housekeeping endpoint for Projects API | Mark Fletcher | 2017-02-22 | 1 | -0/+13 |
| | | |||||
* | | Merge branch '22132-rename-branch-name-params-to-branch' into 'master' | Rémy Coutable | 2017-02-22 | 6 | -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-branch | Oswaldo Ferreira | 2017-02-21 | 6 | -11/+355 |
| | | | |||||
* | | | Merge branch 'api-subscription-restful' into 'master' | Sean McGivern | 2017-02-22 | 3 | -2/+56 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | API: Make subscription API more RESTfuL Closes #28327 See merge request !9325 | ||||
| * | | | API: Make subscription API more RESTfuL | Robert Schilling | 2017-02-21 | 3 | -2/+56 |
| | | | | |||||
* | | | | Merge branch '28093-snippet-and-issue-spam-check-on-edit' into 'master' | Sean McGivern | 2017-02-22 | 6 | -8/+35 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Spam check and reCAPTCHA improvements Closes #28093 See merge request !9248 | ||||
| * | | | | Spam check and reCAPTCHA improvements28093-snippet-and-issue-spam-check-on-edit | Oswaldo Ferreira | 2017-02-21 | 6 | -8/+35 |
| | |_|/ | |/| | | |||||
* | | | | No more and/or | Douwe Maan | 2017-02-21 | 1 | -1/+1 |
| |_|/ |/| | | |||||
* | | | Merge branch 'rename-retry-failed-pipeline-to-retry' into 'master' | Filipa Lacerda | 2017-02-21 | 1 | -2/+2 |
|\ \ \ | |_|/ |/| | | | | | | | | Rename retry failed button on pipeline page to just retry See merge request !9369 | ||||
| * | | fixed specs + docs | dimitrieh | 2017-02-20 | 1 | -2/+2 |
| | | | |||||
* | | | Backport Todos API to V3api-todos-restful | Robert Schilling | 2017-02-21 | 2 | -0/+29 |
| | | | |||||
* | | | API: Use POST requests to mark todos as done | Robert Schilling | 2017-02-21 | 1 | -2/+4 |
| |/ |/| | |||||
* | | Merge branch '26315-unify-labels-filter-behavior' into 'master' | Rémy Coutable | 2017-02-20 | 1 | -11/+3 |
|\ \ | | | | | | | | | | | | | | | | | | | Unify issues search behavior by always filtering when ALL labels matches Closes #26315 See merge request !8849 | ||||
| * | | Unify issues search behavior by always filtering when ALL labels matches26315-unify-labels-filter-behavior | Oswaldo Ferreira | 2017-02-20 | 1 | -11/+3 |
| | | | |||||
* | | | Merge branch 'api-star-restful' into 'master' | Rémy Coutable | 2017-02-20 | 1 | -1/+1 |
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | API: Moved `DELETE /projects/:id/star` to `POST /projects/:id/unstar` Closes #28328 See merge request !9328 | ||||
| * | | API: Moved `DELETE /projects/:id/star` to `POST /projects/:id/unstar`api-star-restful | Robert Schilling | 2017-02-20 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'fix-grammar' into 'master' | Robert Speicher | 2017-02-20 | 1 | -2/+2 |
|\ \ \ | | | | | | | | | | | | | | | | | Fix some grammar in the API docs See merge request !9379 | ||||
| * | | | Fix some grammar in the API docs | Robert Schilling | 2017-02-20 | 1 | -2/+2 |
| | | | | |||||
* | | | | Merge branch 'api-post-block' into 'master' | Sean McGivern | 2017-02-20 | 2 | -2/+34 |
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | API: Use POST to (un)block a user Closes #14596 See merge request !9371 | ||||
| * | | | API: Use POST to (un)block a userapi-post-block | Robert Schilling | 2017-02-20 | 2 | -2/+34 |
| |/ / | |||||
* | | | Use grape validation for datesapi-grape-datetime | Robert Schilling | 2017-02-20 | 2 | -21/+2 |
|/ / | |||||
* | | API: Remove `DELETE projects/:id/deploy_keys/:key_id/disable`api-remove-deploy-key-disable | Robert Schilling | 2017-02-20 | 1 | -19/+3 |
|/ | |||||
* | Merge branch '26379-iid-param' into 'master' | Rémy Coutable | 2017-02-17 | 1 | -1/+2 |
|\ | | | | | | | | | | | | | add a :iid param to the IssuableFinder Closes #26379 See merge request !9222 | ||||
| * | add a :iids param to IssuableFinder | mhasbini | 2017-02-17 | 1 | -1/+2 |
| | | |||||
* | | Merge branch 'paginate-all-the-things' into 'master' | Rémy Coutable | 2017-02-17 | 24 | -40/+352 |
|\ \ | |/ |/| | | | | | | | | | Paginate all the things Closes #8099 See merge request !8606 | ||||
| * | Backport API to v3paginate-all-the-things | Robert Schilling | 2017-02-17 | 9 | -1/+262 |
| | | |||||
| * | Paginate all endpoints that return an array | Robert Schilling | 2017-02-16 | 16 | -40/+91 |
| | | |||||
* | | Merge branch 'use-update-runner-service' into 'master' | Kamil Trzciński | 2017-02-17 | 1 | -1/+2 |
|\ \ | | | | | | | | | | | | | | | | | | | Prefer service object over after_save hook Closes #26921 See merge request !8664 | ||||
| * \ | Merge remote-tracking branch 'upstream/master' into use-update-runner-service | Lin Jen-Shin | 2017-02-15 | 21 | -311/+772 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (488 commits) Remove duplicate CHANGELOG.md entries for 8.16.5 Update CHANGELOG.md for 8.14.9 Update CHANGELOG.md for 8.15.6 #27631: Add missing top-area div to activity header page Update CHANGELOG.md for 8.16.5 Update CHANGELOG.md for 8.16.5 Update CHANGELOG.md for 8.16.5 Fix yarn lock and package.json mismatch caused by MR 9133 sync yarn.lock with recent changes to package.json Add changelog Fix z index bugs Add Links to Branches in Calendar Activity SidekiqStatus need to be qualified in some cases Replace static fixture for behaviors/requires_input_spec.js (!9162) API: Consolidate /projects endpoint Add MySQL info in install requirements Fix timezone on issue boards due date Use Gitlab::Database.with_connection_pool from !9192 Disconnect the pool after done Use threads directly, introduce pool later: ... |