summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Assert performance job is presentqa-assert-performance-job-auto-devopsThong Kuah2019-01-101-0/+1
| | | | | This should help prevent previous regressions like https://gitlab.com/gitlab-org/gitlab-ee/issues/8846
* Merge branch 'gt-update-string-struture-for-group-runners' into 'master'Fatih Acet2019-01-095-8/+10
|\ | | | | | | | | Update string structure for group runners See merge request gitlab-org/gitlab-ce!24187
| * Update string structure for group runnersGeorge Tsiolis2019-01-095-8/+10
|/
* Merge branch 'sh-bump-carrierwave-1.3.1' into 'master'Robert Speicher2019-01-091-1/+1
|\ | | | | | | | | | | | | Bump CarrierWave to 1.3.1 Closes #56096 See merge request gitlab-org/gitlab-ce!24280
| * Bump CarrierWave to 1.3.1Stan Hu2019-01-091-1/+1
| | | | | | | | | | | | This avoids an extra HEAD request when making request for auth URL. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/56096
* | Merge branch '55178-sentry-issues-service' into 'master'Kamil Trzciński2019-01-0922-15/+828
|\ \ | |/ |/| | | | | Service for calling Sentry issues api See merge request gitlab-org/gitlab-ce!24126
| * Service for calling Sentry issues apiReuben Pereira2019-01-0922-15/+828
|/
* Merge branch 'upgrade-babel-deps' into 'master'Tim Zallmann2019-01-093-245/+321
|\ | | | | | | | | Upgrade babel to v7.2 See merge request gitlab-org/gitlab-ce!24259
| * Add support for addl stage-3 pluginsMike Greiling2019-01-093-0/+10
| |
| * Upgrade babel to v7.2Mike Greiling2019-01-092-246/+312
| |
* | Merge branch 'pl-reactive-caching-primary_key' into 'master'Kamil Trzciński2019-01-093-1/+11
|\ \ | | | | | | | | | | | | Enable caching for records which primary key is not `id` See merge request gitlab-org/gitlab-ce!24245
| * | Add changelog entryPeter Leitzen2019-01-091-0/+5
| | |
| * | Implement SshHostKey.primary_key methodPeter Leitzen2019-01-081-0/+5
| | |
| * | Use record's primary key instead of hardcoded `id`Peter Leitzen2019-01-081-1/+1
| | | | | | | | | | | | Enable caching for records which primary key is not `id`.
* | | Merge branch 'profile-project-empty-state' into 'master'Mike Greiling2019-01-097-6/+20
|\ \ \ | | | | | | | | | | | | | | | | First pass at updated profile empty state See merge request gitlab-org/gitlab-ce!23973
| * | | First pass at updated profile empty stateFernando Arias2019-01-097-6/+20
|/ / /
* | | Merge branch 'aws_sse-c' into 'master'James Lopez2019-01-096-0/+17
|\ \ \ | | | | | | | | | | | | | | | | Add SSE-C key configuration option for Amazon S3 remote backups See merge request gitlab-org/gitlab-ce!23797
| * | | Add SSE-C key configuration option for Amazon S3 remote backupsPepijn Van Eeckhoudt2019-01-096-0/+17
|/ / /
* | | Merge branch '55242-skeleton-loading-releases' into 'master'Kushal Pandya2019-01-092-3/+8
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Adds skeleton loading for releases Closes #55242 See merge request gitlab-org/gitlab-ce!24264
| * | | Adds skeleton loading for releasesFilipa Lacerda2019-01-092-3/+8
| | | | | | | | | | | | | | | | | | | | In releases page, instead of rendering a loading icon, it now renders the skeleton loading
* | | | Merge branch ↵Annabel Dunstone Gray2019-01-092-3/+8
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '55958-inconsistent-spacing-between-note-and-user-avatar-in-discussions' into 'master' Resolve "Inconsistent spacing between note and user avatar in discussions" Closes #55958 See merge request gitlab-org/gitlab-ce!24197
| * | | | Resolve "Inconsistent spacing between note and user avatar in discussions"Sam Bigelow2019-01-092-3/+8
|/ / / /
* | | | Merge branch '56036-fix-translation-of-in-in-job-details-sidebar' into 'master'Filipa Lacerda2019-01-093-4/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Fix translation of "in" in job details sidebar" Closes #56036 See merge request gitlab-org/gitlab-ce!24192
| * | | | Remove translation from "in"Nathan Friend2019-01-073-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We don't currently have the ability to translate sentences that are broken up by Vue components. In lieu of this, we simply don't translate any words that can't be directly translated into all languages. More context on this fix here: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/23816#note_126442986
* | | | | Merge branch 'leipert-fix-broken-master-vue' into 'master'Tim Zallmann2019-01-092-40/+21
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Revert update to '@vue/component-compiler-utils' See merge request gitlab-org/gitlab-ce!24266
| * | | | | Revert update to '@vue/component-compiler-utils'Lukas Eipert2019-01-092-40/+21
|/ / / / / | | | | | | | | | | | | | | | This reverts to 2.2.0, which has node@6 compatibility
* | | | | Merge branch 'tz-upgrade-vue' into 'master'Filipa Lacerda2019-01-093-41/+60
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Upgraded Vue and related libraries See merge request gitlab-org/gitlab-ce!24159
| * | | | | Upgraded various Vue packagesTim Zallmann2019-01-093-41/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This upgrades the following packages: - Vue - Vue Loader - Vue Resource - Vue Router - Vue template compiler - Vue Jest
* | | | | | Merge branch 'qa-remote-grid' into 'master'Sanad Liaquat2019-01-093-26/+133
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow QA to run in remote grid environments Closes #55051 See merge request gitlab-org/gitlab-ce!23708
| * | | | | Add specs to remote grid. Raise errors for #remote_grid_credentialsddavison2019-01-092-1/+66
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: ddavison <ddavison@gitlab.com>
| * | | | | Dont pass extraneous chrome variables to other browsersddavison2019-01-092-10/+20
| | | | | | | | | | | | | | | | | | | | | | | | Extract remote_grid_credentials
| * | | | | Convert passed browser to symddavison2019-01-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: ddavison <ddavison@gitlab.com>
| * | | | | Allow QA to run in remote grid environmentsddavison2019-01-092-17/+49
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: ddavison <ddavison@gitlab.com>
* | | | | | Merge branch 'docs/fix-styleguide' into 'master'Achilleas Pipinellis2019-01-091-32/+30
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix broken markdown and other lint problems See merge request gitlab-org/gitlab-ce!24208
| * | | | | | Fix broken markdown and other lint problemsEvan Read2019-01-091-32/+30
| | | | | | |
* | | | | | | Merge branch 'notes-awards-double-tooltip-fix' into 'master'Filipa Lacerda2019-01-092-4/+11
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes doubles tooltips on note awards Closes #55483 See merge request gitlab-org/gitlab-ce!24261
| * | | | | | | Fixes doubles tooltips on note awardsPhil Hughes2019-01-092-4/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reverts the note awards tooltips to use our own tooltip directive. Using the Bootstrap Vue tooltip inteferes with the Bootstrap JS tooltips which gets init'd in another JS file. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/55483
* | | | | | | | Merge branch '56040-coverage-is-always-100' into 'master'Lin Jen-Shin2019-01-091-2/+4
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Coverage is always 100%" Closes #56040 See merge request gitlab-org/gitlab-ce!24231
| * | | | | | | | Fix coverage artifact dir to not include '/'Rémy Coutable2019-01-081-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | Merge branch 'always-run-cloud-image-trigger' into 'master'Rémy Coutable2019-01-091-0/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Run the cloud-image trigger job for tags, even if the tests fail See merge request gitlab-org/gitlab-ce!24254
| * | | | | | | | | Run the cloud-image trigger job for tags, even if the tests failDJ Mountney2019-01-081-0/+1
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'monospace-registry-tags' into 'master'Filipa Lacerda2019-01-092-2/+9
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use monospace font for registry table tag id and tag name Closes #40956 See merge request gitlab-org/gitlab-ce!24205
| * | | | | | | | | Use monospace font for registry table tag id and tag nameClement Ho2019-01-092-2/+9
|/ / / / / / / / /
* | | | | | | | | Merge branch 'fix-qa-auto-devops-secrets' into 'master'Kamil Trzciński2019-01-091-0/+11
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix QA spec flaky for application secret variables Closes gitlab-qa#362 See merge request gitlab-org/gitlab-ce!24210
| * | | | | | | | Fix QA spec flaky for application secret variablesThong Kuah2019-01-091-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The QA spec for application secrets fails when run after the auto devops spec because no pipeline for it is triggered :( When the QA spec for application has passed, it has always been the first spec to run hence it is able to set the K8S_SECRET_ variable before the pipeline triggered by the initial commit has run. The correct fix would be manually trigger a pipeline after we have added the K8S_SECRET_* variable. However, because Helm does not update the Deployment, we need to push a code change to make Helm update the Deployment and the pods.
* | | | | | | | | Merge branch 'tz-improve-mainjs' into 'master'Phil Hughes2019-01-092-43/+55
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve JS Initialisation that we do on each page See merge request gitlab-org/gitlab-ce!24190
| * | | | | | | | | Moved not so important initialisation functions into idleCallBack CallsTim Zallmann2019-01-082-43/+55
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'remove-gap-between-mr-tabs-and-file-header' into 'master'Phil Hughes2019-01-092-1/+6
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove extra space between MR tab bar and sticky file headers See merge request gitlab-org/gitlab-ce!24238
| * | | | | | | | | Remove extra space between MR tab bar and sticky file headersAnnabel Dunstone Gray2019-01-082-1/+6
| | | | | | | | | |
* | | | | | | | | | Merge branch 'refactor-artifact-api-endpoint' into 'master'Grzegorz Bizon2019-01-095-83/+122
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor artifact api endpoint Closes #55445 See merge request gitlab-org/gitlab-ce!23582