summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Use #cluster for prometheus_adapteradd-clusters-to-deploymentThong Kuah2019-06-273-1/+81
* Drop fallback to deployment platformThong Kuah2019-06-272-21/+5
* Use deployment's cluster for kubernetes prereqThong Kuah2019-06-271-1/+3
* Populate cluster_id when creating a deploymentThong Kuah2019-06-273-4/+16
* Add cluster_id to deployments table as an FKThong Kuah2019-06-275-1/+36
* Merge branch '62765-add-jquery-to-jest-setup' into 'master'Mike Greiling2019-06-261-0/+6
|\
| * Add jQuery to jest test_setupPaul Slaughter2019-06-261-0/+6
* | Merge branch 'refactor/remove-sentry-from-app-settings' into 'master'Stan Hu2019-06-2620-194/+64
|\ \
| * | refactor(db): remove Sentry from application settings, disable_ddl_transactionRoger Meier2019-06-251-0/+2
| * | refactor(db): remove Sentry from application settingsRoger Meier2019-06-252-5/+1
| * | refactor: remove Sentry from application settingsRoger Meier2019-06-2519-189/+61
* | | Update CHANGELOG.md for 11.11.4GitLab Release Tools Bot2019-06-261-0/+9
* | | Merge branch '62938-wcag-aa-edited-text-color' into 'master'Phil Hughes2019-06-263-4/+9
|\ \ \
| * | | Use darker gray color for system note metadata and edited text62938-wcag-aa-edited-text-colorAnnabel Dunstone Gray2019-06-253-4/+9
* | | | Merge branch 'vue-tree-logs-tree-request' into 'master'Filipa Lacerda2019-06-2613-9/+293
|\ \ \ \
| * | | | Fetch commit message with log_tree endpointPhil Hughes2019-06-2513-9/+293
* | | | | Merge branch '12426-modal-store-spec' into 'master'Phil Hughes2019-06-261-1/+1
|\ \ \ \ \
| * | | | | Removes EE differences12426-modal-store-specFilipa Lacerda2019-06-261-1/+1
* | | | | | Merge branch '12428-pipelines' into 'master'Phil Hughes2019-06-261-1/+1
|\ \ \ \ \ \
| * | | | | | Removes EE differences12428-pipelinesFilipa Lacerda2019-06-261-1/+1
* | | | | | | Merge branch 'rj-fix-master' into 'master'Jan Provaznik2019-06-261-2/+8
|\ \ \ \ \ \ \
| * | | | | | | Stub manual_sorting flagrj-fix-masterRajat Jain2019-06-261-2/+8
* | | | | | | | Merge branch 'docs-pages-force-https' into 'master'Achilleas Pipinellis2019-06-261-14/+25
|\ \ \ \ \ \ \ \
| * | | | | | | | Docs: document "force https" for PagesMarcia Ramos2019-06-261-14/+25
|/ / / / / / / /
* | | | | | | | Merge branch 'always-display-environment-selector' into 'master'Phil Hughes2019-06-265-48/+123
|\ \ \ \ \ \ \ \
| * | | | | | | | Always display environment selectorReuben Pereira2019-06-265-48/+123
|/ / / / / / / /
* | | | | | | | Merge branch '58802-rename-webide' into 'master'Phil Hughes2019-06-2612-26/+133
|\ \ \ \ \ \ \ \
| * | | | | | | | Re-name entries in one commitDenys Mishunov2019-06-2612-26/+133
|/ / / / / / / /
* | | | | | | | Merge branch '12257-sidebar-mediator' into 'master'Phil Hughes2019-06-261-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Removes EE differences12257-sidebar-mediatorFilipa Lacerda2019-06-261-1/+1
* | | | | | | | | Merge branch 'sh-cache-negative-entries-find-commit' into 'master'Douglas Barbosa Alexandre2019-06-263-18/+40
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Allow caching of negative FindCommit matchessh-cache-negative-entries-find-commitStan Hu2019-06-253-18/+40
* | | | | | | | | | Merge branch '12427-comparision-pane' into 'master'Phil Hughes2019-06-261-3/+0
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Removes EE differences12427-comparision-paneFilipa Lacerda2019-06-261-3/+0
| | |_|_|_|/ / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch '12364-sortable-default-mixin' into 'master'Phil Hughes2019-06-261-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Removes EE differences12364-sortable-default-mixinFilipa Lacerda2019-06-261-1/+1
* | | | | | | | | | | Merge branch 'jprovazn-internal-id-spec' into 'master'Stan Hu2019-06-261-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | |
| * | | | | | | | | | Fix failing spec/models/internal_id_spec.rb specJan Provaznik2019-06-261-1/+1
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'docs-update-img-guidelines' into 'master'Mike Lewis2019-06-261-6/+15
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Docs: require release version in image filenamesMarcia Ramos2019-06-261-6/+15
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'mc/bump/update-codquality-version' into 'master'Grzegorz Bizon2019-06-261-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Bump Code Quality versionmc/bump/update-codquality-versionMatija Čupić2019-06-251-1/+1
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
* | | | | | | | | | Merge branch 'quarantine-flaky-user-signup-spec' into 'master'Kushal Pandya2019-06-261-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Quarantine flaky specThong Kuah2019-06-261-1/+1
| | |_|_|_|/ / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch '63710-fix-redis-namespace-warning' into 'master'Nick Thomas2019-06-261-1/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Use flushdb with the connection object in redis-namespace API63710-fix-redis-namespace-warningGabriel Mazetto2019-06-251-1/+3
* | | | | | | | | | | Merge branch '62214-migrations-and-models' into 'master'Andreas Brandl2019-06-2612-0/+113
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | |
| * | | | | | | | | | Add two new ActiveRecord models62214-migrations-and-modelsMayra Cabrera2019-06-2512-0/+113
* | | | | | | | | | | Merge branch 'pages-ssl-fast-obtain' into 'master'Nick Thomas2019-06-263-3/+21
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Speed up obtaining Let's Encrypt certificatesVladimir Shushlin2019-06-263-3/+21
|/ / / / / / / / / / /