summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Only ensure against yield so that pool should be availablecreate-connection-poolLin Jen-Shin2017-02-141-4/+5
| | | | | Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9192#note_23293693
* Have some simple way to create connection poolLin Jen-Shin2017-02-141-0/+24
|
* Merge branch 'fix/cycle-analytics-events-limit' into 'master' Sean McGivern2017-02-131-1/+3
|\ | | | | | | | | Add limit to the number of events showed in cycle analytics See merge request !7743
| * move query limit to base event fetcherJames Lopez2017-02-061-1/+3
| |
* | Merge branch '24976-start-of-line-mention' into 'master' Sean McGivern2017-02-135-9/+73
|\ \ | | | | | | | | | | | | | | | | | | Feature to create directly addressed Todos when mentioned in beginning Closes #24976 See merge request !7926
| * | Create directly_addressed Todos when mentioned in beginning of a lineErshad Kunnakkadan2017-02-085-9/+73
| | |
* | | Merge branch '20732_member_exists_409' into 'master'Sean McGivern2017-02-133-10/+138
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add member: Always return 409 when a member exists Closes #20732 See merge request !9093
| * | | Add member: Always return 409 when a member existsJarka Kadlecova2017-02-103-10/+138
| | | |
* | | | Merge branch 'zj-drop-ruby-21-tests' into 'master' Rémy Coutable2017-02-136-11/+9
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Update Rubocop to Ruby 2.3 See merge request !8994
| * | | | Update Rubocop to ruby 2.3zj-drop-ruby-21-testsZ.J. van de Weg2017-02-076-11/+9
| | |_|/ | |/| |
* | | | Merge branch 'concurrent-foreign-keys' into 'master'Rémy Coutable2017-02-131-1/+49
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Add method for creating foreign keys concurrently See merge request !9069
| * | | | Add method for creating foreign keys concurrentlyYorick Peterse2017-02-101-1/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This method allows one to create foreign keys without blocking access to the source table, but only on PostgreSQL. When creating a regular foreign key the "ALTER TABLE" statement used for this won't return until all data has been validated. This statement in turn will acquire a lock on the source table. As a result this lock can be held for quite a long amount of time, depending on the number of rows and system load. By breaking up the foreign key creation process in two steps (creation, and validation) we can reduce the amount of locking to a minimum. Locking is still necessary for the "ALTER TABLE" statement that adds the constraint, but this is a fast process and so will only block access for a few milliseconds.
* | | | | Merge branch 'rename_files_delete_service' into 'master' Rémy Coutable2017-02-131-1/+1
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | Rename Files::DeleteService to Files::DestroyService See merge request !9110
| * | | | Rename Files::DeleteService to Files::DestroyServicedixpac2017-02-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Reason for renaming is to comply with naming convention of services in codebase.
* | | | | Revert "Merge branch 'add-additional-checks-to-ca-data' into 'master' "Alfredo Sumaran2017-02-107-28/+0
| | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit b7c5ca499d9c26494736d92505116bbb294c63d6, reversing changes made to 9745c98bb77a1a1ddd964f58cc4d058a665eb9ee.
* | | | | Merge branch 'add-additional-checks-to-ca-data' into 'master' Alfredo Sumaran2017-02-107-0/+28
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Small improvements for Cycle Analytics See merge request !9126
| * | | | | Restore exposure of legend property for eventsAlfredo Sumaran2017-02-107-0/+28
| | |_|/ / | |/| | |
* | | | | Merge branch '1051-api-create-users-without-password' into 'master' Rémy Coutable2017-02-101-2/+14
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | Optionally make users created via the API set their password Closes #1051 See merge request !8957
| * | | | Optionally make users created via the API set their passwordJoost Rijneveld2017-02-091-2/+14
| | | | |
* | | | | Merge branch 'jej-update-mr-state-event-docs' into 'master'Sean McGivern2017-02-101-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update MergeRequest API state_event option documentation Closes #25566 See merge request !8077
| * | | | | Update MergeRequest API state_event option documentationjej-update-mr-state-event-docsJames Edwards-Jones2017-02-091-1/+1
| | |/ / / | |/| | |
* | | | | Merge branch 'zj-rename-issuable-issue-base' into 'master'Rémy Coutable2017-02-104-4/+4
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | Rename issuable to IssueBase See merge request !9127
| * | | | Rename issuable to IssueBasezj-rename-issuable-issue-baseZ.J. van de Weg2017-02-084-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | Given the the Issuable class will soon also have to support MRs this signals that it can only be used by issues.
* | | | | Merge branch 'dz-nested-groups-api' into 'master' Dmitriy Zaporozhets2017-02-092-0/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Nested groups API See merge request !9034
| * | | | | Add nested groups to the APIdz-nested-groups-apiDmitriy Zaporozhets2017-02-082-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | Merge branch 'rename_delete_services' into 'master'Rémy Coutable2017-02-083-3/+3
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | Fix inconsistent naming for services that delete things See merge request !5803
| * | | | | Fix inconsistent naming for services that delete thingsdixpac2017-02-083-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Changed name of delete_user_service and worker to destroy * Move and change delete_group_service to Groups::DestroyService * Rename Notes::DeleteService to Notes::DestroyService
* | | | | | Merge branch '23104-remove-public-param-for-projects' into 'master' Douwe Maan2017-02-081-15/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | API: remove `public` param for projects Closes #23104 See merge request !8736
| * | | | | | API: remove `public` param for projectsToon Claes2017-02-071-15/+4
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The create and edit actions for projects had these parameters: - `public` (optional) - if true same as setting `visibility_level = 20` - `visibility_level` (optional) Remove the `public` parameter to avoid contradiction.
* | | | | | Merge branch 'feature/gb/paginated-environments-api' into 'master'Rémy Coutable2017-02-082-1/+37
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | Expose paginated environments list API endpoint See merge request !8928
| * | | | | Merge branch 'master' into feature/gb/paginated-environments-apiFilipa Lacerda2017-02-0727-219/+1431
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (301 commits) added missed commit in rebase update Grape routes to work with current version of Grape adds changelog fixes cursor issue on pipeline pagination Use random group name to prevent conflicts List all groups/projects for admins on explore pages Fix indentation More backport Fix filtered search user autocomplete for gitlab instances that are hosted on a subdirectory Fixed variables_controller_spec.rb test Backport of the frontend view, including tests Updated the #create action to render the show view in case of a form error Improved code styling on the variables_controller_spec Added tests for the variables controller #update action Added a variable_controller_spec test to test for flash messages on the #create action Modified redirection logic in the variables cont. Added redirections to the index actions for the variables and triggers controllers Added a flash message to the creation of triggers Fixed tests, renamed files and methods Changed the controller/route name to 'ci/cd' and renamed the corresponding files ...
| * | | | | Add specs for standalone pagination for serializersGrzegorz Bizon2017-02-061-0/+9
| | | | | |
| * | | | | Move serializers pagination class to separate moduleGrzegorz Bizon2017-02-061-0/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This helps to avoid conflicts with `Paginator` class that seems to be used by some bundled libs.
| * | | | | Rename `Gitlab::Serialize` module to reuse it laterGrzegorz Bizon2017-02-061-1/+1
| | | | | |
* | | | | | Merge branch 'jej-lint-scripts-and-config' into 'master'dz-nested-groups-docsDouwe Maan2017-02-081-0/+25
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Syntax linting for init scripts Closes #27787 See merge request !9054
| * | | | | | CI runs lint on shell scripts in lib/supportjej-lint-scripts-and-configJames Edwards-Jones2017-02-071-0/+25
| | | | | | |
* | | | | | | Use stricter regex anchorsroute-map-string-sourceDouwe Maan2017-02-071-1/+1
| | | | | | |
* | | | | | | Support a string source in the route mapDouwe Maan2017-02-071-17/+15
| | | | | | |
* | | | | | | Merge branch 'route-map' into 'master' Robert Speicher2017-02-072-0/+66
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | Add 'View on [env]' link to blobs and individual files in diffs See merge request !8867
| * | | | | | Address feedbackDouwe Maan2017-02-061-2/+0
| | | | | | |
| * | | | | | Improve performance of finding last deployed environmentDouwe Maan2017-02-061-0/+14
| | | | | | |
| * | | | | | Add testsDouwe Maan2017-02-061-0/+2
| | | | | | |
| * | | | | | Validate route mapDouwe Maan2017-02-061-0/+52
| | | | | | |
* | | | | | | Merge branch 'jej-fix-backup-rake-color' into 'master'Sean McGivern2017-02-071-6/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed backup.rake colorize method following Pages -> CE See merge request !9031
| * | | | | | | Fixed backup.rake colorize method following Pages -> CEjej-fix-backup-rake-colorConnor Shea2017-02-071-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | Cherry-picked 'Remove colorize methods that weren't in CE.'
* | | | | | | | Merge branch '21518_recaptcha_spam_issues' into 'master'Sean McGivern2017-02-071-0/+4
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use reCaptcha when an issue identified as spam Closes #21518 See merge request !8846
| * | | | | | | | Use reCaptcha when an issue identified as spamJarka Kadlecova2017-02-071-0/+4
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch 'remove-deploy-key-endpoint' into 'master' Rémy Coutable2017-02-073-89/+206
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove deploy key endpoint Closes #20569 See merge request !8716
| * | | | | | | Remove /projects/:id/keys/.. endpointsRobert Schilling2017-02-073-89/+206
| | | | | | | |
* | | | | | | | Merge branch '27785-fix-init-script-after-pages-to-ce' into 'master' Douwe Maan2017-02-071-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix syntax error in init.d/gitlab after Pages -> CE Closes #27785 See merge request !9026
View Lorry Controller Status