summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add changelog entrysimplify-ansi2html-outputFabio Pitino2019-06-251-0/+5
|
* Remove unnecessary span tagsFabio Pitino2019-06-252-20/+13
| | | | | | | With this change we translate a simple line break to <br/> tag and ensure we generate a header line at the beginning of a section followed by a body line if there lines inside the collapsible section.
* 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
|/ / /
* | | Merge branch 'docs-blunceford-before-sha-fix' into 'master'Evan Read2019-06-251-1/+1
|\ \ \ | | | | | | | | | | | | | | | | Updated explanation of CI_COMMIT_BEFORE_SHA variable See merge request gitlab-org/gitlab-ce!29913
| * | | Updated explanation of CI_COMMIT_BEFORE_SHA variableBlair Lunceford2019-06-251-1/+1
|/ / /
* | | Merge branch 'refactor_deployment_cluster' into 'master'Stan Hu2019-06-244-13/+10
|\ \ \ | | | | | | | | | | | | | | | | Refactor Deployment#cluster to #deployment_platform_cluster See merge request gitlab-org/gitlab-ce!29961
| * | | Rename method to not clash with #clusterrefactor_deployment_clusterThong Kuah2019-06-244-8/+9
| | | | | | | | | | | | | | | | | | | | We will introduce #cluster at a later stage. Also deprecate this method
| * | | Move innards of cluster method to environmentThong Kuah2019-06-241-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Environment already has a memoized deployment plaform. No need to check for respond_to?(:cluster) now that all deployment platforms are Clusters::Cluster.
* | | | Merge branch 'fix-50834' into 'master'Nick Thomas2019-06-246-14/+29
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change HTTP Status Code when repository disabled Closes #50834 See merge request gitlab-org/gitlab-ce!29585
| * | | | Change HTTP Status Code when repository disabledSam Battalio2019-06-246-14/+29
|/ / / /
* | | | Update CHANGELOG.md for 12.0.1GitLab Release Tools Bot2019-06-241-0/+4
| | | | | | | | | | | | [ci skip]
* | | | Merge branch 'pages-domains-certificates-auto-renew-mysql' into 'master'Nick Thomas2019-06-2412-0/+193
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Renew pages domain's certificates through Let's Encrypt See merge request gitlab-org/gitlab-ce!29363
| * | | | Renew Let's Encrypt certificatesVladimir Shushlin2019-06-2412-0/+193
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add index for pages domain ssl auto renewal Add PagesDomain.needs_ssl_renewal scope Add cron worker for ssl renewal Add worker for ssl renewal Add pages ssl renewal worker queues settings
* | | | Merge branch '62722-move-derailed-benchmarks-to-global-gem-section' into ↵12-1-auto-deploy-0011285Kamil Trzciński2019-06-241-1/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Move `derailed_benchmarks` gem to :default group See merge request gitlab-org/gitlab-ce!29975
| * | | | Move `derailed_benchmarks` gem to default group62722-move-derailed-benchmarks-to-global-gem-sectionAleksei Lipniagov2019-06-241-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | Some benchmarks of the gem require booting the app in `production` environment.
* | | | | Merge branch 'vue-i18n-js-jobs-directory' into 'master'Tim Zallmann2019-06-243-6/+13
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Vue-i18n: autofix for app/assets/javascripts/jobs directory See merge request gitlab-org/gitlab-ce!29969
| * | | | | Vue-i18n: app/assets/javascripts/jobs directoryvue-i18n-js-jobs-directoryEzekiel Kigbo2019-06-243-6/+13
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | i18n linting for .vue files under the app/assets/javascripts/jobs directory
* | | | | Merge branch 'sh-optimize-todos-controller' into 'master'Douglas Barbosa Alexandre2019-06-246-3/+37
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Eliminate N+1 queries in Dashboard::TodosController Closes #43042 See merge request gitlab-org/gitlab-ce!29954
| * | | | | Rename Todos.with_api_entity_associations to with_entity_associationssh-optimize-todos-controllerStan Hu2019-06-243-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since this scope is used in both the controller and the API, we rename it to make it clear that it's used for both.
| * | | | | Eliminate N+1 queries in Dashboard::TodosControllerStan Hu2019-06-244-1/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This appears to bring down the number of SQL queries on GitLab.com for my Todos page from 672 to 100. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/43042
* | | | | | Merge branch '63656-runner-tags-search-dropdown-is-empty' into 'master'Jan Provaznik2019-06-243-6/+10
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Runner tags search dropdown is empty" Closes #63656 See merge request gitlab-org/gitlab-ce!29985
| * | | | | | Return all runner tags when search is empty63656-runner-tags-search-dropdown-is-emptyDmitriy Zaporozhets2019-06-243-6/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | Merge branch 'revert-868da1d6' into 'master'Stan Hu2019-06-244-13/+11
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Fix copying a single line from Firefox" See merge request gitlab-org/gitlab-ce!29993
| * | | | | | | Revert "Merge branch..."Kamil Trzciński2019-06-244-13/+11
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | This reverts merge request !29832
* | | | | | | Merge branch '62356-service-response-docs' into 'master'Achilleas Pipinellis2019-06-241-0/+36
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add doc for ServiceResponse Closes #62356 See merge request gitlab-org/gitlab-ce!29992
| * | | | | | Add doc for ServiceResponseLin Jen-Shin2019-06-241-0/+36
|/ / / / / /
* | | | | | Merge branch 'ab-codereview-db' into 'master'Achilleas Pipinellis2019-06-241-0/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Require database reviews for migrations See merge request gitlab-org/gitlab-ce!29895
| * | | | | | Require database reviews for migrationsAndreas Brandl2019-06-241-0/+3
|/ / / / / /
* | | | | | Merge branch 'leipert-upgrade-jquery' into 'master'Mike Greiling2019-06-242-5/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade jquery to 3.4.1 See merge request gitlab-org/gitlab-ce!29980
| * | | | | | Upgrade jquery to 3.4.1leipert-upgrade-jqueryLukas Eipert2019-06-242-5/+5
| | | | | | |
* | | | | | | Merge branch 'jivanvl-add-column-chart-monitoring-dashboard' into 'master'Mike Greiling2019-06-242-0/+189
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add column chart component to the monitoring bundle See merge request gitlab-org/gitlab-ce!29293
| * | | | | | | Add column chart component to the monitoring bundlejivanvl-add-column-chart-monitoring-dashboardJose Vargas2019-06-212-0/+189
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This merge request just adds the column chart component without integrating it to the dashboard
* | | | | | | | Merge branch '63559-remove-avatar-from-sign-in' into 'master'62356-document-and-promote-serviceresponseAnnabel Dunstone Gray2019-06-242-1/+6
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Avatar in "Please sign in" pattern too large" Closes #63559 See merge request gitlab-org/gitlab-ce!29944
| * | | | | | | | Resolve "Avatar in "Please sign in" pattern too large"Marcel van Remmerden2019-06-242-1/+6
|/ / / / / / / /
* | | | | | | | Merge branch 'divergence-graph-fe-rendering' into 'master'Filipa Lacerda2019-06-2410-54/+366
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Render branch divergence graph with Vue See merge request gitlab-org/gitlab-ce!29743
| * | | | | | | | Render branch divergance graph with VuePhil Hughes2019-06-2410-54/+366
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'ce-mw-onboarding-mvc-tour' into 'master'Phil Hughes2019-06-249-22/+16
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (CE Port) New user onboarding (Guided Tour) See merge request gitlab-org/gitlab-ce!29927
| * | | | | | | | Add identifiers for onboarding popoversMartin Wortschack2019-06-249-22/+16
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add button styles for onboarding welcome page - Fix qa selector (due to additional class)
* | | | | | | | Merge branch 'sh-remove-token-from-profiling-docs' into 'master'Kamil Trzciński2019-06-241-4/+0
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove requirement for personal access token in profiling See merge request gitlab-org/gitlab-ce!29972