summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Specify time window for additional metrics apisupport-time-windows-apisyasonik2019-04-038-14/+143
| | | | | | | | | Adds support for start and end parameters in the #additional_metrics endpoint of the EnvironmentsController. start and end are meant to be unix timestamps, per the Prometheus API (as the consumer of this endpoint will eventually be transitioned to a prometheus endpoint). This functionality is behind the :metrics_time_window feature flag for development.
* Merge branch '47234-composable-auto-devops' into 'master'Dmitriy Zaporozhets2019-04-0314-915/+793
|\ | | | | | | | | | | | | Resolve "Composable Auto DevOps" Closes #47234 See merge request gitlab-org/gitlab-ce!26520
| * Add required variables to Jobs/Build.gitlab-ci.yml47234-composable-auto-devopsTiger2019-04-022-11/+20
| |
| * Add docs for including individual Auto-DevOps jobsTiger2019-04-022-0/+20
| |
| * Split Security Auto DevOps jobs into templatesTiger2019-04-027-253/+86
| | | | | | | | | | | | | | | | | | | | Container Scanning, Dependency Scanning, License Management and SAST parts of Auto DevOps now use the preexisting templates. Auto DevOps and the DAST job template will now use a shared job template instead of maintaining two copies of the job. This also allows Auto DevOps to use custom authentication with DAST.
| * Split non-security Auto-DevOps jobs into templatesTiger2019-04-026-662/+678
| | | | | | | | | | | | | | | | | | This allows these templates to be used outside of Auto DevOps, or easily excluded from Auto DevOps. The security jobs in Auto DevOps differ slightly from the ones that are already available as templates, they will be moved next.
* | Merge branch ↵Evan Read2019-04-031-6/+23
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | '59498-add-troubleshooting-section-to-capture-errors-with-installing-applications-to-a-kubernetes-cluster' into 'master' Resolve "Add troubleshooting section to capture errors with installing applications to a Kubernetes cluster" Closes #59498 See merge request gitlab-org/gitlab-ce!26639
| * | Resolve "Add troubleshooting section to capture errors with installing ↵Alexander Strachan2019-04-031-6/+23
|/ / | | | | | | applications to a Kubernetes cluster"
* | Merge branch '54621_missing_example' into 'master'Grzegorz Bizon2019-04-031-0/+4
|\ \ | | | | | | | | | | | | Add missing 'export' example for CI_API_V4_API_URL See merge request gitlab-org/gitlab-ce!26878
| * | Add missing 'export' example for CI_API_V4_API_URLOlliver Schinagl2019-04-021-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | In issue #54621 a new variable CI_API_V4_API_URL was introduced, but some of the documentation was omitted. Having an example output is always nice. Signed-off-by: Olliver Schinagl <oliver@schinagl.nl>
* | | Merge branch ↵Sean McGivern2019-04-034-4/+63
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '53459-quick-action-adds-multiple-labels-to-issue-if-middle-words-overlap-with-existing-label' into 'master' Resolve "Quick Action Adds Multiple Labels to Issue If Middle Words Overlap with Existing Label" Closes #53459 See merge request gitlab-org/gitlab-ce!26602
| * | | Fix quick actions add label name middle word overlaps53459-quick-action-adds-multiple-labels-to-issue-if-middle-words-overlap-with-existing-labelJacopo2019-04-024-4/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes quick actions add label when adding a label which name middle word overlaps with another label name: for example adding "A B C" when also label "B" exists. With the fix only the label "A B C" is correctly added, previously also the label "B" was added due to the middle word overlaps.
* | | | Merge branch 'ekigbo-extend-timezone-dropdown' into 'master'Filipa Lacerda2019-04-034-26/+205
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Extend timezone dropdown See merge request gitlab-org/gitlab-ce!26311
| * | | | Extend timezone dropdownEzekiel Kigbo2019-04-034-26/+205
|/ / / / | | | | | | | | | | | | | | | | Adds optional paramters to the constructor to allow reuse of the timezone dropdown on other pages
* | | | Merge branch 'fix-broken-master-release-permission-ce' into 'master'Rémy Coutable2019-04-031-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Backport: Fix Release permission spec See merge request gitlab-org/gitlab-ce!26897
| * | | | Fix Release permission specShinya Maeda2019-04-031-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We recently changed the permission model to disallow guests to read Releases. The spec should be updated as well according to the expectation.
* | | | | Merge branch 'fixed-duplicated-large-text-on-diffs' into 'master'Filipa Lacerda2019-04-034-12/+8
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes duplicate diff too large error messages Closes #59802 See merge request gitlab-org/gitlab-ce!26857
| * | | | | Fixes duplicate diff too large error messagesPhil Hughes2019-04-024-12/+8
| | | | | | | | | | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/59802
* | | | | | Merge branch 'leipert-resolve-fe-dependency-conflict-ce' into 'master'Filipa Lacerda2019-04-032-2/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve CE/EE difference in FE dependency files See merge request gitlab-org/gitlab-ce!26856
| * | | | | | Resolve CE/EE difference in FE dependency filesleipert-resolve-fe-dependency-conflict-ceLukas Eipert2019-04-022-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This resolved the one conflict we have in CE/EE.
* | | | | | | Merge branch 'gl-set-up-gitlab-ui-danger-reviewer' into 'master'Tim Zallmann2019-04-033-1/+59
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set specific reviewers for the GitLab UI WG effort See merge request gitlab-org/gitlab-ce!26760
| * | | | | | | Set specific reviewers for the GitLab UI WG effortgl-set-up-gitlab-ui-danger-reviewerFilipa Lacerda2019-03-293-1/+59
| | | | | | | |
* | | | | | | | Merge branch '47771-highlighting-in-diff' into 'master'Tim Zallmann2019-04-032-0/+13
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enabled text selection in diffs in Web IDE Closes #47771 See merge request gitlab-org/gitlab-ce!26721
| * | | | | | | | Enabled text selection in diffs in Web IDE47771-highlighting-in-diffDenys Mishunov2019-03-282-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolves https://gitlab.com/gitlab-org/gitlab-ce/issues/47771 Changelog entry
* | | | | | | | | Merge branch 'patch-49' into 'master'Phil Hughes2019-04-031-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix comment typo in noteable_note.vue See merge request gitlab-org/gitlab-ce!26855
| * | | | | | | | | Fix comment typoSergiu Marton2019-04-021-1/+1
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'patch-49' into 'master'Evan Read2019-04-031-1/+1
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | remove html tag See merge request gitlab-org/gitlab-ce!26885
| * | | | | | | | remove html tagWilliam Chia2019-04-021-1/+1
| | | | | | | | |
* | | | | | | | | Merge branch 'docs/ci-refs-at-symbol' into 'master'Evan Read2019-04-031-0/+5
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document matching refs with an at-symbol See merge request gitlab-org/gitlab-ce!26755
| * | | | | | | | | Document matching refs with an at-symbolCody Mize2019-04-031-0/+5
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | At-symbols are used to match a ref to a specific repository path. Currently this is done by string splitting the ref pattern on the at-symbol. In order to pattern match a literal `@` you must use ruby's unicode character matching `\u{0040}`.
* | | | | | | | | Merge branch 'fix-format-typo-two-factor-auth' into 'master'Evan Read2019-04-031-0/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix format typo on generate-new-recovery-codes-using-ssh See merge request gitlab-org/gitlab-ce!26819
| * | | | | | | | | Fix format typo on generate-new-recovery-codes-using-sshAgustin Henze2019-04-021-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The rendering is broken and it's confusing when you are reading the doc about generate the recovery codes using ssh. Signed-off-by: Agustin Henze <tin@redhat.com>
* | | | | | | | | | Merge branch 'doc/fix-typo-on-tests-style-guide' into 'master'Sanad Liaquat2019-04-031-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix typo on tests style guide See merge request gitlab-org/gitlab-ce!26859
| * | | | | | | | | | Fix typo on tests style guidedoc/fix-typo-on-tests-style-guideWalmyr Lima2019-04-021-1/+1
| | | | | | | | | | |
* | | | | | | | | | | Merge branch '59131-set-the-size-of-instance-system-message-text-12px' into ↵Mike Greiling2019-04-023-1/+6
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "Set the size of instance system message text 12px" Closes #59131 See merge request gitlab-org/gitlab-ce!26293
| * | | | | | | | | | | Remove duplicate declaration of $system-header-height59131-set-the-size-of-instance-system-message-text-12pxDennis Tang2019-04-021-1/+0
| | | | | | | | | | | |
| * | | | | | | | | | | Update system message banner font size to 12pxDennis Tang2019-04-022-0/+6
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'renovate/gitlab-svgs-1.x' into 'master'Clement Ho2019-04-022-5/+5
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update dependency @gitlab/svgs to ^1.58.0 See merge request gitlab-org/gitlab-ce!26881
| * | | | | | | | | | Update dependency @gitlab/svgs to ^1.58.0Lukas 'Eipi' Eipert2019-04-022-5/+5
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'qa-increase-depth-of-review-deploy-job' into 'master'Douglas Barbosa Alexandre2019-04-021-2/+0
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the default fetch/clone depth for the review-deploy job See merge request gitlab-org/gitlab-ce!26868
| * | | | | | | | | | | Use the default fetch/clone depth for the review-deploy jobqa-increase-depth-of-review-deploy-jobRémy Coutable2019-04-021-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | | | Merge branch '55980-remove-add-issue-on-blank-list' into 'master'Clement Ho2019-04-024-2/+24
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove non-functional add issue button on welcome list Closes #55980 See merge request gitlab-org/gitlab-ce!26742
| * | | | | | | | | | | | Remove non-functional add issue button on welcome listDonald Cook2019-04-024-2/+24
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'revert-a3fd1a13' into 'master'Robert Speicher2019-04-024-84/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Monitor GraphQL with Prometheus" See merge request gitlab-org/gitlab-ce!26864
| * | | | | | | | | | | Revert "Merge branch 'jprovazn-graphql-prometheus' into 'master'"Jan Provaznik2019-04-024-84/+0
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts merge request !26569
* | | | | | | | | | | Merge branch 'docs-revamp-ci-variables' into 'master'Marcia Ramos2019-04-026-236/+376
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: revamp/reorg CI variables Closes #58626 See merge request gitlab-org/gitlab-ce!26336
| * | | | | | | | | | Add screenshots for variablesMarcia Ramos2019-04-026-236/+376
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Variables overview - Variables triggered via manual pipeline
* | | | | | | | | | Merge branch 'if-53411-remove_ignore_column' into 'master'Kamil Trzciński2019-04-021-2/+0
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove ignore column for PersonalAccessToken#token Closes #53411 See merge request gitlab-org/gitlab-ce!25213
| * | | | | | | | | | Remove ignore column for PersonalAccessToken#tokenImre Farkas2019-04-021-2/+0
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'ce-8317-operations-dashboard-usage-ping' into 'master'Douglas Barbosa Alexandre2019-04-021-0/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add dashboard scope for operations dashboard usage ping See merge request gitlab-org/gitlab-ce!26727