summaryrefslogtreecommitdiff
path: root/config
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'sh-remove-banzai-instrumentation' into 'master'Yorick Peterse2018-07-231-14/+0
|\
| * Remove method instrumentation for Banzai filters and reference parserssh-remove-banzai-instrumentationStan Hu2018-07-221-14/+0
* | Merge branch 'fix-theme-index' into 'master'Douwe Maan2018-07-231-8/+8
|\ \
| * | Fix theme index to match realityBalasankar "Balu" C2018-07-231-8/+8
| |/
* | Merge branch '48932-disable-saml-if-omniauth-is-disabled' into 'master'Douwe Maan2018-07-232-6/+1
|\ \ | |/ |/|
| * Disable SAML if OmniAuth is disabled48932-disable-saml-if-omniauth-is-disabledLin Jen-Shin2018-07-202-6/+1
* | Merge branch '47530-replace-label-light-with-label-bold' into 'master'Clement Ho2018-07-201-1/+1
|\ \
| * | Replace label-light with label-bold. Because it's bold, not lightAnnabel Dunstone Gray2018-07-191-1/+1
| |/
* | Add bootsnap to development/test bundle and enable it if availableGabriel Mazetto2018-07-201-0/+5
|/
* Merge branch '43312-remove_user_activity_workers' into 'master'Rémy Coutable2018-07-192-6/+0
|\
| * Delete UserActivities and related workers43312-remove_user_activity_workersImre Farkas2018-07-182-6/+0
* | Limit the TTL for anonymous sessions to 1 hourStan Hu2018-07-181-0/+1
|/
* Merge branch 'feature/gb/email-delivery-metrics' into 'master'Sean McGivern2018-07-174-8/+12
|\
| * Implement action mailer delivery metrics observerGrzegorz Bizon2018-07-161-2/+7
| * Register all action mailer interceptors in a single placeGrzegorz Bizon2018-07-164-7/+7
| * Move existing email interceptors into the same moduleGrzegorz Bizon2018-07-163-5/+4
* | Merge branch 'update-issue-closing-pattern' into 'master'Rémy Coutable2018-07-161-1/+1
|\ \ | |/ |/|
| * Update issue closing patternGeorge Tsiolis2018-07-111-1/+1
* | 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
View Lorry Controller Status