summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update dependency @gitlab/eslint-plugin-i18n to ^1.1.0renovate/gitlab-eslint-plugin-i18n-1.xLukas 'Eipi' Eipert2019-06-132-2/+2
|
* Merge branch '59733-autofix-i18n-offences-in-js-files-using-eslint' into ↵Mike Greiling2019-06-1314-7/+46
|\ | | | | | | | | | | | | | | | | 'master' "Add ESLint i18n plugin" Closes #62359 See merge request gitlab-org/gitlab-ce!26789
| * Disable unnecessary ESLint i18n offencesBrandon Labuschagne2019-06-1314-7/+46
|/ | | | | | | | Unnecessary offences include false positives as well as flagged errors which have follow up issues in order to be addressed. Not all issues have been addressed before this being submitted in the spirit of results and iteration.
* Merge branch '60497-unquarantine-user-edits-files-spec' into 'master'63210-add-explicit-symptom-and-solution-when-geo-database-has-an-outdated-fdw-remote-schemaStan Hu2019-06-131-1/+1
|\ | | | | | | | | | | | | Remove spec/features/projects/files/user_edits_files_spec.rb from quarantine Closes #60497 See merge request gitlab-org/gitlab-ce!29620
| * Unquarantine spec in user_edits_files_spec.rbHeinrich Lee Yu2019-06-141-1/+1
| |
* | Merge branch 'improve-dashboard-caching' into 'master'Douglas Barbosa Alexandre2019-06-135-26/+54
|\ \ | |/ |/| | | | | Refactor for cleaner caching in dashboards See merge request gitlab-org/gitlab-ce!29444
| * Refactor for cleaner caching in dashboardsSarah Yasonik2019-06-135-26/+54
|/ | | | | | | | Opts to cache a full list of cached dashboards to better manage removing items from the cache. This also allows dashboards to be stored in the cache that don't necessarily correspond to a single dashboard yml.
* Merge branch 'pprokic-master-patch-44643' into 'master'Trevor Knudsen2019-06-134-5/+4
|\ | | | | | | | | Update application-security index.md's (SAST,DAST,LM and DS) See merge request gitlab-org/gitlab-ce!29547
| * Update application-security index.md's (SAST,DAST,LM and DS)pprokic-master-patch-44643Petar Prokic2019-06-124-5/+4
| |
* | Merge branch '62690-raise-error-when-creating-mr-diff-fails' into 'master'Douglas Barbosa Alexandre2019-06-131-1/+1
|\ \ | | | | | | | | | | | | Raise an error if creating the MergeRequestDiff fails See merge request gitlab-org/gitlab-ce!29434
| * | Raise an error if creating the MergeRequestDiff failsNick Thomas2019-06-131-1/+1
| | |
* | | Merge branch 'blob-row-click-to-open' into 'master'Filipa Lacerda2019-06-133-1/+34
|\ \ \ | | | | | | | | | | | | | | | | Click file row in repository Vue app to view file See merge request gitlab-org/gitlab-ce!29596
| * | | Click file row in repository Vue app to view filePhil Hughes2019-06-133-1/+34
| | | |
* | | | Merge branch 'ci-variables-complex-expression-default-disabled' into 'master'Stan Hu2019-06-134-4/+4
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | disable CI variable complex expressions by default See merge request gitlab-org/gitlab-ce!29576
| * | | Disable CI variable complex expressions by defaultdrew cimino2019-06-134-4/+4
|/ / /
* | | Merge branch 'ce-12091-remove-elasticsearch-lite-project' into 'master'Sean McGivern2019-06-135-12/+1
|\ \ \ | | | | | | | | | | | | | | | | Backport changes from 'Partially revert d9cb907c: "Avoid loading objects from DB in ES results"' See merge request gitlab-org/gitlab-ce!29597
| * | | Restore some unrelated changes from d9cb907cNick Thomas2019-06-133-3/+3
| | | |
| * | | Revert "Avoid loading objects from DB in ES results"Nick Thomas2019-06-138-15/+4
| | | | | | | | | | | | | | | | This reverts commit d9cb907c3e987363065136bafb2156e86bc5de26.
* | | | Merge branch 'patch-issue-#56683' into 'master'57086-metrics-empty-state-shows-on-cluster-metrics-chartsDouwe Maan2019-06-133-7/+9
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Process up to 100 commit messages for references when pushing to a new default branch See merge request gitlab-org/gitlab-ce!29511
| * | | | Modify the branch hooks spec to expect processing of commit messagesFabio Papa2019-06-133-7/+9
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit messages are not processed for references to issues when creating the default branch on push. This was expected behavior (probably to avoid performance problems when first pushing a repository with thousands of commits). However, this is not an issue because we always limit the number of commits to process to 100 regardless of whether we are creating the default branch or not.
* | | | Merge branch 'add-missing-env-vars-to-sast-docker' into 'master'Bob Van Landuyt2019-06-132-3/+18
|\ \ \ \ | |/ / / |/| | | | | | | | | | | Bring propagated SAST ENV vars into parity with docs See merge request gitlab-org/gitlab-ce!29564
| * | | Update merge request to CE IDadd-missing-env-vars-to-sast-dockerAvielle Wolfe2019-06-121-1/+1
| | | |
| * | | Move SAST docker changes to CEAvielle Wolfe2019-06-122-3/+18
| | | |
* | | | Merge branch '12106-sp-ce' into 'master'Phil Hughes2019-06-132-0/+27
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moves sp.js to CE repo Closes gitlab-ee#12106 See merge request gitlab-org/gitlab-ce!29545
| * | | | Moves sp.js to CE repo12106-sp-ceFilipa Lacerda2019-06-122-0/+27
| | |_|/ | |/| | | | | | | | | | Removes ce to ee differences for snowplow file
* | | | Merge branch ↵Kamil Trzciński2019-06-138-33/+100
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | '61157-reviewer-roulette-shouldn-t-include-the-author-as-a-possibility' into 'master' Review roulette excludes mr_author Closes #61157 See merge request gitlab-org/gitlab-ce!28886
| * | | Excludes MR author from Review roulette61157-reviewer-roulette-shouldn-t-include-the-author-as-a-possibilityJacopo2019-06-128-33/+100
| | | | | | | | | | | | | | | | | | | | Excludes MR author from gitlab_ui and single_codebase Review roulette results.
* | | | Merge branch '11989-track-clicks-on-sign_in-with-snowplow' into 'master'Phil Hughes2019-06-131-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Add trackEvent when accessing the Register tab See merge request gitlab-org/gitlab-ce!29336
| * | | | Add trackEvent when accessing the Register tabAsh McKenzie2019-06-131-1/+1
| | | | | | | | | | | | | | | | | | | | This is a no-op for CE.
* | | | | Merge branch 'ntepluhina-master-patch-46554' into 'master'Phil Hughes2019-06-131-0/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Added naming convention for .graphql files See merge request gitlab-org/gitlab-ce!29558
| * | | | | Added naming convention for .graphql filesNatalia Tepluhina2019-06-131-0/+6
|/ / / / /
* | | | | Merge branch 'docs/quote-redirect' into 'master'Achilleas Pipinellis2019-06-131-1/+1
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Add quotes to redirect value Closes #63165 See merge request gitlab-org/gitlab-ce!29584
| * | | | Add quotes to redirect valueEvan Read2019-06-131-1/+1
|/ / / /
* | | | Merge branch 'docs/dependency-proxy-permissions' into 'master'Evan Read2019-06-131-15/+16
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add dependency proxy to permissions.md Closes gitlab-ee#12075 See merge request gitlab-org/gitlab-ce!29497
| * | | | Add dependency proxy to permissions.mddocs/dependency-proxy-permissionsDmitriy Zaporozhets2019-06-111-15/+16
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Merge branch 'docs-its-relative-7' into 'master'Evan Read2019-06-1318-57/+54
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Docs: Convert absolute links to relative in /ci docs See merge request gitlab-org/gitlab-ce!29029
| * | | | | Convert absolute links to relative in /ci docsMarcel Amirault2019-06-1118-57/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix more links after review Update redirect_from link Apply suggestion to doc/ci/introduction/index.md Apply suggestion to doc/ci/README.md Apply suggestion to doc/ci/README.md Make front matter redirect_from links absolute Change front matter to fix discus comments
* | | | | | Merge branch 'docs/make-it-clear-about-after-script-context' into 'master'Evan Read2019-06-132-4/+22
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Leave clear notices in docs about after_script execution context Closes gitlab-runner#4146 See merge request gitlab-org/gitlab-ce!29510
| * | | | | | Leave clear notices about after_script execution contextdocs/make-it-clear-about-after-script-contextTomasz Maczukin2019-06-122-4/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We frequently see new issues mentioning that something defined in `before_script` or `script` doesn't work with `after_script`. Our documentation mentions that first two are concatenated and executed together, why the third one is executed in a separated shell context. But it looks like it's not clear enough. Since this misunderstanding of how scripts are being executed is repeated frequently, let's make it more clear in docs.
* | | | | | | Merge branch 'docs/remove_duplicate_scoped_labels_description' into 'master'Evan Read2019-06-131-4/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed duplicate content on scoped labels See merge request gitlab-org/gitlab-ce!29579
| * | | | | | | Removed duplicate content on scoped labelsRussell Dickenson2019-06-131-4/+0
|/ / / / / / /
* | | | | | | Merge branch 'docs-debug-review-apps-infrastructure-issues' into 'master'Mark Lapierre2019-06-121-2/+74
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document how to troubleshoot a pending external-dns deployment See merge request gitlab-org/gitlab-ce!29290
| * | | | | | | Document how to troubleshoot a pending external-dns deploymentRémy Coutable2019-06-121-2/+74
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also update the Review Apps node pools description Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | Merge branch 'docs/suggest-views-methods-to-be-added-alphabetically' into ↵Mark Lapierre2019-06-121-20/+22
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Update quick start guide doc to suggest views and methods to be defined in alphabetical order Closes #62505 See merge request gitlab-org/gitlab-ce!29499
| * | | | | | | Update guide with alphabetical order styleWalmyr2019-06-121-20/+22
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/62505
* | | | | | | Merge branch 'qa-nightly-107-fix-comment-on-issue-ce' into 'master'Mark Lapierre2019-06-123-5/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CE port of "Comment will select all activites filter by default" See merge request gitlab-org/gitlab-ce!29496
| * | | | | | | Comment will select all activites filter by defaultqa-nightly-107-fix-comment-on-issue-ceSanad Liaquat2019-06-113-5/+4
| | | | | | | |
* | | | | | | | Merge branch 'docs/add-selected-youtube-videos' into 'master'Marcia Ramos2019-06-122-0/+4
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add links to select YouTube videos demonstrating GitLab features to docs See merge request gitlab-org/gitlab-ce!29562
| * | | | | | | | Add links to select YouTube videos demonstrating GitLab features to docsMike Lewis2019-06-122-0/+4
|/ / / / / / / /
* | | | | | | | Merge branch 'remove-grafana-dashboard-link-feature-flag' into 'master'Mike Greiling2019-06-125-58/+21
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the grafana_dashboard_link feature flag See merge request gitlab-org/gitlab-ce!29344