summaryrefslogtreecommitdiff
path: root/app/controllers/projects
Commit message (Collapse)AuthorAgeFilesLines
* Add modal for deleting a milestonewinh-delete-milestone-modalWinnie Hellmann2018-01-251-1/+1
|
* Retrieve commit signatures with GitalyJacob Vosmaer (GitLab)2018-01-181-20/+26
|
* Merge branch 'feature/merge-request-system-hook' into 'master'Douwe Maan2018-01-181-9/+1
|\ | | | | | | | | System hooks for Merge Requests See merge request gitlab-org/gitlab-ce!14387
| * reference triggers.values for permitted parametersAlexis Reigel2018-01-171-9/+1
| |
* | Merge branch 'sh-migrate-can-push-to-deploy-keys-projects-10-3' into ↵Douwe Maan2018-01-161-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | 'security-10-3' [10.3] Migrate `can_push` column from `keys` to `deploy_keys_project` See merge request gitlab/gitlabhq!2276 (cherry picked from commit f6ca52d31bac350a23938e0aebf717c767b4710c) 1f2bd3c0 Backport to 10.3
* | Merge branch 'milestones-finder-order-fix' into 'security-10-3'Robert Speicher2018-01-161-6/+8
| | | | | | | | | | | | | | | | | | | | Remove order param from the MilestoneFinder See merge request gitlab/gitlabhq!2259 (cherry picked from commit 14408042e78f2ebc2644f956621b461dbfa3d36d) 155881e7 Remove order param from the MilestoneFinder
* | Merge branch 'issue_41460' into 'master'Sean McGivern2018-01-161-5/+1
|\ \ | | | | | | | | | | | | | | | | | | Fix error on changes tab when merge request cannot be created Closes #41460 See merge request gitlab-org/gitlab-ce!16409
| * | Fix error on changes tab when merge request cannot be createdissue_41460Felipe Artur2018-01-151-5/+1
| | |
* | | Display related merge requests in commit detail pageHiroyuki Sato2018-01-121-1/+13
| | |
* | | Merge branch 'disable-pages-on-jobs' into 'master'Yorick Peterse2018-01-121-1/+1
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Use simple Next/Prev paging for CI Jobs page Closes #41058 See merge request gitlab-org/gitlab-ce!16392
| * | Use simple Next/Prev paging for jobs to avoid large count queries on ↵disable-pages-on-jobsGreg Stark2018-01-111-1/+1
| | | | | | | | | | | | arbitrarily large sets of historical jobs
* | | Adds Rubocop rule for line break around conditionals🙈 jacopo beschi 🙉2018-01-114-0/+4
|/ /
* | Change failed GCP billing check wordingMatija Čupić2018-01-111-1/+1
| |
* | Use new tab for link in flashMatija Čupić2018-01-111-2/+1
| |
* | Fix link to billingKamil Trzciński2018-01-101-1/+2
| |
* | Fix billing checkingKamil Trzciński2018-01-101-1/+1
| |
* | Extract GCP billing check as methodMatija Čupić2018-01-101-9/+20
| |
* | disables the shortcut to the issue boards when issues are disabledChristiaan Van den Poel2018-01-083-4/+5
| |
* | Refactor GCP session token exchange schemeMatija Čupić2018-01-071-5/+1
| |
* | Merge branch 'master' into ↵Matija Čupić2018-01-061-0/+10
|\ \ | | | | | | | | | 39957-redirect-to-gpc-page-if-users-try-to-create-a-cluster-but-the-account-is-not-enabled
| * \ Merge branch 'master' into 41249-clearing-the-cacheMatija Čupić2018-01-051-0/+17
| |\ \
| * \ \ Merge branch 'master' into 41249-clearing-the-cacheMatija Čupić2018-01-042-7/+9
| |\ \ \ | | | |/ | | |/|
| * | | Add missing empty line in #reset_cacheMatija Čupić2018-01-041-0/+1
| | | |
| * | | Move cache reset to ci_cd_settings controllerMatija Čupić2018-01-041-0/+9
| | | |
* | | | Store OAuth token in Redis for worker to pick upMatija Čupić2018-01-061-1/+6
| | | |
* | | | Merge branch 'master' into ↵Matija Čupić2018-01-051-0/+17
|\ \ \ \ | | |_|/ | |/| | | | | | 39957-redirect-to-gpc-page-if-users-try-to-create-a-cluster-but-the-account-is-not-enabled
| * | | Backport 'Rebase' feature from EE to CEjprovazn-rebaseJan Provaznik2018-01-051-0/+17
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a project uses fast-forward merging strategy user has to rebase MRs to target branch before it can be merged. Now user can do rebase in UI by clicking 'Rebase' button instead of doing rebase locally. This feature was already present in EE, this is only backport of the feature to CE. Couple of changes: * removed rebase license check * renamed migration (changed timestamp) Closes #40301
* | | Merge branch 'master' into ↵Matija Čupić2018-01-052-7/+9
|\ \ \ | |/ / | | | | | | 39957-redirect-to-gpc-page-if-users-try-to-create-a-cluster-but-the-account-is-not-enabled
| * | Merge branch '20035-pause-resume-runners' into 'master'Grzegorz Bizon2017-12-291-4/+4
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Add pause/resume button to project runners Closes #20035 See merge request gitlab-org/gitlab-ce!16032
| | * | Add pause/resume button to specific project runnersMario de la Ossa2017-12-271-4/+4
| | |/
| * | Refactor success status in branch controllerMateusz Bajorski2017-12-271-3/+5
| | |
| * | Fix when branch creation fails don't post system noteMateusz Bajorski2017-12-261-1/+1
| |/ | | | | | | Closes #24347
* | Remove polling interval from GcpControllerMatija Čupić2018-01-051-2/+0
| |
* | Implement GCP billing check in cluster formMatija Čupić2017-12-211-7/+21
| |
* | Remove actions for async GCP project billing checkMatija Čupić2017-12-211-31/+0
| |
* | Merge branch 'master' into ↵Matija Čupić2017-12-2111-11/+49
|\ \ | |/ | | | | 39957-redirect-to-gpc-page-if-users-try-to-create-a-cluster-but-the-account-is-not-enabled
| * Remove a redundant `InvalidPathError` definitionrs-remove-useless-definitionRobert Speicher2017-12-201-5/+0
| | | | | | | | | | This is already defined in `ExtractsPath`, which this controller includes.
| * Merge branch 'zj-gitaly-pipelines-n-1' into 'master'Robert Speicher2017-12-191-0/+2
| |\ | | | | | | | | | | | | Improve performance of Pipelines#index.json See merge request gitlab-org/gitlab-ce!14846
| | * Load commit in batches for pipelines#indexZeger-Jan van de Weg2017-12-191-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Uses `list_commits_by_oid` on the CommitService, to request the needed commits for pipelines. These commits are needed to display the user that created the commit and the commit title. This includes fixes for tests failing that depended on the commit being `nil`. However, now these are batch loaded, this doesn't happen anymore and the commits are an instance of BatchLoader.
| * | Merge branch 'fix-cluster-enviroment-missing' into 'master'Kamil Trzciński2017-12-193-0/+4
| |\ \ | | | | | | | | | | | | | | | | Fix cluster enviroment missing See merge request gitlab-org/gitlab-ce!15973
| | * | Allow environment_scope in cluster controllersMatija Čupić2017-12-163-0/+4
| | | |
| * | | Merge branch 'sh-add-schedule-pipeline-run-now' into 'master'Kamil Trzciński2017-12-181-1/+30
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | Add button to run scheduled pipeline immediately Closes #38741 See merge request gitlab-org/gitlab-ce!15700
| | * | Address review comments with playing pipeline schedulersh-add-schedule-pipeline-run-nowStan Hu2017-12-121-15/+15
| | | |
| | * | Fix Rubocop offense and use a symbol instead of a stringStan Hu2017-12-121-1/+1
| | | |
| | * | Add a spec for rate limiting pipeline schedulesStan Hu2017-12-121-2/+2
| | | |
| | * | Add rate limiting to guard against excessive scheduling of pipelinesStan Hu2017-12-121-0/+11
| | | |
| | * | Fix Sidekiq worker and make flash message return a link to the pipelines pageStan Hu2017-12-121-1/+1
| | | |
| | * | Create a play_pipeline_schedule policy and use itStan Hu2017-12-121-1/+5
| | | |
| | * | Address some comments with running a pipeline scheduleStan Hu2017-12-121-3/+3
| | | |
| | * | Add button to run scheduled pipeline immediatelyStan Hu2017-12-121-1/+15
| | | | | | | | | | | | | | | | Closes #38741