summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add changelog entrygitaly-version-v1.34.1GitalyBot2019-04-291-0/+5
|
* Update Gitaly version to v1.34.1GitalyBot2019-04-291-1/+1
|
* Merge branch 'docs/change-text-from-examples' into 'master'Marcia Ramos2019-04-291-7/+7
|\ | | | | | | | | Fix text based on example See merge request gitlab-org/gitlab-ce!27787
| * Fix text based on exampleEvan Read2019-04-291-7/+7
|/
* Merge branch 'wiki-search-results-fix' into 'master'James Lopez2019-04-293-12/+31
|\ | | | | | | | | | | | | Fix links to wiki pages with subdirectories in search Closes #56234 See merge request gitlab-org/gitlab-ce!27400
| * Fix links to wiki pages with subdirectorieskhm2019-04-293-12/+31
|/ | | | | | | This commit contains the patch suggested by @fjsanpedro in the issue covering broken links in wiki search results. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/56234
* Merge branch 'sh-bump-chrome-v73-images' into 'master'Kushal Pandya2019-04-295-3/+10
|\ | | | | | | | | Upgrade CI images to use Chrome V73 See merge request gitlab-org/gitlab-ce!27762
| * Fix search dropdown being hidden immediatelyHeinrich Lee Yu2019-04-281-0/+2
| |
| * Gracefully handle undefined data in getTreeEntries()Stan Hu2019-04-281-0/+5
| |
| * Upgrade CI images to use Chrome V73Stan Hu2019-04-283-3/+3
| | | | | | | | | | Attempt to solve issues such as https://gitlab.com/gitlab-org/gitlab-ce/issues/60953.
* | Merge branch 'bvl-initialize-design-repo-ce' into 'master'Douwe Maan2019-04-2911-73/+206
|\ \ | | | | | | | | | | | | Port changes for design management to CE See merge request gitlab-org/gitlab-ce!27555
| * | Port changes for design management to CEBob Van Landuyt2019-04-2911-73/+206
| | | | | | | | | | | | | | | | | | This ports the changes from https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/10462/ to CE
* | | Merge branch '60821-deployment-jobs-broken-as-of-11-10-0' into 'master'Douwe Maan2019-04-293-1/+16
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Deployment jobs broken as of 11.10.0" Closes #60821 See merge request gitlab-org/gitlab-ce!27687
| * | | Fix deployments for Kubernetes service templatesTiger2019-04-293-1/+16
| | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/27687
* | | | Merge branch 'qa-nightly-98-fix-oauth-spec' into 'master'Sanad Liaquat2019-04-291-3/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix GitHub oAuth test Closes gitlab-org/quality/nightly#98 See merge request gitlab-org/gitlab-ce!27736
| * | | | Fix GitHub OAuth e2e specSanad Liaquat2019-04-261-3/+1
| | | | |
* | | | | Merge branch 'pl-env-metrics-json' into 'master'Douwe Maan2019-04-292-8/+8
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Load environment metrics only for JSON endpoint See merge request gitlab-org/gitlab-ce!27743
| * | | | | Load environment metrics only for JSON endpointPeter Leitzen2019-04-292-8/+8
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When showing the HTML version of the environment metrics we don't need to fetch their metrics because we don't use them anymore on the HTML version. We use additional_metrics.json endpoint now.
* | | | | Merge branch 'docs/guidance-for-unavailable-links' into 'master'Marcia Ramos2019-04-292-6/+12
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid links requiring permissions Closes #59653 See merge request gitlab-org/gitlab-ce!27797
| * | | | | Avoid links requiring permissionsEvan Read2019-04-292-6/+12
|/ / / / /
* | | | | Merge branch '60855-mr-popover-is-not-attached-in-system-notes-jest-fix' ↵Filipa Lacerda2019-04-293-0/+16
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Init MR Popovers on system note mounted Closes #60855 See merge request gitlab-org/gitlab-ce!27747
| * | | | | Init MR Popovers on system note mountedSam Bigelow2019-04-263-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All `renderGFM()` calls are finished before the system note is mounted so this MR inits the popover for each system note, and only the elements in the system note
* | | | | | Merge branch 'sh-fix-profiler-ruby-5.1' into 'master'28996-automatic-https-certificate-creation-renewal-for-pages-custom-domains-228996-automatic-https-certificate-creation-renewal-for-pages-custom-domainsSean McGivern2019-04-292-4/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Profiler to work with Rails 5.1 Closes #61051 See merge request gitlab-org/gitlab-ce!27774
| * | | | | | Fix Profiler to work with Ruby 5.1Stan Hu2019-04-262-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ruby 5.1 now requires keyword arguments to pass along parameters and headers for ActionDispatch::Integration::RequestHelpers. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/61051
* | | | | | | Merge branch 'jc-client-gitaly-session-id' into 'master'Ash McKenzie2019-04-293-1/+54
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add gitaly session id & catfile-cache feature flag See merge request gitlab-org/gitlab-ce!27472
| * | | | | | | Add gitaly session id & catfile-cache feature flagJohn Cai2019-04-293-1/+54
|/ / / / / / /
* | | | | | | Merge branch 'qa-ml-quarantine-failing-test' into 'master'Ash McKenzie2019-04-291-1/+2
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | Quarantine failing test See merge request gitlab-org/gitlab-ce!27799
| * | | | | | Quarantine failing testMark Lapierre2019-04-291-1/+2
|/ / / / / /
* | | | | | Merge branch 'docs-api-email' into 'master'Evan Read2019-04-281-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add email clarification See merge request gitlab-org/gitlab-ce!27645
| * | | | | | Add email clarificationCynthia Ng2019-04-281-1/+1
|/ / / / / /
* | | | | | Merge branch 'docs-autodevops-namespace' into 'master'Evan Read2019-04-281-10/+14
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add clarification on namespace creation See merge request gitlab-org/gitlab-ce!27772
| * | | | | | Add clarification on namespace creationdanielgruesso2019-04-261-10/+14
| |/ / / / /
* | | | | | Merge branch 'master' into 'master'Evan Read2019-04-281-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix include example See merge request gitlab-org/gitlab-ce!27571
| * | | | | | fix include exampleAaron Brülisauer2019-04-231-1/+1
| | | | | | | | | | | | | | | | | | | | | no leading slash at project reference
* | | | | | | Merge branch 'docs-environments-review' into 'master'Evan Read2019-04-285-98/+104
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: Environments Documentation review See merge request gitlab-org/gitlab-ce!27215
| * | | | | | | Docs: Environments Documentation reviewMarcel Amirault2019-04-285-98/+104
|/ / / / / / /
* | | | | | | Merge branch ↵Evan Read2019-04-281-4/+6
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'docs/60785-docs-feedback-masked-variables-is-not-clear-what-unescaped-characters-means' into 'master' Clarify masked variables docs Closes #60785 See merge request gitlab-org/gitlab-ce!27580
| * | | | | | Clarify masked variables docsSteve Azzopardi2019-04-281-4/+6
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add note that must contain only letters, numbers, underscore - Add example of escape characters - Add regex used for validation closes https://gitlab.com/gitlab-org/gitlab-ce/issues/60785
* | | | | | Merge branch ↵Kamil Trzciński2019-04-282-19/+1
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '60945-masked-variable-still-printed-in-log-output-on-gitlab-com' into 'master' Resolve "Masked Variable still printed in log output on gitlab.com" Closes #60945 See merge request gitlab-org/gitlab-ce!27768
| * | | | | Remove variable masking feature flagMatija Čupić2019-04-262-19/+1
| | |/ / / | |/| | |
* | | | | Merge branch '60383-setup-dashboard-endpoint' into 'master'Grzegorz Bizon2019-04-2816-1/+598
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create dashboards endpoint & setup dashboard post-processing Closes #60383 See merge request gitlab-org/gitlab-ce!27405
| * | | | | Move dashboard param to initialize method60383-setup-dashboard-endpointsyasonik2019-04-257-20/+19
| | | | | |
| * | | | | Prefer safe_load and deep_symbolize_keyssyasonik2019-04-254-12/+11
| | | | | |
| * | | | | Move MetricsDashboard to Metrics::Dashboardsyasonik2019-04-2520-304/+312
| | | | | |
| * | | | | Rubocopsyasonik2019-04-241-0/+1
| | | | | |
| * | | | | Fix broken specsyasonik2019-04-241-4/+2
| | | | | |
| * | | | | Defend against dashboard errors, rework sequencesyasonik2019-04-249-10/+102
| | | | | |
| * | | | | Remove extra spacesyasonik2019-04-241-1/+1
| | | | | |
| * | | | | Refactor metrics_dashboard response conditionalssyasonik2019-04-241-11/+5
| | | | | |
| * | | | | Make EE interactions and transformations cleanersyasonik2019-04-248-26/+32
| | | | | |