summaryrefslogtreecommitdiff
path: root/app/controllers/projects
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '23705-add-single-file-download-in-repo' into 'master'Douwe Maan2018-07-201-2/+1
|\
| * Refactor code for single file download in repositoryKia Mei Somabes2018-07-131-1/+1
| * Set content-disposition header for single file download in repositoryKia Mei Somabes2018-07-121-2/+1
* | Merge remote-tracking branch 'upstream/master' into 14995-custom_wiki_sidebarLin Jen-Shin2018-07-1333-163/+189
|\ \
| * | Revert "Merge branch 'ee-5481-epic-todos' into 'master'"Jarka Kadlecová2018-07-111-4/+10
| * | Support manually stopping any environment from the UIWinnie Hellmann2018-07-102-2/+6
| * | Use stable gitlab-styles and eliminate offensesLin Jen-Shin2018-07-091-1/+1
| * | Updates from `rubocop -a`Lin Jen-Shin2018-07-0926-31/+31
| |/
| * Backport of EE changes in https://gitlab.com/gitlab-org/gitlab-ee/merge_reque...Mark Chao2018-07-061-1/+1
| * Web Terminal Ci BuildFrancisco Javier López2018-07-051-2/+20
| * Merge branch '45739-add-metrics-to-operations-tab' into 'master'Filipa Lacerda2018-07-041-0/+10
| |\
| | * Makes production environment the default environment for a projectTiago Botelho2018-07-041-1/+1
| | * Remove GET empty from EnvironmentsControllerTiago Botelho2018-06-291-12/+5
| | * Prevents project first environment from being fetched in every project viewTiago Botelho2018-06-284-7/+14
| | * Specify environment actions to distinguish between metrics and every other en...Tiago Botelho2018-06-263-5/+6
| | * Adds empty environments pageTiago Botelho2018-06-262-3/+7
| | * Adds metrics to Operartions tab in projects sidebarTiago Botelho2018-06-261-0/+5
| * | Merge branch '43446-new-cluster-page-tabs' into 'master'Kamil Trzciński (OoO till 3th)2018-07-043-117/+112
| |\ \
| | * \ Merge remote-tracking branch 'origin/master' into 43446-new-cluster-page-tabsDennis Tang2018-06-1911-48/+58
| | |\ \
| | * | | consolidate back into one controllerDennis Tang2018-06-193-90/+109
| | * | | rubocop fixDennis Tang2018-06-061-1/+0
| | * | | redirect back to form if token expiresDennis Tang2018-06-051-9/+13
| | * | | split into gcp and user controllers againDennis Tang2018-06-053-110/+89
| | * | | Merge remote-tracking branch 'origin/master' into 43446-new-cluster-page-tabsDennis Tang2018-06-013-6/+26
| | |\ \ \
| | * \ \ \ Merge remote-tracking branch 'origin/master' into 43446-new-cluster-page-tabsDennis Tang2018-05-311-2/+13
| | |\ \ \ \
| | * | | | | Adjust permitted params filtering on merge schedulingOswaldo Ferreira2018-05-311-2/+2
| | * | | | | Merge remote-tracking branch 'origin/master' into 43446-new-cluster-page-tabsDennis Tang2018-05-315-7/+20
| | |\ \ \ \ \
| | * | | | | | update view name for gke dropdown checkDennis Tang2018-05-261-5/+5
| | * | | | | | fix case where token may expireDennis Tang2018-05-261-2/+6
| | * | | | | | cleanupDennis Tang2018-05-261-4/+3
| | * | | | | | revisionsDennis Tang2018-05-261-33/+20
| | * | | | | | combine "create" and "existing" GKE cluster views into one new pageDennis Tang2018-05-263-117/+108
| * | | | | | | Merge branch 'ee-5481-epic-todos' into 'master'Sean McGivern2018-07-041-10/+4
| |\ \ \ \ \ \ \
| | * | | | | | | More EE->CE fixesJan Provaznik2018-07-031-0/+1
| | * | | | | | | [backend] Addressed review commentsJan Provaznik2018-07-031-10/+3
| * | | | | | | | Merge branch 'remove-is-shared-from-ci-runners' into 'master'Grzegorz Bizon2018-07-041-1/+1
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Remove the use of `is_shared` of `Ci::Runner`remove-is-shared-from-ci-runnersKamil Trzciński2018-06-261-1/+1
| * | | | | | | | | Merge branch 'jprovazn-direct-upload' into 'master'Kamil Trzciński (OoO till 3th)2018-07-041-1/+3
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Add workhorse authorize method for project/group uploadsJan Provaznik2018-06-181-1/+3
| * | | | | | | | | | Merge branch 'bvl-graphql-pipeline-lists' into 'master'Douwe Maan2018-07-041-2/+2
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Add pipeline lists to GraphQLBob Van Landuyt2018-07-041-2/+2
| * | | | | | | | | | | Merge branch '47040-inconsistent-job-list-in-job-details-view' into 'master'Kamil Trzciński (OoO till 3th)2018-07-041-4/+2
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | Use associated build pipelineMatija Čupić2018-06-291-4/+2
| | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | |
| * | | | | | | | | | Merge branch 'master' into 'web-hooks-log-pagination'Douwe Maan2018-07-031-1/+6
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / | | |/| | | | | | | |
| * | | | | | | | | | Fixed pagination of web hook logsYorick Peterse2018-07-031-2/+1
* | | | | | | | | | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into 14995-c...Andreas Kämmerle2018-07-022-2/+7
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge branch '6195-http-git-push-to-secondary-for-git-lfs-currently-does-not-...Nick Thomas2018-07-021-1/+6
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | Move check logic into #batch_operation_disallowed?Ash McKenzie2018-07-021-1/+6
| | |/ / / / / / / /
| * | | | | | | | | Merge branch '39543-milestone-page-list-redesign' into 'master'Fatih Acet2018-07-021-1/+1
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| | * | | | | | | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into 39543-m...Constance Okoghenun2018-06-218-23/+111
| | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | |