summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '35845-improve-subgroup-creation-permissions' into 'master'Douwe Maan2017-08-221-0/+7
|\
| * Improves subgroup creation permissions35845-improve-subgroup-creation-permissionsTiago Botelho2017-08-211-0/+7
* | Merge branch 'rs-more-public-send-whitelists' into 'master'Rémy Coutable2017-08-163-3/+3
|\ \
| * | Whitelist or fix additional `Gitlab/PublicSend` cop violationsrs-more-public-send-whitelistsRobert Speicher2017-08-143-3/+3
* | | Merge branch 'rs-trailingwhitespace-cop' into 'master'Rémy Coutable2017-08-164-17/+17
|\ \ \
| * | | Enable Layout/TrailingWhitespace cop and auto-correct offensesRobert Speicher2017-08-154-17/+17
| | |/ | |/|
* | | Many Repo FixesJacob Schatz2017-08-151-0/+5
|/ /
* | Merge branch '7-days-cycle-analytics' into 'master'Rémy Coutable2017-08-141-1/+8
|\ \
| * | Add a `Last 7 days` option for Cycle Analytics viewMehdi Lahmam2017-08-111-1/+8
* | | Merge branch '36089-handle-ref-failure-better' into 'master'Douwe Maan2017-08-141-1/+1
|\ \ \ | |_|/ |/| |
| * | Merge remote-tracking branch 'upstream/master' into 36089-handle-ref-failure-...Lin Jen-Shin2017-08-147-16/+26
| |\ \ | | |/
| * | Merge remote-tracking branch 'upstream/master' into 36089-handle-ref-failure-...Lin Jen-Shin2017-08-113-14/+2
| |\ \
| * | | Avoid ambiguity, which happened in a single test runLin Jen-Shin2017-08-101-1/+1
* | | | Use Prev/Next pagination for exploring projectspagination-projects-exploreYorick Peterse2017-08-141-4/+7
| |_|/ |/| |
* | | Merge branch 'disable-project-export' into 'master'Rémy Coutable2017-08-111-0/+5
|\ \ \
| * | | Add option to disable project export on instanceRobin Bobbitt2017-08-111-0/+5
* | | | Better categorize test coverage resultsrs-coverage-updatesRobert Speicher2017-08-111-1/+3
* | | | Merge branch 'dm-session-delete-challenge' into 'master'Robert Speicher2017-08-111-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Delete correct key from `session` after authenticating using U2Fdm-session-delete-challengeDouwe Maan2017-08-111-1/+1
| | |/ | |/|
* | | Merge branch 'split-events-into-push-events' into 'master'Sean McGivern2017-08-114-13/+16
|\ \ \
| * | | Use a specialized class for querying eventsYorick Peterse2017-08-104-13/+16
| |/ /
* | | Cache Appearance instances in Redisappearances-caching-and-schemaYorick Peterse2017-08-101-1/+1
|/ /
* | Remove unused `redirect_to_external_issue_tracker` methodMehdi Lahmam2017-08-101-12/+0
* | Enable the Layout/SpaceBeforeBlockBraces coprc/enable-the-Layout/SpaceBeforeBlockBraces-copRémy Coutable2017-08-092-2/+2
|/
* Re-enable SqlInjection and CommandInjectionBrian Neel2017-08-081-3/+3
* Merge branch 'master' into ideMike Greiling2017-08-074-20/+17
|\
| * Merge branch '31207-clean-locked-merge-requests' into 'master'Stan Hu2017-08-081-5/+0
| |\
| | * Store MergeWorker JID on merge request, and clean up stuck mergesOswaldo Ferreira2017-08-071-5/+0
| * | [EE Backport] Update log audit event in omniauth_callbacks_controller.rbJames Lopez2017-08-071-6/+15
| * | Merge branch 'zj-project-templates' into 'master'Sean McGivern2017-08-072-9/+2
| |\ \ | | |/ | |/|
| | * Port form back to use form_tagZ.J. van de Weg2017-08-071-1/+1
| | * Fix last feature test for project templatesZ.J. van de Weg2017-08-071-1/+0
| | * After merge cleanupZ.J. van de Weg2017-08-071-10/+2
| | * Merge branch 'master' into zj-project-templatesFilipa Lacerda2017-08-0717-125/+134
| | |\
| | * | Rename GitLabProjectImporterService and misc fixesZ.J. van de Weg2017-08-011-2/+2
| | * | Allow projects to be started from a templateZ.J. van de Weg2017-07-282-10/+12
* | | | Merge branch 'master' into ideMike Greiling2017-08-074-4/+35
|\ \ \ \ | |/ / /
| * | | Merge branch 'dashboard-projects-controller-query-performance' into 'master'Sean McGivern2017-08-071-2/+4
| |\ \ \
| | * | | Eager load project creators for project dashboardsdashboard-projects-controller-query-performanceYorick Peterse2017-08-071-2/+4
| | | |/ | | |/|
| * | | GRPC::Unavailable (< GRPC::BadStatus) is wrapped in a CommandErrorBob Van Landuyt2017-08-071-1/+1
| * | | Add a Circuitbreaker for storage pathsBob Van Landuyt2017-08-042-0/+29
| |/ /
| * | Avoid plucking Todo ids and use sub-queries insteadToon Claes2017-08-031-2/+2
* | | Fix ABC size of BlobController#showLuke "Jared" Bennett2017-08-041-24/+32
* | | Add render_error to blob JSONDouwe Maan2017-08-031-1/+2
* | | More backend cleanupDouwe Maan2017-08-031-11/+9
* | | Clean up some backendDouwe Maan2017-08-032-27/+33
* | | Merge branch 'master' into ideDouwe Maan2017-08-032-18/+3
|\ \ \ | |/ /
| * | Fix Issue board when using Ruby 2.435769-fix-ruby-2-4-compatibilityRémy Coutable2017-08-011-1/+2
| * | Add option to use CommitLanguages RPCJacob Vosmaer2017-08-011-17/+1
* | | Fix UselessAssignment offense in projects_controllerLuke "Jared" Bennett2017-08-011-1/+0