summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Expand)AuthorAgeFilesLines
* Resolve "Deploy Tokens failed to clone LFS repository"Mayra Cabrera2018-07-231-2/+17
* Fix gitlab import project loadFrancisco Javier López2018-07-231-1/+4
* Merge branch '48932-disable-saml-if-omniauth-is-disabled' into 'master'Douwe Maan2018-07-231-0/+2
|\
| * Disable SAML if OmniAuth is disabled48932-disable-saml-if-omniauth-is-disabledLin Jen-Shin2018-07-201-0/+2
* | 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
* | Limit the TTL for anonymous sessions to 1 hourStan Hu2018-07-181-0/+19
* | Merge remote-tracking branch 'upstream/master' into 14995-custom_wiki_sidebarLin Jen-Shin2018-07-1367-222/+404
|\ \
| * \ Merge branch 'dz-manifest-import' into 'master'Douwe Maan2018-07-122-1/+104
| |\ \
| | * | Improve manifest feature after backend reviewDmitriy Zaporozhets2018-07-112-5/+5
| | * | Refactor manifest import codeDmitriy Zaporozhets2018-07-111-1/+1
| | * | Add feature specs for manifest importDmitriy Zaporozhets2018-07-111-0/+5
| | * | Add ability to disable manifest importDmitriy Zaporozhets2018-07-112-1/+16
| | * | Improve manifest import logicDmitriy Zaporozhets2018-07-111-15/+27
| | * | Fix tests in import_sources_spec.rbDmitriy Zaporozhets2018-07-111-1/+1
| | * | Add manifest import featureDmitriy Zaporozhets2018-07-111-0/+71
| * | | Revert "Merge branch 'ee-5481-epic-todos' into 'master'"Jarka Kadlecová2018-07-113-17/+11
| |/ /
| * | 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-0953-64/+64
| |/
| * 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
View Lorry Controller Status