summaryrefslogtreecommitdiff
path: root/app/controllers/projects
Commit message (Collapse)AuthorAgeFilesLines
* Fixed bug with the content disposition with wiki attachmentsFrancisco Javier López2018-10-173-12/+15
|
* Resolve "In web editor, when delete a file, should navigate to enclosing ↵George Thomas2018-10-171-4/+14
| | | | directory"
* Disable artifact validation for download actionMatija Čupić2018-10-162-4/+4
|
* Merge branch '34758-refactor-cluster-services' into 'master'Dmitriy Zaporozhets2018-10-151-5/+5
|\ | | | | | | | | Refactor Cluster services to enable groups or projects See merge request gitlab-org/gitlab-ce!22181
| * Pass in project as kwarg for CreateServiceThong Kuah2018-10-151-5/+5
| | | | | | | | | | | | | | | | | | This enables us to have other options in the future such as passing in `group:`. Also, remove project arg from UpdateService, as un-used. This will help group cluster controller to re-use this services.
* | Remove un-used inheritance from serviceThong Kuah2018-10-151-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | Remove the inheritance from ::BaseService which is causing us to inherit the initializer that has project as the first arg, as we will not have access to project with forthcoming group clusters. Also call install service from create service - 1 less thing to re-use Extract TestRequest code into a spec helper. Given that we need different behaviour for Rails 5.0 (and again in Rails 5.1!), it's handy to have that branching behaviour in one place
* | Move non-controller code into dedicated serviceThong Kuah2018-10-151-27/+7
|/ | | | | | | | | | This should help with code re-use when we create applications for group level cluster next. Change `find_or_initialize_by` to explicitly find or build the right association based on the application name. The benefit here is that we use the associations on @cluster rather than querying from the other side of the association.
* Merge branch 'sh-handle-invalid-comparison' into 'master'Douwe Maan2018-10-091-0/+17
|\ | | | | | | | | | | | | Reject invalid branch names in repository compare controller Closes #51003 See merge request gitlab-org/gitlab-ce!22186
| * Reject invalid branch names in repository compare controllerStan Hu2018-10-081-0/+17
| | | | | | | | Closes #51003
* | Merge branch 'osw-remove-dead-code-on-mr-show' into 'master'Robert Speicher2018-10-081-6/+0
|\ \ | | | | | | | | | | | | | | | | | | Removes expensive dead code on main MR page request Closes #51172 See merge request gitlab-org/gitlab-ce!22153
| * | Remove dead code on main MR pageOswaldo Ferreira2018-10-051-6/+0
| | |
* | | Merge branch 'Fix-pipeline-redirect' into 'master'Grzegorz Bizon2018-10-081-1/+7
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | Redirect to the pipeline builds page when a build is canceled Closes #39161 See merge request gitlab-org/gitlab-ce!21595
| * | Redirect to the pipeline builds page when a build is canceledEva Kadlecová2018-09-171-1/+7
| | |
* | | Merge branch ↵Sean McGivern2018-10-051-2/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '43109-ci_environments_status-json-executes-more-than-100-queries' into 'master' Resolve "Controller Projects::MergeRequestsController#ci_environments_status.json executes more than 100 SQL queries" Closes #43109 See merge request gitlab-org/gitlab-ce!21996
| * | | Don't build project services unneccesarilyBrett Walker2018-10-041-2/+2
| | | |
* | | | Merge branch 'issue_43097' into 'master'Sean McGivern2018-10-051-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move related branches to service Closes #43097 See merge request gitlab-org/gitlab-ce!22094
| * | | | Move issue related_branches to serviceFelipe Artur2018-10-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Moves the related_branches method from Issue model to RelatedBranchesService
* | | | | Merge branch 'sh-revert-broken-deploy-key-change' into 'master'Robert Speicher2018-10-051-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Merge branch 'deploy-tokens' into 'master'" Closes #52228 See merge request gitlab-org/gitlab-ce!22149
| * | | | | Revert "Merge branch 'deploy-tokens' into 'master'"Stan Hu2018-10-051-2/+2
| | |/ / / | |/| | | | | | | | | | | | | | | | | | This reverts commit 3df32ac1290160680473248b48d1b12c96458bf7, reversing changes made to dd1295a30f28eeb3c7058b1899e00db7943f3e54.
* | | | | Merge branch 'master-ce' into scheduled-manual-jobsShinya Maeda2018-10-051-0/+4
|\ \ \ \ \
| * | | | | Resolve "Drop down filter for project snippets"Fabian Schneider2018-10-051-0/+4
| |/ / / /
* | | | | Merge branch 'master-ce' into scheduled-manual-jobsShinya Maeda2018-10-053-1/+15
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'dz-labels-subscribe-filter' into 'master'Dmitriy Zaporozhets2018-10-041-0/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add subscribe filter to labels page See merge request gitlab-org/gitlab-ce!21965
| | * | | | Add subscribe filter to labels pageDmitriy Zaporozhets2018-10-041-0/+1
| | |/ / / | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Merge branch '49329-mr-show-commit-details' into 'master'Fatih Acet2018-10-041-1/+7
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add signature badge and pipeline status to commit details in MR diff Closes #49329 See merge request gitlab-org/gitlab-ce!22079
| | * | | | Add signature badge to diffs/commit_itemPaul Slaughter2018-10-031-1/+7
| | |/ / / | | | | | | | | | | | | | | | | | | | | **Notes:** - Also exposes commit.signature_html in diffs.json
| * | | | Simplify runner registration token resettingTomasz Maczukin2018-10-041-0/+7
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This icommit adds several changes related to the same topic - resetting a Runner registration token: 1. On Project settings page it adds a button for resetting the registration token and it removes the Runner token field that was confusing all GitLab users. 2. On Group settings page it adds the same button for resetting the registration token. 3. On Admin Runners settings page it moves the button to the same place as in Project and Group settings and it changes slightly the page layout to make it more similar to Group and Project setting pages. 4. It refactorizes a little the partial that prints runner registration description. Thanks to this Project, Group and Admin settings of the Runner are re-using the same code to generate the button. 5. Updates the translations of changed text.
* | | | Merge branch 'master-ce' into scheduled-manual-jobsShinya Maeda2018-10-031-1/+3
|\ \ \ \ | |/ / /
| * | | CE Resolve "Refactor code quality similar to JUnit tests"Matija Čupić2018-10-021-1/+3
| | | |
* | | | Add a new status to ci_builds.statusShinya Maeda2018-10-021-1/+1
| | | |
* | | | Add unschedule endpont to job controllerShinya Maeda2018-10-021-0/+7
|/ / /
* | | Merge branch ↵Bob Van Landuyt2018-10-012-0/+8
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | 'security-6881-project-group-approvers-leaks-private-group-info-ce' into 'master' [master] CE: Project group approvers leaks private group info See merge request gitlab/gitlabhq!2488
| * | Ports new refactor from EE to CETiago Botelho2018-09-242-0/+6
| | |
| * | Applies the CE backport of EE#657Tiago Botelho2018-09-242-0/+2
| | |
* | | Merge branch 'frozen-string-app-controllers-much-more' into 'master'Rémy Coutable2018-09-2681-12/+164
|\ \ \ | | | | | | | | | | | | | | | | Enable even more frozen string in app/controllers See merge request gitlab-org/gitlab-ce!21919
| * | | Enable even more frozen string in app/controllersgfyoung2018-09-2581-12/+164
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | Resolve "Commit details are not displayed when reviewing an MR commit by commit"Paul Slaughter2018-09-261-1/+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 #47942 Closes #47942 See merge request gitlab-org/gitlab-ce!20363
| * | use redirect instead of render to avoid creating keys when refresh - ↵Muhammad Nuzaihan2018-07-041-2/+2
| | | | | | | | | | | | resolves #47942
* | | 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
* | | | 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
* | | Merge branch 'rubocop-code-reuse' into 'master'Robert Speicher2018-09-1330-0/+80
|\ \ \ | | | | | | | | | | | | | | | | 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-1130-0/+80
| | | | | | | | | | | | | | | | | | | | 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-101-1/+6
|/ / / | | | | | | | | | 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 '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
| | | |
View Lorry Controller Status