summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Collapse)AuthorAgeFilesLines
* Enable frozen string in app/controllers/**/*.rbrepo-forks/gitlab-ce-frozen-string-app-controllergfyoung2018-09-18104-9/+216
| | | | | | | | | | | | 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.
* Resolve "Unable to import repository: undefined method `import_file' for ↵James Lopez2018-09-172-3/+7
| | | | nil:NilClass"
* Merge branch '50461-add-retried-builds-in-pipeline-stage-endpoint' into 'master'Kamil Trzciński2018-09-171-1/+1
|\ | | | | | | | | | | | | Add retried jobs to pipeline stages Closes #50461 See merge request gitlab-org/gitlab-ce!21558
| * Add retried jobs to pipeline stagesSteve Azzopardi2018-09-131-1/+1
| | | | | | | | closes https://gitlab.com/gitlab-org/gitlab-ce/issues/50461
* | Merge branch '29398-support-rbac-for-gitlab-provisioned-clusters' into 'master'Kamil Trzciński2018-09-171-1/+2
|\ \ | | | | | | | | | | | | | | | | | | Support Kubernetes RBAC for GitLab Managed Apps for creating new clusters Closes #29398 See merge request gitlab-org/gitlab-ce!21401
| * | Add FE option for users to choose to create a fully RBAC-enabled cluster or not.Thong Kuah2018-09-141-1/+2
| |/ | | | | | | This is similar to the option in the Add Existing cluster form
* | Cleaned up CI runner administration codeYorick Peterse2018-09-141-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | In https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/19625 some changes were introduced that do not meet our abstraction reuse rules. This commit cleans up some of these changes so the requirements are met. Most notably, sorting of the runners in Admin::RunnersFinder has been delegated to Ci::Runner.order_by, similar to how we order data in models that include the Sortable module. If we need more sort orders in the future we can include Sortable and have Ci::Runner.order_by call `super` to delegate to Sortable.order_by.
* | Resolve "Add functionality to change what email address online actions ↵Nick Thomas2018-09-141-0/+1
| | | | | | | | commit using"
* | Merge branch 'feature/runner-state-filter-for-admin-view' into 'master'Grzegorz Bizon2018-09-141-5/+4
|\ \ | | | | | | | | | | | | Feature: State filter for admin runners view See merge request gitlab-org/gitlab-ce!19625
| * | 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
|\ \ | | | | | | | | | | | | Add RuboCop cops to enforce code reusing rules See merge request gitlab-org/gitlab-ce!21391
| * | Disable existing offenses for the CodeReuse copsYorick Peterse2018-09-1182-0/+224
| | | | | | | | | | | | | | | This whitelists all existing offenses for the various CodeReuse cops, of which most are triggered by the CodeReuse/ActiveRecord cop.
* | | Fix mention in edit mrAlin Ciciu2018-09-121-0/+1
| | |
* | | Add sort dropdown to project labels page and group labels pageDmitriy Zaporozhets2018-09-102-1/+11
|/ / | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'sh-delete-container-registry-async' into 'master'Robert Speicher2018-09-071-10/+6
|\ \ | | | | | | | | | | | | | | | | | | Delete a container registry asynchronously Closes #51063 and #49926 See merge request gitlab-org/gitlab-ce!21553
| * | Delete a container registry asynchronouslyStan Hu2018-09-071-10/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a container registry has many tags, it's easy for the DELETE call to take more than 60 seconds and fail. This can also leave the registry in a bad state with null bytes since some of the images have been deleted with tags still pointing to them. In addition, we have to prevent users from accidentally initiating the delete multiple times or this could leave the registry with orphaned tags. This commit also adds a flash message to notify the user the registry is scheduled for deletion. Closes #49926, #51063
* | | Merge branch 'dz-refactor-group-labels-finder' into 'master'Stan Hu2018-09-071-3/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix group labels page timeout if many projects and labels Closes #51221 See merge request gitlab-org/gitlab-ce!21594
| * | | Use optionally_search for group labels index pageDmitriy Zaporozhets2018-09-071-2/+2
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Fix group labels page timeout if many projects and labelsDmitriy Zaporozhets2018-09-071-3/+4
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Merge branch 'osw-write-cache-upon-mr-creation-and-cache-refactoring' into ↵Douwe Maan2018-09-071-0/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Write diff highlighting cache upon MR creation (refactors caching) Closes #50204 See merge request gitlab-org/gitlab-ce!21489
| * | | | Cache diff highlighting upon Merge Request creation (refactors diff caching)Oswaldo Ferreira2018-09-071-0/+2
| | | | |
* | | | | Include private contributions in user contribution graphGeorge Tsiolis2018-09-071-0/+1
| |_|/ / |/| | |
* | | | Ask user explicitly about usage stats agreementJan Provaznik2018-09-072-5/+45
| | | |
* | | | Merge branch '48778-remove-old-storage-logic-from-import-export' into 'master'Douwe Maan2018-09-071-12/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Remove old storage logic from Import/Export" Closes #51144, #50109, #48778, and #51079 See merge request gitlab-org/gitlab-ce!21409
| * | | | refactor code based on feedbackJames Lopez2018-09-071-1/+1
| | | | |
| * | | | refactor code based on feedbackJames Lopez2018-09-071-2/+2
| | | | |
| * | | | Refactor code to remove object storage flag from Import/ExportJames Lopez2018-09-061-11/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated docs, refactor import/export code Fix AvatarUploader path issue Fix project export upload webhook error
* | | | | Use ResourceLabelEvent for tracking label changesJan Provaznik2018-09-072-0/+2
| |_|/ / |/| | |
* | | | Resolve "Improve handling of projects shared with a group"Dennis Tang2018-09-071-6/+2
| | | |
* | | | Merge branch 'issue_50488' into 'master'Stan Hu2018-09-071-1/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Move project services log to a separate file See merge request gitlab-org/gitlab-ce!21316
| * | | | Move project services log to a separate fileFelipe Artur2018-09-061-1/+2
| | | | |
* | | | | Merge branch '43140-reduce-logs-tree-load' into 'master'51201-document-review-appsRémy Coutable2018-09-061-36/+29
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bulk-render commit titles in the tree view to improve performance Closes #43140 See merge request gitlab-org/gitlab-ce!21500
| * | | | | Properly fix an introduced N+1 SQL issue loading commit authorsNick Thomas2018-09-061-0/+3
| | | | | |
| * | | | | Extract tree summary logic out of RefsController#logs_treeNick Thomas2018-09-061-45/+20
| | | | | |
| * | | | | Deduplicate commits before rendering them in RefsController#logs_treeNick Thomas2018-09-061-14/+19
| | | | | |
| * | | | | Bulk-render commit titles in the tree view to improve performanceNick Thomas2018-09-061-1/+11
| | | | | |
* | | | | | 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
| | | | | | |
* | | | | | | Resolve "Remove usage ping payload from Cohorts, add to Settings"Luke Bennett2018-09-061-0/+6
| | | | | | |
* | | | | | | Merge branch 'sh-fix-attachments-inline' into 'master'Nick Thomas2018-09-061-1/+15
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix attachments not displaying inline with Google Cloud Storage Closes #49957 See merge request gitlab-org/gitlab-ce!21265
| * | | | | | 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
* | | | | | Enable Kubernetes RBAC for GitLab Managed Apps for existing clustersThong Kuah2018-09-061-1/+2
| |_|/ / / |/| | | |
* | | | | Add User-Agent to production_json.logStan Hu2018-09-051-0/+1
|/ / / / | | | | | | | | | | | | | | | | This will help production gain more visibility which browsers may be having issues.
* | | | Merge branch 'filter-web-hooks-by-branch' into 'master'Dmitriy Zaporozhets2018-09-051-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Filter web hooks by branch See merge request gitlab-org/gitlab-ce!19513
| * | | | Filter project hooks by branchDuana Saskia2018-08-131-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow specificying a branch filter for a project hook and only trigger a project hook if either the branch filter is blank or the branch matches. Only supported for push_events for now.
* | | | | Merge branch 'dz-group-labels-search' into 'master'Felipe Artur2018-09-041-3/+3
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | Add search to group labels page See merge request gitlab-org/gitlab-ce!21480
View Lorry Controller Status