summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '46246-gitlab-project-export-should-use-object-storage' into 'ma...Sean McGivern2018-07-061-5/+12
|\
| * Update Import/Export to use object storage (based on aa feature flag)James Lopez2018-07-061-5/+12
* | Use proper markdown rendering for previewsBrett Walker2018-07-061-0/+2
* | Preload ancestors after pagination when filteringBob Van Landuyt2018-07-061-14/+26
* | Merge branch 'ce-5605-epic-autocomplete' into 'master'Sean McGivern2018-07-061-1/+1
|\ \ | |/ |/|
| * Backport of EE changes in https://gitlab.com/gitlab-org/gitlab-ee/merge_reque...Mark Chao2018-07-061-1/+1
* | Fix User role displayed on projects dashboardFrancisco Javier López2018-07-061-2/+3
|/
* Merge branch '31583-osw-gfm-complete-status-indication' into 'master'Sean McGivern2018-07-061-0/+1
|\
| * Present state indication on GFM previewOswaldo Ferreira2018-07-051-0/+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-285-8/+14
| * | Specify environment actions to distinguish between metrics and every other en...Tiago Botelho2018-06-263-5/+6
| * | Adds empty environments pageTiago Botelho2018-06-263-4/+8
| * | Adds metrics to Operartions tab in projects sidebarTiago Botelho2018-06-262-0/+6
* | | Merge branch '19468-add_readme_when_creating_project' into 'master'Douwe Maan2018-07-041-0/+1
|\ \ \
| * | | Add option to add README when creating a projectImre Farkas2018-07-041-0/+1
* | | | 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-213-4/+4
| |\ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'origin/master' into 43446-new-cluster-page-tabsDennis Tang2018-06-1933-104/+270
| |\ \ \ \ \
| * | | | | | 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-015-13/+32
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge remote-tracking branch 'origin/master' into 43446-new-cluster-page-tabsDennis Tang2018-05-313-6/+30
| |\ \ \ \ \ \ \
| * | | | | | | | 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-318-9/+55
| |\ \ \ \ \ \ \ \
| * | | | | | | | | 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-043-11/+17
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | More EE->CE fixesJan Provaznik2018-07-032-1/+1
| * | | | | | | | | | [backend] Addressed review commentsJan Provaznik2018-07-033-11/+17
* | | | | | | | | | | 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-043-2/+16
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Add workhorse authorize method for project/group uploadsJan Provaznik2018-06-183-2/+16
* | | | | | | | | | | | | 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
* | | | | | | | | | | | | | Add Prometheus metrics to track reCAPTCHA success/failuresStan Hu2018-07-031-1/+19
| |/ / / / / / / / / / / / |/| | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'master' into 'web-hooks-log-pagination'Douwe Maan2018-07-031-1/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | 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
| | |/ / / / / / / / / /