summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Transforming a stage query to get duration and finish timestamp [skip ci]experimental-cycle-analytics-chart-data-sourceAdam Hegyi2019-06-274-3/+39
|
* Comment out not needed methodsMałgorzata Ksionek2019-06-261-1/+1
|
* Fix rubocop offenceMałgorzata Ksionek2019-06-261-1/+0
|
* Add group stageMałgorzata Ksionek2019-06-266-0/+208
|
* Fix rubocopMałgorzata Ksionek2019-06-251-1/+1
|
* Add specs for group fetchingMałgorzata Ksionek2019-06-253-0/+120
|
* Update specsMałgorzata Ksionek2019-06-251-1/+1
| | | | Remove binding
* Fix rubocop offencesMałgorzata Ksionek2019-06-257-7/+7
|
* Add first group related specsMałgorzata Ksionek2019-06-252-1/+45
|
* Add group level specsMałgorzata Ksionek2019-06-256-8/+84
|
* Modify classes for easier extractionMałgorzata Ksionek2019-06-2514-21/+26
| | | | Go back to project as basic argument
* Extract smaller methods in base class of cycle analyticsMałgorzata Ksionek2019-06-251-12/+22
|
* Fix rubocop offencesMałgorzata Ksionek2019-06-257-7/+7
|
* Update specs to accomodate project level changesMałgorzata Ksionek2019-06-253-5/+4
|
* Modify analytics specsMałgorzata Ksionek2019-06-258-8/+8
|
* Fix specsMałgorzata Ksionek2019-06-2521-24/+28
|
* First batch of changes regarding cycle analytics fior groupsMałgorzata Ksionek2019-06-2521-72/+123
| | | | Changing cycle analytics classes to accept multiple projects at once
* Merge branch 'update-gitlab-runner-helm-chart-to-0-6-0' into 'master'Kamil Trzciński2019-06-252-1/+6
|\ | | | | | | | | Update GitLab Runner Helm Chart to 0.6.0/12.0.0 See merge request gitlab-org/gitlab-ce!29982
| * Update GitLab Runner Helm Chart to 0.6.0update-gitlab-runner-helm-chart-to-0-6-0Tomasz Maczukin2019-06-242-1/+6
| |
* | Merge branch 'mh/colon-autocomplete' into 'master'Kushal Pandya2019-06-254-5/+97
|\ \ | | | | | | | | | | | | | | | | | | Allow autocompleting labels using colons and spaces Closes #63343 and #56510 See merge request gitlab-org/gitlab-ce!29749
| * | Allow autocompleting scoped labelsMartin Hanzel2019-06-254-5/+97
|/ / | | | | | | | | The `:` key will no longer exit out of the autocomplete dialog, allowing auto-completion of labels with colons in them.
* | Merge branch '62722-add-gem-size-data-to-metrics-report' into 'master'Kamil Trzciński2019-06-255-53/+54
|\ \ | | | | | | | | | | | | Add gem size information to metrics.txt in memory CI artifacts See merge request gitlab-org/gitlab-ce!29827
| * | Generate gem size metrics in memory CI62722-add-gem-size-data-to-metrics-reportQingyu Zhao2019-06-215-53/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This includes several changes: - Rename memory-static to generate-gems-size-metrics-static - Rename memory-static-objects to generate-gems-memory-metrics-static - Change generate-gems-size-metrics-static interface. The script now expect `bundle exec derailed bundle:mem` output as its input. The script output to stdout, or stderr for error message. - Change generate-gems-memory-metrics-static interface. The script now expect `bundle exec derailed bundle:objects` output as its input. The script output to stdout, or stderr for error message. - Generate gem size metrics. Script generate-gems-size-metrics-static extract each gem size from `bundle exec derailed bundle:mem` output. Save output to metrics file in format: 'gem_size_mb{name="zip"} 0.5'
* | | Merge branch 'pages-ssl-project-aware-feature-flag' into 'master'Nick Thomas2019-06-259-61/+101
|\ \ \ | | | | | | | | | | | | | | | | Use project depended feature flag for pages ssl and get certificates only for enabled domains See merge request gitlab-org/gitlab-ce!29609
| * | | Use project depended feature flag for pages sslpages-ssl-project-aware-feature-flagVladimir Shushlin2019-06-259-61/+101
| | | | | | | | | | | | | | | | | | | | Also add ::Gitlab::LetsEncrypt.enabled? shortcut and simplify it a lot
* | | | Merge branch 'in-transaction' into 'master'Rémy Coutable2019-06-253-16/+18
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Refactor AfterCommitQueue.inside_transaction? See merge request gitlab-org/gitlab-ce!29903
| * | | | Refactor inside_transaction? to Gitlab::DatabaseAndrew Newdigate2019-06-253-16/+18
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | This is a small change to move AfterCommitQueue.inside_transaction? to Gitlab::Database.inside_transaction? Since this change is required by different changes which may not arrive in sequence, it's easier to extract this change out on it's own.
* | | | Merge branch 'fix-cache-issue-in-secure-job' into 'master'Rémy Coutable2019-06-253-82/+25
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Fix reports jobs timing out because of cache Closes gitlab-ee#12021, #60879, and gitlab-ee#11303 See merge request gitlab-org/gitlab-ce!29780
| * | | Fix reports jobs timing out because of cachePhilippe Lafoucrière2019-06-253-82/+25
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Note: This commit relies on https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/26801 which brings support to multiple extends. While `cache: {}` can disable a cache being set globally, it doesn't work with extends, which will perform a reverse deep merge based on the keys. The cache defined in the base `.default-cache` job won't be disabled in the report jobs. As a side effect, the `code_quality`, `sast`, and `dependency_scanning` jobs are running on a larger code base than expected, leading to timeouts. fixes https://gitlab.com/gitlab-org/gitlab-ee/issues/11303 fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/60879 fixes https://gitlab.com/gitlab-org/gitlab-ee/issues/12021
* | | Merge branch 'docs/add-edit-jit-creation-text' into 'master'Achilleas Pipinellis2019-06-251-2/+5
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Edit resource creation text Closes #63643 See merge request gitlab-org/gitlab-ce!30006
| * | | Edit resource creation textEvan Read2019-06-251-2/+5
|/ / /
* | | Merge branch '30355-use-hours-only-for-time-tracking' into 'master'Phil Hughes2019-06-2531-38/+291
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Limit time tracking units to hours Closes #30355 See merge request gitlab-org/gitlab-ce!29469
| * | | Rename to time_tracking_limit_to_hours30355-use-hours-only-for-time-trackingHeinrich Lee Yu2019-06-2532-57/+259
| | | | | | | | | | | | | | | | Changes migration and all other places the attribute is used
| * | | Limit time tracking values to hoursJon Kolb2019-06-2512-5/+56
| | | | | | | | | | | | | | | | | | | | Adds an instance setting to limit display of time tracking values to hours only
* | | | Merge branch 'vue-i18n-js-issue-show-directory' into 'master'Phil Hughes2019-06-256-16/+41
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Vue-i18n: autofix for app/assets/javascripts/issue_show directory See merge request gitlab-org/gitlab-ce!29968
| * | | | Vue-i18n: app/assets/javascripts/issue_show directoryEzekiel Kigbo2019-06-256-16/+41
|/ / / / | | | | | | | | | | | | | | | | i18n linting for .vue files under the app/assets/javascripts/issue_show directory
* | | | Merge branch 'leipert-upgrade-axios' into 'master'Phil Hughes2019-06-252-20/+20
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Upgrade axios to 0.19.0 See merge request gitlab-org/gitlab-ce!29981
| * | | | Upgrade axios to 0.19.0leipert-upgrade-axiosLukas Eipert2019-06-242-20/+20
| | | | |
* | | | | Merge branch 'vue-i18n-js-monitoring-directory' into 'master'Kushal Pandya2019-06-253-23/+69
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Vue-i18n: autofix for app/assets/javascripts/monitoring directory See merge request gitlab-org/gitlab-ce!29971
| * | | | | Vue-i18n: app/assets/javascripts/monitoring directoryvue-i18n-js-monitoring-directoryEzekiel Kigbo2019-06-243-23/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | i18n linting for .vue files under the app/assets/javascripts/monitoring directory
* | | | | | Merge branch 'docs/exclude-docs-from-job' into 'master'Achilleas Pipinellis2019-06-251-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Exclude docs-only branches from job See merge request gitlab-org/gitlab-ce!30005
| * | | | | | Exclude docs-only branches from jobEvan Read2019-06-251-0/+1
|/ / / / / /
* | | | | | Merge branch 'docs/add-mdl-and-rule-032' into 'master'Achilleas Pipinellis2019-06-2537-193/+220
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Markdown linting and one rule See merge request gitlab-org/gitlab-ce!29970
| * | | | | | Add Markdown lintingEvan Read2019-06-2537-193/+220
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Also adds and one linting rule and makes project conform to it.
* | | | | | Merge branch 'docs/dep-scanning' into 'master'Evan Read2019-06-252-13/+174
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document all the available options for Dependency Scanning Closes gitlab-ee#10121 See merge request gitlab-org/gitlab-ce!29347
| * | | | | | Document all the available options for Dependency Scanningdocs/dep-scanningAchilleas Pipinellis2019-06-242-13/+174
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Port all info from: - security-products/dependency-scanning/blob/master/docs/README.md - security-products/dependency-scanning/blob/master/docs/analyzers.md
* | | | | | | Merge branch 'doc/container-registry' into 'master'Evan Read2019-06-251-0/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mention kaniko in container registry See merge request gitlab-org/gitlab-ce!29916
| * | | | | | | Mention kaniko in container registryFranklin Yu2019-06-251-0/+1
|/ / / / / / /
* | | | | | | Merge branch 'patch-68' into 'master'Evan Read2019-06-251-11/+24
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add brackets escape example to LDAP doc See merge request gitlab-org/gitlab-ce!29285
| * | | | | | | Add brackets escape example to LDAP docBlair Lunceford2019-06-251-11/+24
|/ / / / / / /