summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add usage ping for reportsce-usage_ping_for_reportsOlivier Gonzalez2019-06-127-3/+129
| | | | Count number of reports generated (per type)
* Merge branch 'mj/feature-freeze-process' into 'master'Yorick Peterse2019-06-121-18/+9
|\ | | | | | | | | Change the feature freeze details See merge request gitlab-org/gitlab-ce!29548
| * Change the feature freeze detailsMarin Jankovski2019-06-121-18/+9
|/
* Merge branch 'add-merge-train-auto-merge-strategy-ce' into 'master'Kamil Trzciński2019-06-121-2/+2
|\ | | | | | | | | (CE Port) [New Auto Merge Strategy] Merge Train See merge request gitlab-org/gitlab-ce!29485
| * Add auto merge strategiesadd-merge-train-auto-merge-strategy-ceShinya Maeda2019-06-121-2/+2
| | | | | | | | AddToMergeTrainWhenPipelineSucceeds and MergeTrain
* | Merge branch '59651-remove-unnecessary-decimal-places-on-chart-axes' into ↵Phil Hughes2019-06-123-2/+21
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | 'master' Resolve "Remove unnecessary decimal places on chart axes" Closes #59651 See merge request gitlab-org/gitlab-ce!29468
| * | Strip trailing decimal zeros from Metrics axis59651-remove-unnecessary-decimal-places-on-chart-axesSimon Knox2019-06-123-2/+21
| | |
* | | Merge branch '5615-non-admins-only-archieve-ce' into 'master'Stan Hu2019-06-124-0/+27
|\ \ \ | | | | | | | | | | | | | | | | Add EE backport for the admin view See merge request gitlab-org/gitlab-ce!29268
| * | | Add changelog entry5615-non-admins-only-archieve-ceMałgorzata Ksionek2019-06-111-0/+5
| | | |
| * | | Add db migrationMałgorzata Ksionek2019-06-112-0/+21
| | | |
| * | | Add EE backport for the admin viewMałgorzata Ksionek2019-06-111-0/+1
| | | |
* | | | Merge branch 'upgrade-capybara' into 'master'Thong Kuah2019-06-1229-44/+45
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Upgrade to Capybara 3 See merge request gitlab-org/gitlab-ce!27776
| * | | | Upgrade to Capybara 3Heinrich Lee Yu2019-06-1229-44/+45
| | | | | | | | | | | | | | | | | | | | | | | | | Fix whitespace in specs because normalize_ws is slightly different from Capybara 2 behavior
* | | | | Merge branch '62788-clean-up-pagination' into 'master'Phil Hughes2019-06-128-6/+11
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | Moves table pagination component Closes #62788 See merge request gitlab-org/gitlab-ce!29543
| * | | | Moves table pagination componentFilipa Lacerda2019-06-128-6/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move the table paginaiton component under the new pagination folder in vue shared components and updates all the paths
* | | | | Merge branch '11449-docs-for-sast-ds-report-format-ce' into 'master'Achilleas Pipinellis2019-06-122-1/+266
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [CE backport] Document SAST and Dependency Scanning report JSON format See merge request gitlab-org/gitlab-ce!29303
| * | | | | [CE backport] Document SAST and Dependency Scanning report JSON formatVictor Zagorodny2019-06-122-1/+266
|/ / / / /
* | | | | Merge branch 'expose-project-git-depth-via-api' into 'master'Kamil Trzciński2019-06-1212-14/+32
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | Expose default_git_depth via project API Closes #62908 See merge request gitlab-org/gitlab-ce!29353
| * | | | Expose ci_default_git_depth via project APIexpose-project-git-depth-via-apiFabio Pitino2019-06-1212-14/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable Get and Update of ci_default_git_depth for Project API. Renaming Project#default_git_depth to :ci_default_git_depth to give more context through the API usage. Add API documentation
* | | | | Merge branch 'qa-nightly-108-quarantine-auto-devops-spec' into 'master'Rémy Coutable2019-06-121-1/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Quarantine Auto DevOps spec See merge request gitlab-org/gitlab-ce!29542
| * | | | | Quarantine Auto DevOps specSanad Liaquat2019-06-121-1/+2
| | | | | |
* | | | | | Merge branch 'bvl-rename-loader-for-lfs-oids' into 'master'Jan Provaznik2019-06-123-3/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename `BatchCommitLoader` to `BatchLfsOidLoader` See merge request gitlab-org/gitlab-ce!29487
| * | | | | | Rename `BatchCommitLoader` to `BatchLfsOidLoader`Bob Van Landuyt2019-06-113-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since we're not actually loading commits in that loader, but we're loading blobs with LFS oids in batch and returning only the oids.
* | | | | | | Merge branch 'ce-remove-merge-request-pipeline-checkes' into 'master'Lin Jen-Shin2019-06-123-77/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CE backport for gitlab-org/gitlab-ee!12309: Remove merge request pipeline check in mergeable method See merge request gitlab-org/gitlab-ce!29074
| * | | | | | | Remove "target branch advanced" warning from FE code (CE)ce-remove-merge-request-pipeline-checkesNathan Friend2019-06-123-77/+0
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Removes the "target branch advanced" warning from the frontend as it is no longer needed due to the new merge trains feature.
* | | | | | | Merge branch '9186-implement-atmtwps-state-to-mr-widget' into 'master'Filipa Lacerda2019-06-1214-104/+273
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | CE backport for gitlab-org/gitlab-ee!12156: Update the merge request widget's "Merge" button to support merge trains See merge request gitlab-org/gitlab-ce!27594
| * | | | | | Add merge train support to MR merge button (CE)9186-implement-atmtwps-state-to-mr-widgetNathan Friend2019-06-1114-104/+273
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | This commit updates the merge request widget's "Merge" button to support merge trains.
* | | | | | Merge branch ↵Filipa Lacerda2019-06-123-13/+10
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '62300-target-area-for-dropdown-list-items-is-too-small-on-metrics-dashboard' into 'master' Resolve "Target area for dropdown list items is too small on Metrics Dashboard" Closes #62300 See merge request gitlab-org/gitlab-ce!29458
| * | | | | Make time window links take up full dropdown width62300-target-area-for-dropdown-list-items-is-too-small-on-metrics-dashboardSimon Knox2019-06-123-13/+10
| | | | | |
* | | | | | Merge branch 'lint-ci-warning-fix' into 'master'Rémy Coutable2019-06-121-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update Serverless.gitlab-ci-yml to fix lint warning See merge request gitlab-org/gitlab-ce!29396
| * | | | | | Update Serverless.gitlab-ci-yml to fix lint warningMarcel Amirault2019-06-121-1/+1
|/ / / / / /
* | | | | | Merge branch 'docs-update-insights' into 'master'Lin Jen-Shin2019-06-124-14/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Insights is now GA See merge request gitlab-org/gitlab-ce!29494
| * | | | | | Insights is now GAdocs-update-insightsRémy Coutable2019-06-114-14/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | Merge branch 'ce-remove-dead-es-migration' into 'master'Jan Provaznik2019-06-121-2/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove docs for a removed ES rake task See merge request gitlab-org/gitlab-ce!29501
| * | | | | | | Remove docs for a removed ES rake taskNick Thomas2019-06-111-2/+0
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'update-auto-merge-parameters' into 'master'James Lopez2019-06-126-4/+96
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update merge options for auto merge strategies See merge request gitlab-org/gitlab-ce!29334
| * | | | | | | Update merge options for auto merge strategiesShinya Maeda2019-06-126-4/+96
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, merge options is updated on #execute method, however, we should have #update interface to make it explicit.
* | | | | | | | Merge branch '58984-doc-missing-milestones-and-labels-links' into 'master'Achilleas Pipinellis2019-06-122-0/+11
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document when milestones and labels links are missing Closes #58984 See merge request gitlab-org/gitlab-ce!29355
| * | | | | | | | Document when milestones and labels links are missingAlexandru Croitor2019-06-122-0/+11
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document that milestones and labels are still accesible through direct links when issues are disabled even if links are missing in sidebar UI.
* | | | | | | | Merge branch 'jv-doc-gitaly-dedup' into 'master'Achilleas Pipinellis2019-06-122-76/+38
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update git object deduplication overview See merge request gitlab-org/gitlab-ce!29139
| * | | | | | | | Update git object deduplication overviewJacob Vosmaer2019-06-122-76/+38
|/ / / / / / / /
* | | | | | | | Merge branch 'patch-65' into 'master'Kushal Pandya2019-06-122-3/+12
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apply tooltip on truncated commit title See merge request gitlab-org/gitlab-ce!28865
| * | | | | | | | Apply tooltip on truncated commit titleTimofey Trofimov2019-06-122-3/+12
|/ / / / / / / /
* | | | | | | | Merge branch 'docs/migrate_from_github_to_gitlab' into 'master'Evan Read2019-06-121-0/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | Add link to import video See merge request gitlab-org/gitlab-ce!29525
| * | | | | | | Add link to import videoRussell Dickenson2019-06-121-0/+2
|/ / / / / / /
* | | | | | | Merge branch 'docs-SSOT-misc-1' into 'master'Mike Lewis2019-06-128-65/+152
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs: SSOT edits to docs that are alone in root directories See merge request gitlab-org/gitlab-ce!28694
| * | | | | | | Update note style in various docsMarcel Amirault2019-06-124-11/+12
| | | | | | | |
| * | | | | | | Update front matter tags and grammar in two docsMarcel Amirault2019-06-102-2/+2
| | | | | | | |
| * | | | | | | SSOT edits to docs that are alone in root directoriesMarcel Amirault2019-06-108-55/+141
| | | | | | | |
* | | | | | | | Merge branch 'docs/add_autodevops_demo' into 'master'Evan Read2019-06-121-0/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add link to Auto DevOps demo video See merge request gitlab-org/gitlab-ce!29528