summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Expand)AuthorAgeFilesLines
* Add custom header for error responsesDavid2018-10-011-0/+9
* Merge remote-tracking branch 'dev/master'Bob Van Landuyt2018-10-013-0/+13
|\
| * Merge branch 'security-6881-project-group-approvers-leaks-private-group-info-...Bob Van Landuyt2018-10-013-0/+13
| |\
| | * Ports new refactor from EE to CETiago Botelho2018-09-242-0/+6
| | * Applies the CE backport of EE#657Tiago Botelho2018-09-243-0/+7
* | | Refactor EventFilter and increase its test coverage1801-allow-event_filter-to-be-set-in-the-urlRémy Coutable2018-09-262-5/+5
* | | Allow events filter to be set in the URL in addition to cookieIgor Kapkov2018-09-261-0/+1
|/ /
* | Merge branch 'frozen-string-app-controllers-much-more' into 'master'Rémy Coutable2018-09-2688-12/+178
|\ \
| * | Enable even more frozen string in app/controllersgfyoung2018-09-2588-12/+178
* | | Resolve "Commit details are not displayed when reviewing an MR commit by commit"Paul Slaughter2018-09-261-1/+1
|/ /
* | Merge branch 'frozen-string-app-controller-more' into 'master'Stan Hu2018-09-2551-1/+103
|\ \
| * | Enable more frozen string in app/controllers/gfyoung2018-09-2351-1/+103
* | | Merge branch 'fa-handle_invalid_utf8_errors' into 'master'Stan Hu2018-09-252-0/+26
|\ \ \
| * | | Render 412 for invalid UTF-8 parametersfa-handle_invalid_utf8_errorsFelipe Artur2018-09-222-0/+26
* | | | Merge branch 'mk/improve-usage-of-request-store' into 'master'Yorick Peterse2018-09-251-5/+1
|\ \ \ \
| * | | | Simplify by using Gitlab::SafeRequestStoreMichael Kozono2018-09-241-5/+1
| | |/ / | |/| |
* | | | Merge branch 'deploy-tokens' into 'master'Rémy Coutable2018-09-251-2/+2
|\ \ \ \
| * | | | use redirect instead of render to avoid creating keys when refresh - resolves...Muhammad Nuzaihan2018-07-041-2/+2
* | | | | Remove background job throttling feature51509-remove-sidekiq-limit-fetchValery Sizov2018-09-241-2/+1
* | | | | Merge branch 'dz-group-labels-finder' into 'master'Yorick Peterse2018-09-241-4/+1
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Move group labels AR code into finderdz-group-labels-finderDmitriy Zaporozhets2018-09-211-4/+1
* | | | | Merge branch 'dm-create-note-return-discussion' into 'master'Filipa Lacerda2018-09-241-13/+35
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Return discussion object from NotesController#create when return_discussion p...Douwe Maan2018-09-211-13/+35
| |/ / /
* | | | Merge branch '47398-user-is-unable-revoke-a-authorized-application-unless-use...Dmitriy Zaporozhets2018-09-211-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Always allow user to revoke an authorized applicationDmitriy Zaporozhets2018-09-201-1/+1
* | | | Merge branch 'frozen-string-app-controller' into 'master'Stan Hu2018-09-20104-9/+216
|\ \ \ \
| * | | | Enable frozen string in app/controllers/**/*.rbrepo-forks/gitlab-ce-frozen-string-app-controllergfyoung2018-09-18104-9/+216
| |/ / /
* | | | Merge branch '44998-split-admin-settings-into-multiple-sub-pages' into 'master'Dmitriy Zaporozhets2018-09-202-1/+37
|\ \ \ \ | |/ / / |/| | |
| * | | Add empty controller actions and utilize referer_path helperMartin Wortschack2018-09-192-2/+30
| * | | Parse request.referer properlyMartin Wortschack2018-09-181-1/+1
| * | | Adds empty methods for 'geo' and 'templates'Martin Wortschack2018-09-141-0/+6
| * | | merge master and resolve conflictsMartin Wortschack2018-09-1113-73/+97
| |\ \ \
| * | | | use referer for redirect instead of hidden field param from partialsMartin Wortschack2018-09-101-1/+1
| * | | | merge master and resolve conflictsMartin Wortschack2018-09-0614-37/+48
| |\ \ \ \
| * | | | | handle redirect properlyMartin Wortschack2018-09-061-1/+3
| * | | | | redirect to the relevant sub page after updating application settingsMartin Wortschack2018-09-051-1/+1
* | | | | | Resolve "Unable to import repository: undefined method `import_file' for nil...James Lopez2018-09-172-3/+7
* | | | | | Merge branch '50461-add-retried-builds-in-pipeline-stage-endpoint' into 'master'Kamil Trzciński2018-09-171-1/+1
|\ \ \ \ \ \
| * | | | | | Add retried jobs to pipeline stagesSteve Azzopardi2018-09-131-1/+1
* | | | | | | Merge branch '29398-support-rbac-for-gitlab-provisioned-clusters' into 'master'Kamil Trzciński2018-09-171-1/+2
|\ \ \ \ \ \ \
| * | | | | | | Add FE option for users to choose to create a fully RBAC-enabled cluster or not.Thong Kuah2018-09-141-1/+2
| |/ / / / / /
* | | | | | | Cleaned up CI runner administration codeYorick Peterse2018-09-141-2/+0
* | | | | | | Resolve "Add functionality to change what email address online actions commit...Nick Thomas2018-09-141-0/+1
* | | | | | | Merge branch 'feature/runner-state-filter-for-admin-view' into 'master'Grzegorz Bizon2018-09-141-5/+4
|\ \ \ \ \ \ \
| * | | | | | | rename variable from *_cnt to *_countAlexis Reigel2018-09-121-1/+1
| * | | | | | | add sort dropdown to admin runners pageAlexis Reigel2018-08-291-1/+3
| * | | | | | | extract filter/sort/paging logic to finder classAlexis Reigel2018-08-201-5/+1
| * | | | | | | add status filter to admin runners pageAlexis Reigel2018-08-201-0/+1
* | | | | | | | Filter group milestones based on user membershipChantal Rollison2018-09-131-1/+1
| |/ / / / / / |/| | | | | |
* | | | | | | Merge branch 'rubocop-code-reuse' into 'master'Robert Speicher2018-09-1382-0/+224
|\ \ \ \ \ \ \
View Lorry Controller Status