summaryrefslogtreecommitdiff
path: root/app/controllers/concerns
Commit message (Collapse)AuthorAgeFilesLines
* Refactor whitelisting of filter paramsHeinrich Lee Yu2018-11-152-19/+19
|
* backport: Always proxy reports downloadsalways-proxy-reportsKamil Trzciński2018-11-071-2/+2
| | | | This makes to always proxy reports
* Revert "Merge branch 'blackst0ne-update-push-new-merge-request-url' into ↵Douwe Maan2018-11-071-1/+1
| | | | | 'master'" This reverts merge request !22526
* Merge branch 'ce-jej/group-saml-sso-badges' into 'master'Robert Speicher2018-11-061-6/+1
|\ | | | | | | | | CE MR for Group SAML SSO badges See merge request gitlab-org/gitlab-ce!22587
| * Add MembersPreloader to fix ActiveRecord copce-jej/group-saml-sso-badgesJames Edwards-Jones2018-11-021-6/+1
| | | | | | | | | | | | | | | | | | | | MembersPresentation was previously preloading records and we wanted to extend this in https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/5807 By moving this to MembersPreloader we avoid introducing a new cop exception that would otherwise have been needed in EE::MembersPresentation
* | Restore 403 functionality for external auth (EE)Thong Kuah2018-11-012-7/+19
| | | | | | | | | | | | | | | | | | | | When we unhooked ClustersController from Project::ApplicationsController, we missed an EE override to handle_not_found_or_authorized. Rather than carry on with override RoutingActions, make a specific proc for Project that we override in EE instead. Use that proc in both Clusters::BaseController and Project::ApplicationsController.
* | Merge branch 'blackst0ne-update-push-new-merge-request-url' into 'master'Douwe Maan2018-10-291-1/+1
|\ \ | | | | | | | | | | | | | | | | | | Make new merge request URL more friendly when pushing code Closes #53012 See merge request gitlab-org/gitlab-ce!22526
| * | Update other linksblackst0ne2018-10-261-1/+1
| | |
* | | Simplify query and add tests for authorization changeHeinrich Lee Yu2018-10-261-7/+3
| | |
* | | Update boards issue creation authorizationHeinrich Lee Yu2018-10-261-1/+8
| | |
* | | Resolve "Filter discussion (tab) by comments or activity in issues and merge ↵Oswaldo Ferreira2018-10-232-4/+46
|/ / | | | | | | requests"
* | Fixed bug with the content disposition with wiki attachmentsFrancisco Javier López2018-10-171-1/+1
|/
* Create labels_as_hash_ concern, modify params for methodccr/48930_extract_logic_to_concernChantal Rollison2018-10-031-0/+28
|
* Enable even more frozen string in app/controllersgfyoung2018-09-251-0/+2
| | | | | | | | | | | | Enables frozen string for some vestigial files as well as the following: * app/controllers/projects/**/*.rb * app/controllers/sherlock/**/*.rb * app/controllers/snippets/**/*.rb * app/controllers/users/**/*.rb Partially addresses #47424.
* Merge branch 'fa-handle_invalid_utf8_errors' into 'master'Stan Hu2018-09-251-0/+25
|\ | | | | | | | | Render 412 when invalid UTF-8 is passed as parameter See merge request gitlab-org/gitlab-ce!21774
| * Render 412 for invalid UTF-8 parametersfa-handle_invalid_utf8_errorsFelipe Artur2018-09-221-0/+25
| | | | | | | | | | Renders 412 error page when invalid UTF-8 is passed as parameters in controllers.
* | Merge branch 'mk/improve-usage-of-request-store' into 'master'Yorick Peterse2018-09-251-5/+1
|\ \ | | | | | | | | | | | | | | | | | | Resolve "Provide NullStore for RequestStore" Closes #51718 See merge request gitlab-org/gitlab-ce!21848
| * | Simplify by using Gitlab::SafeRequestStoreMichael Kozono2018-09-241-5/+1
| | | | | | | | | | | | These are clear wins.
* | | Return discussion object from NotesController#create when return_discussion ↵Douwe Maan2018-09-211-13/+35
|/ / | | | | | | param is set
* | Merge branch 'frozen-string-app-controller' into 'master'Stan Hu2018-09-2043-1/+87
|\ \ | | | | | | | | | | | | Enable frozen string in app/controllers/**/*.rb See merge request gitlab-org/gitlab-ce!21736
| * | Enable frozen string in app/controllers/**/*.rbrepo-forks/gitlab-ce-frozen-string-app-controllergfyoung2018-09-1843-1/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enables frozen string for the following: * app/controllers/*.rb * app/controllers/admin/**/*.rb * app/controllers/boards/**/*.rb * app/controllers/ci/**/*.rb * app/controllers/concerns/**/*.rb Partially addresses #47424.
* | | Merge branch '44998-split-admin-settings-into-multiple-sub-pages' into 'master'Dmitriy Zaporozhets2018-09-201-0/+6
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Resolve "Split admin settings into multiple sub pages" Closes #44998 See merge request gitlab-org/gitlab-ce!21467
| * | Add empty controller actions and utilize referer_path helperMartin Wortschack2018-09-191-0/+6
| |/
* | Disable existing offenses for the CodeReuse copsYorick Peterse2018-09-1112-0/+30
|/ | | | | This whitelists all existing offenses for the various CodeReuse cops, of which most are triggered by the CodeReuse/ActiveRecord cop.
* Use ResourceLabelEvent for tracking label changesJan Provaznik2018-09-072-0/+2
|
* Merge branch 'ccr/6699_image_for_object_error' into 'master'Robert Speicher2018-09-061-0/+2
|\ | | | | | | | | Handled exception during file upload See merge request gitlab-org/gitlab-ce!21528
| * Handled exception during file uploadChantal Rollison2018-09-061-0/+2
| |
* | Fix attachments not displaying inline with Google Cloud StorageStan Hu2018-09-051-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There were several issues: 1. With Google Cloud Storage, we can't override the Content-Type with Response-Content-Type once it is set. Setting the value to `application/octet-stream` doesn't buy us anything. GCS defaults to `application/octet-stream`, and AWS uses `binary/octet-stream`. Just remove this `Content-Type` when we upload new files. 2. CarrierWave and fog-google need to support query parameters: https://github.com/fog/fog-google/pull/409/files, https://github.com/carrierwaveuploader/carrierwave/pull/2332/files. CarrierWave has been monkey-patched until an official release. 3. Workhorse also needs to remove the Content-Type header in the request (https://gitlab.com/gitlab-org/gitlab-workhorse/blob/ef80978ff89e628c8eeb66556720e30587d3deb6/internal/objectstore/object.go#L66), or we'll get a 403 error when uploading due to signed URLs not matching the headers. Upgrading to Workhorse 6.1.0 for https://gitlab.com/gitlab-org/gitlab-workhorse/merge_requests/297 will make Workhorse use the headers that are used by Rails. Closes #49957
* | Set issuable_sort and diff_view cookies to secure when possibleStan Hu2018-09-031-4/+8
|/ | | | Closes #49120
* Fixed project logo when it is LFS trackedFrancisco Javier López2018-08-301-0/+69
|
* Allows author to vote on their own issueChantal Rollison2018-08-241-1/+1
|
* Speed up diff comparisons by limiting number of commit messages renderedStan Hu2018-08-221-0/+20
| | | | | | | When a diff has a significant number of commits, the previous behavior would attempt to render the Markdown on all the commit messages but only display 1000 of them. To avoid additional work, we only need to render the Markdown on the set that is displayed.
* Resolve "Separate remembering sorting issues/merge requests"🙈 jacopo beschi 🙉2018-08-211-10/+12
|
* ensure all project repository settings panels remain open after form submissionMike Greiling2018-08-081-2/+2
|
* Revert "Revert "Merge branch 'ee-5481-epic-todos' into 'master'""Jarka Kadlecová2018-08-021-0/+12
| | | | This reverts commit 8717c7dad9b5a8fa21ec9a652c54718a6b4c2175.
* Merge branch 'bvl-user-status-message-35463' into 'master'Rémy Coutable2018-08-014-2/+17
|\ | | | | | | | | | | | | Allow users to set a status Closes #35463 See merge request gitlab-org/gitlab-ce!20614
| * Show the status of a user in interactionsBob Van Landuyt2018-07-304-2/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The status is shown for - The author of a commit when viewing a commit - Notes on a commit (regular/diff) - The user that triggered a pipeline when viewing a pipeline - The author of a merge request when viewing a merge request - The author of notes on a merge request (regular/diff) - The author of an issue when viewing an issue - The author of notes on an issue - The author of a snippet when viewing a snippet - The author of notes on a snippet - A user's profile page - The list of members of a group/user
* | Merge branch 'feature/gb/login-activity-metrics' into 'master'Sean McGivern2018-07-311-2/+2
|\ \ | |/ |/| | | | | | | | | Add user authentication activity metrics Closes #47789 See merge request gitlab-org/gitlab-ce!20668
| * Track blocked users and two factor authenticationsGrzegorz Bizon2018-07-231-2/+2
| |
* | Resolve "Deploy Tokens failed to clone LFS repository"Mayra Cabrera2018-07-231-2/+17
|/
* Revert "Merge branch 'ee-5481-epic-todos' into 'master'"Jarka Kadlecová2018-07-111-12/+0
| | | | | This reverts commit 4d9a3f42f1fd3be21555e19872b7121cca65015e, reversing changes made to ecf9c145f6e4d170cd059df88743393d9e63c489.
* Updates from `rubocop -a`Lin Jen-Shin2018-07-092-2/+2
|
* Use proper markdown rendering for previewsBrett Walker2018-07-061-0/+2
|
* Preload ancestors after pagination when filteringBob Van Landuyt2018-07-061-14/+26
| | | | | | | | | We need to preload the ancestors of search results after applying pagination limits. This way the search results itself are paginated, but not the ancestors. If we don't do this, we might not preload a parent group of a search result as it has been cut off by pagination.
* Merge branch '31583-osw-gfm-complete-status-indication' into 'master'Sean McGivern2018-07-061-0/+1
|\ | | | | | | | | | | | | Resolve "GFM preview should have status indicator" Closes #31583 See merge request gitlab-org/gitlab-ce!20418
| * Present state indication on GFM previewOswaldo Ferreira2018-07-051-0/+1
| |
* | Merge branch 'ee-5481-epic-todos' into 'master'Sean McGivern2018-07-041-0/+12
|\ \ | | | | | | | | | | | | Port of Todos for epics See merge request gitlab-org/gitlab-ce!19908
| * | More EE->CE fixesJan Provaznik2018-07-031-1/+0
| | |
| * | [backend] Addressed review commentsJan Provaznik2018-07-031-0/+13
| |/ | | | | | | | | | | | | * Group filtering now includes also issues/MRs from subgroups/subprojects * fixed due_date * Also DRYed todo controller specs
* | Merge branch 'jprovazn-direct-upload' into 'master'Kamil Trzciński (OoO till 3th)2018-07-041-0/+10
|\ \ | |/ |/| | | | | | | | | Add workhorse authorize method for project/group uploads Closes #44663 See merge request gitlab-org/gitlab-ce!19717
View Lorry Controller Status