summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Reduce query count for snippet searchsnippets-search-performancePhil Hughes2017-02-161-2/+2
| | | | | | | Recudes the number of queries within the snippet search from approx. 50 to approx. 14 by preloading the authors Part of #27392
* Merge branch 'dz-nested-groups-improvements-3' into 'master' Dmitriy Zaporozhets2017-02-156-6/+6
|\ | | | | | | | | Nested groups improvements pt 3 See merge request !9227
| * Merge branch 'master' into 'dz-nested-groups-improvements-3'Dmitriy Zaporozhets2017-02-147-61/+48
| |\ | | | | | | | | | # Conflicts: # doc/api/projects.md
| * | Use Namespace#full_path instead of Namespace#pathDmitriy Zaporozhets2017-02-145-5/+5
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Expose Namespace#full_path in namespaces APIDmitriy Zaporozhets2017-02-141-1/+1
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge branch 'pass_coverage_value_to_commit_status_api' into 'master' Rémy Coutable2017-02-152-2/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Make it possible to pass coverage value to commit status API Closes #27807 See merge request !9214
| * | | Make it possible to pass coverage value to commit status APIwendy04022017-02-142-2/+4
| | | |
* | | | Merge branch '27759-fix-sidekiq_status-client_middleware-issue' into 'master' Robert Speicher2017-02-142-2/+2
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | SidekiqStatus need to be qualified in some cases Closes #27759 See merge request !9235
| * | | SidekiqStatus need to be qualified in some cases27759-fix-sidekiq_status-client_middleware-issueRémy Coutable2017-02-142-2/+2
| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | Merge branch 'replace-npm-with-yarn' into 'master' Filipa Lacerda2017-02-142-2/+2
|\ \ \ \ | |/ / / |/| | | | | | | | | | | Replace NPM with Yarn See merge request !9055
| * | | replace npm run calls with yarnMike Greiling2017-02-132-2/+2
| | | |
* | | | API: Consolidate /projects endpointToon Claes2017-02-143-55/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It consolidates these endpoints: - /projects - /projects/owned - /projects/visible - /projects/starred - /projects/all Into the /projects endpoint using query parameters.
* | | | Merge branch 'create-connection-pool' into 'master' Yorick Peterse2017-02-141-0/+25
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Introduce Gitlab::Database.with_connection_pool See merge request !9192
| * | | | 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 '14492-change-fork-endpoint' into 'master'Sean McGivern2017-02-141-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move /projects/fork/:id to /projects/:id/fork in V4 API Closes #14492 See merge request !8940
| * | | | | Move /projects/fork/:id to /projects/:id/fork14492-change-fork-endpointOswaldo Ferreira2017-02-131-1/+1
| | |_|/ / | |/| | |
* | | | | Merge branch 'fix-ar-connection-leaks' into 'master'Rémy Coutable2017-02-141-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix ActiveRecord connection leaks Closes #27949 and gitlab-com/infrastructure#1139 See merge request !9109
| * | | | | Don't connect in Gitlab::Database.adapter_namefix-ar-connection-leaksYorick Peterse2017-02-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We don't need to connect when requesting the name of the database adapter. This in turn should prevent us from requesting/leaking connections just by asking whether we're using PostgreSQL or MySQL.
* | | | | | Merge branch '22645-add-discussion-contribs-to-calendar' into 'master' Sean McGivern2017-02-141-2/+4
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add discussion events to contributions calendar Closes #22645 See merge request !8821
| * | | | | Add comment events to contributions calendar22645-add-discussion-contribs-to-calendarRémy Coutable2017-02-131-2/+4
| | |_|/ / | |/| | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | Add GFM support to nested groupsdz-nested-groups-gfm-altDmitriy Zaporozhets2017-02-133-4/+8
| |_|/ / |/| | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Merge branch '22818-licence-gitignore-and-yml-endpoints-removal' into 'master' Rémy Coutable2017-02-133-56/+162
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | Remove deprecated templates endpoints in V4 Closes #22818 See merge request !8853
| * | | Remove deprecated templates endpoints in V422818-licence-gitignore-and-yml-endpoints-removalOswaldo Ferreira2017-02-133-56/+162
| |/ /
* | | Merge branch 'rs-rubocop-rspec' into 'master' Rémy Coutable2017-02-131-1/+1
|\ \ \ | |/ / |/| | | | | | | | Enable Style/RedundantException, Lint/EmptyWhen, and RSpec/ExpectActual cops See merge request !9151
| * | Enable `Lint/EmptyWhen` cop and correct offenseRobert Speicher2017-02-131-1/+1
| |/
* | 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
View Lorry Controller Status