summaryrefslogtreecommitdiff
path: root/config
Commit message (Expand)AuthorAgeFilesLines
* Add manifest import featureDmitriy Zaporozhets2018-07-111-0/+6
* Rails5 MySQL fix rename_column as part of cleanup_concurrent_column_type_changeJasper Maes2018-07-091-0/+5
* Updates from `rubocop -a`Lin Jen-Shin2018-07-093-5/+5
* Merge branch 'rjh/additional-options-for-s3-compatible-hosts' into 'master'Rémy Coutable2018-07-091-0/+5
|\
| * Update gitlab.yml.exampleRichard Hancock2018-06-071-0/+1
| * Correcting spelling mistake.Richard Hancock2018-05-041-1/+1
| * Added options related to signed url creation to work with servcies that do no...Richard J Hancock2018-05-031-0/+4
* | Move spec/mailers/previews to app/mailers/previewsLin Jen-Shin2018-07-061-1/+1
* | Merge branch '48677-also-check-auto_sign_in_with_provider' into 'master'Douwe Maan2018-07-062-2/+2
|\ \
| * | If `omniauth_auto_sign_in_with_provider` is set,Lin Jen-Shin2018-07-022-2/+2
* | | Web Terminal Ci BuildFrancisco Javier López2018-07-051-0/+2
* | | Merge branch '45739-add-metrics-to-operations-tab' into 'master'Filipa Lacerda2018-07-041-0/+1
|\ \ \
| * | | Remove GET empty from EnvironmentsControllerTiago Botelho2018-06-291-1/+0
| * | | Prevents project first environment from being fetched in every project viewTiago Botelho2018-06-281-0/+1
| * | | Adds empty environments pageTiago Botelho2018-06-261-0/+1
* | | | Merge branch '43446-new-cluster-page-tabs' into 'master'Kamil Trzciński (OoO till 3th)2018-07-041-8/+2
|\ \ \ \
| * \ \ \ Merge remote-tracking branch 'origin/master' into 43446-new-cluster-page-tabsDennis Tang2018-06-213-0/+9
| |\ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'origin/master' into 43446-new-cluster-page-tabsDennis Tang2018-06-1924-108/+187
| |\ \ \ \ \
| * | | | | | consolidate back into one controllerDennis Tang2018-06-191-4/+2
| * | | | | | split into gcp and user controllers againDennis Tang2018-06-051-1/+8
| * | | | | | Merge remote-tracking branch 'origin/master' into 43446-new-cluster-page-tabsDennis Tang2018-06-041-8/+15
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge remote-tracking branch 'origin/master' into 43446-new-cluster-page-tabsDennis Tang2018-06-018-15/+96
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/master' into 43446-new-cluster-page-tabsDennis Tang2018-05-314-2/+5
| |\ \ \ \ \ \ \ \
| * | | | | | | | | better handle a missing gitlab-shell versionBrett Walker2018-05-311-2/+2
| * | | | | | | | | Merge remote-tracking branch 'origin/master' into 43446-new-cluster-page-tabsDennis Tang2018-05-313-51/+2
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | use implied route for clusters#createDennis Tang2018-05-261-5/+1
| * | | | | | | | | | revisionsDennis Tang2018-05-261-1/+1
| * | | | | | | | | | combine "create" and "existing" GKE cluster views into one new pageDennis Tang2018-05-261-8/+1
* | | | | | | | | | | Merge branch 'jprovazn-direct-upload' into 'master'Kamil Trzciński (OoO till 3th)2018-07-042-0/+2
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Add workhorse authorize method for project/group uploadsJan Provaznik2018-06-182-0/+2
* | | | | | | | | | | | Merge branch 'bump-carrierwave-to-1-2-3' into 'master'Kamil Trzciński (OoO till 3th)2018-07-041-69/+0
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Delete monkey patchShinya Maeda2018-07-041-69/+0
* | | | | | | | | | | | | Add pipeline lists to GraphQLBob Van Landuyt2018-07-041-1/+2
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'prune-web-hook-logs' into 'master'Douwe Maan2018-07-031-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Prune web hook logs older than 90 daysYorick Peterse2018-07-021-0/+4
| | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | |
* | | | | | | | | | | | Remove CarrierWave initializerStan Hu2018-06-292-53/+0
|/ / / / / / / / / / /
* | | | | | | | | | | Enabling Doorkeeper reuse_access_token optionFrancisco Javier López2018-06-291-1/+1
* | | | | | | | | | | Fix OAuth application authorization screen to appear with every accessFrancisco Javier López2018-06-291-0/+50
* | | | | | | | | | | Merge branch 'feature/oidc-subject-claim' into 'master'Douwe Maan2018-06-281-2/+7
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Don't hash user ID in OIDC subject claimMarkus Koller2018-06-281-2/+7
* | | | | | | | | | | | Fix spelling: Uncommment -> UncommentStan Hu2018-06-271-1/+1
* | | | | | | | | | | | Add RepositoryCheck::DispatchWorker to start worker per shardToon Claes2018-06-271-1/+1
|/ / / / / / / / / / /
* | | | | | | | | | | Migrate storage nesting check to GitalyJacob Vosmaer (GitLab)2018-06-272-28/+1
| |_|_|_|_|_|_|_|/ / |/| | | | | | | | |
* | | | | | | | | | Update _scopes_form.html.haml to remove duplicate informationMarcel Amirault2018-06-261-5/+11
* | | | | | | | | | Merge branch '6591-dont-load-omniauth-if-not-enabled' into 'master'Stan Hu2018-06-251-1/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Don't try to load omniauth if not enabledLin Jen-Shin2018-06-251-1/+3
* | | | | | | | | | | Merge branch 'jprovazn-rails5-mysql-datetime' into 'master'Yorick Peterse2018-06-252-7/+12
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Mysql fixes for Rails 5jprovazn-rails5-mysql-datetimeJan Provaznik2018-06-212-7/+12
* | | | | | | | | | | | Delete non-latest merge request diff files upon diffs reloadosw-delete-non-latest-mr-diff-files-upon-mergeOswaldo Ferreira2018-06-241-0/+1
| |/ / / / / / / / / / |/| | | | | | | | | |
* | | | | | | | | | | Merge branch 'fix-webpack-node-env' into 'master'Clement Ho2018-06-212-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |