summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | Fix rubocopLuke "Jared" Bennett2017-08-011-2/+2
* | | Merge remote-tracking branch 'origin/master' into ideLuke "Jared" Bennett2017-07-312-2/+22
|\ \ \ | |/ /
| * | Merge branch 'fix-replying-to-commit-comment-in-mr-from-fork' into 'master'Douwe Maan2017-07-281-1/+21
| |\ \
| | * | Fix replying to commit comments on MRs from forksSean McGivern2017-07-281-1/+21
| * | | Merge branch '26890-sort-branches' into 'master'Rémy Coutable2017-07-281-1/+1
| |\ \ \
| | * | | WIP: This makes the default sort order for branches 'recently updated' rather...26890-sort-branchesMatt Lee2017-01-201-1/+1
* | | | | Add environment instance var to BlobController#show html respLuke "Jared" Bennett2017-07-311-0/+3
* | | | | Changes to `raw_size` to take advantage of LFS.Jacob Schatz2017-07-281-1/+1
* | | | | Adds `raw_size` to take advantage of LFSJacob Schatz2017-07-281-1/+1
* | | | | Merge branch 'ide' of gitlab.com:gitlab-org/gitlab-ce into ideJacob Schatz2017-07-2817-125/+128
|\ \ \ \ \
| * | | | | render blob/show if not show_new_repo?Luke "Jared" Bennett2017-07-281-1/+2
| * | | | | Merge remote-tracking branch 'origin/master' into ideLuke "Jared" Bennett2017-07-2816-124/+126
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge branch 'backport-2844-ldap-ee-license-checks' into 'master'Douwe Maan2017-07-281-6/+1
| | |\ \ \ \
| | | * | | | Backport some recent changes related to LDAP from EEbackport-2844-ldap-ee-license-checksRubén Dávila2017-07-271-6/+1
| | | | |/ / | | | |/| |
| | * | | | Merge branch 'sh-augment-lograge-output' into 'master'Sean McGivern2017-07-281-0/+10
| | |\ \ \ \
| | | * | | | Add remote IP, user ID and username to JSON lograge outputsh-augment-lograge-outputStan Hu2017-07-281-0/+10
| | * | | | | Merge branch '35224-transform-user-profile-javascript-into-async-bundle' into...Tim Zallmann2017-07-281-4/+1
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | refactor async calendar dataMike Greiling2017-07-181-4/+1
| | * | | | | Merge branch 'bvl-add-all-settings-to-api' into 'master'Robert Speicher2017-07-271-78/+3
| | |\ \ \ \ \
| | | * | | | | Make the attribute list for application settings reusableBob Van Landuyt2017-07-271-78/+3
| | | | |/ / / | | | |/| | |
| | * | | | | Merge branch '1827-prevent-concurrent-editing-wiki' into 'master'Robert Speicher2017-07-271-1/+4
| | |\ \ \ \ \
| | | * \ \ \ \ Merge branch 'master' into 1827-prevent-concurrent-editing-wikiHiroyuki Sato2017-07-23172-2227/+3545
| | | |\ \ \ \ \
| | | * | | | | | Prevent concurrent editing wikiHiroyuki Sato2017-03-081-1/+4
| | * | | | | | | Merge branch 'backport-ee-2456' into 'master'Robert Speicher2017-07-271-1/+1
| | |\ \ \ \ \ \ \
View Lorry Controller Status