delta/gitlab/gitlab-ce.git - gitlab.com: gitlab-org/gitlab-ce.git

	Commit message (Collapse)	Author	Age	Files	Lines
*	Update .gitlab/issue_templates/Security developer workflow.mdfix/security-workflow-dev	James Lopez	2018-10-23	1	-1/+1
\|
*	Update dev security workflow	James Lopez	2018-10-23	1	-2/+2
\| \| \|	It now asks to assign the main dev issue to all RMs
*	Merge branch 'qa-run-karma' into 'master'	Phil Hughes	2018-10-23	1	-1/+1
\|\ \| \| \| \| \| \| \| \|	Run karma for qa-* branches See merge request gitlab-org/gitlab-ce!22464
\| *	Run karma for qa-* branchesqa-run-karma	Rémy Coutable	2018-10-22	1	-1/+1
\| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \|	Merge branch '42611-removed-branch-link' into 'master'	Grzegorz Bizon	2018-10-23	5	-3/+71
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Removed branch link in pipelines page is broken" Closes #42611 See merge request gitlab-org/gitlab-ce!21451
\| * \|	Do not raise error when checking pipeline reference42611-removed-branch-link	Grzegorz Bizon	2018-10-22	3	-14/+31
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Return from the `Ci::Pipeline#ref_exists?` in case when there is no repository present. This also fixes pipeline page feature specs by changing pipeline reference instead of stubbing `ref_exist?` method.
\| * \|	Fix pipeline reference existence check and add specs	Grzegorz Bizon	2018-10-22	2	-3/+26
\| \| \|
\| * \|	Removes extra empty lines	Filipa Lacerda	2018-10-17	1	-2/+0
\| \| \|
\| * \|	Creates ref_exists? method for Pipeline class	Filipa Lacerda	2018-10-08	3	-2/+6
\| \| \|
\| * \|	Merge branch 'master' into 42611-removed-branch-link	Filipa Lacerda	2018-10-08	3510	-36258/+183588
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: (1252 commits) Render log artifact files in GitLab Check disabled_services when finding a service Fix invalid parent path on group settings page Backport CE changes for: [Frontend only] Batch comments on merge requests Add button to insert table in markdown editor Update GITALY_SERVER_VERSION Updates Laravel.gitlab-ci.yml template Update operations metrics empty state Fix LFS uploaded images not being rendered Prepare admin/projects/show view to allow EE specific feature Add timed incremental rollout to Auto DevOps Update spec comment to point to correct issue Fix documentation for variables Document Security and Licence Management features permissions Fix time dependent jobs spec Use a CTE to remove the query timeout Backport changes from gitlab-ee!7538 Fix CE to EE merge (backport) Add changelog entry Refactor Feature.flipper method ...
\| * \| \|	Render link to branch only when branch still exists	Filipa Lacerda	2018-08-31	3	-1/+27
\| \| \| \|
* \| \| \|	Merge branch '52840-fix-runners-details-page' into 'master'	Grzegorz Bizon	2018-10-23	4	-1/+171
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Group runner confused about whether or not is protected" Closes #52840 See merge request gitlab-org/gitlab-ce!22459
\| * \| \| \|	Add CHANGELOG entry52840-fix-runners-details-page	Tomasz Maczukin	2018-10-22	1	-0/+5
\| \| \| \| \|
\| * \| \| \|	Fix rendering of 'Protected' value	Tomasz Maczukin	2018-10-22	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Add tests for shared/runners/show.html.haml view	Tomasz Maczukin	2018-10-22	2	-0/+165
\| \| \| \| \|
* \| \| \| \|	Merge branch 'sh-pages-eof-error' into 'master'	Grzegorz Bizon	2018-10-23	4	-2/+88
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix EOF detection with CI artifacts metadata Closes #36954 See merge request gitlab-org/gitlab-ce!22479
\| * \| \| \| \|	Add a spec that generates the metadata dynamicallysh-pages-eof-error	Stan Hu	2018-10-19	2	-0/+78
\| \| \| \| \| \|
\| * \| \| \| \|	Fix EOF detection with CI artifacts metadata	Stan Hu	2018-10-18	2	-2/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	There are some corner cases where a perfectly correct GZIP stream may not hit the EOF until another read is attempted. We now skip the entry if we don't see any valid data, which allows the EOF check to work properly. Closes https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/22479
* \| \| \| \| \|	Merge branch 'patch-31' into 'master'	Evan Read	2018-10-23	1	-0/+17
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add information about the uid_attribute custom setting in the SAML docs See merge request gitlab-org/gitlab-ce!22500
\| * \| \| \| \| \|	Edited uid_attribute information with suggested changes	Blair Lunceford	2018-10-22	1	-3/+2
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Add information about the uid_attribute custom setting in the SAML docs	Blair Lunceford	2018-10-19	1	-0/+18
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'add-new-kubernetes-spec-helpers' into 'master'	Dmitriy Zaporozhets	2018-10-23	2	-3/+25
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Introduce new Kubernetes spec helpers See merge request gitlab-org/gitlab-ce!22525
\| * \| \| \| \| \| \|	Introduce new kubernetes spec helpersadd-new-kubernetes-spec-helpers	Mayra Cabrera	2018-10-22	2	-3/+25
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add create_role_binding, create_namespace and get_namespace kubernetes spec helpers. This new helpers are going to be used on https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/22011
* \| \| \| \| \| \|	Merge branch 'revert-eac645d7' into 'master'	Robert Speicher	2018-10-22	2	-87/+75
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert "Merge branch 'refactor-cluster-create-service-spec' into 'master'" See merge request gitlab-org/gitlab-ce!22523
\| * \| \| \| \| \| \|	Revert "Merge branch 'refactor-cluster-create-service-spec' into 'master'"	Thong Kuah	2018-10-22	2	-87/+75
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts merge request !22407
* \| \| \| \| \| \| \|	Merge branch '46884-remove-card-title' into 'master'	Annabel Dunstone Gray	2018-10-22	14	-66/+39
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove card-title in card-header Closes #46884 See merge request gitlab-org/gitlab-ce!19335
\| * \| \| \| \| \| \|	Remove .card-title from .card-header for BS4 migration	Takuya Noguchi	2018-10-19	14	-66/+39
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Replaces .card-header > hX.card-title with hX.card-header to remove .card-title. At a occurrence where bold styling is not necessary, div.card-header is used instead. By full removal of .card-title at the moment, all workarounds for BS4's card-title are removed as well. More information: https://getbootstrap.com/docs/4.0/migration/#panels Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
* \| \| \| \| \| \| \|	Merge branch 'feature/gb/improve-include-config-errors-reporting' into 'master'	Douwe Maan	2018-10-22	18	-204/+384
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve validation errors for external CI/CD configuration Closes #51369 See merge request gitlab-org/gitlab-ce!22394
\| * \| \| \| \| \| \| \|	Improve specs for abstract remote `include` filefeature/gb/improve-include-config-errors-reporting	Grzegorz Bizon	2018-10-22	1	-4/+4
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Improve error message when `include` is blocked	Grzegorz Bizon	2018-10-22	2	-5/+12
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Improve remote CI/CD config file extension validation	Grzegorz Bizon	2018-10-19	2	-2/+54
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Extend error message in case of HTTP errors in `include`	Grzegorz Bizon	2018-10-19	4	-23/+65
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Add changelog for `include` error reporting improvements	Grzegorz Bizon	2018-10-18	1	-0/+5
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Refactor `include` code and improve error reporting	Grzegorz Bizon	2018-10-18	8	-43/+103
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Extract method that fetchesremote CI/CD included config	Grzegorz Bizon	2018-10-18	3	-13/+12
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Add IncludeError exception and use it in CI config	Grzegorz Bizon	2018-10-18	3	-5/+6
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Move external CI config class into proper namespace	Grzegorz Bizon	2018-10-16	11	-113/+127
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Move external CI config files into Ci class context	Grzegorz Bizon	2018-10-16	9	-0/+0
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch '51716-add-kubernetes-namespace-model' into 'master'	Andreas Brandl	2018-10-22	14	-24/+287
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add Clusters::KubernetesNamespace model See merge request gitlab-org/gitlab-ce!22404
\| * \| \| \| \| \| \| \| \|	Add Clusters::KubernetesNamespace model51716-add-kubernetes-namespace-model	Mayra Cabrera	2018-10-22	14	-24/+287
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This model will be used to persist into database Kubernetes properties, such as namespace, service account name and service account token.
* \| \| \| \| \| \| \| \| \|	Merge branch 'blackst0ne-bump-mermaid' into 'master'	Mike Greiling	2018-10-22	4	-40/+122
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bump mermaid to 8.0.0-rc.8 Closes #52601, #50105, and #40470 See merge request gitlab-org/gitlab-ce!22509
\| * \| \| \| \| \| \| \| \| \|	Bump mermaid to 8.0.0-rc.8blackst0ne-bump-mermaid	blackst0ne	2018-10-22	4	-40/+122
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This commit moves `mermaid` from blackst0ne-mermaid package to the upstream version. The reason why the fork was used was this bug[1]. The bug has been fixed, so there's no need to maintain my fork anymore. [1]: https://github.com/knsv/mermaid/issues/584
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'change-branch-font-type-in-tag-creation' into 'master'	Annabel Dunstone Gray	2018-10-22	3	-2/+8
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change branch font type in tag creation See merge request gitlab-org/gitlab-ce!22454
\| * \| \| \| \| \| \| \| \| \| \|	Change branch font type in tag creation	George Tsiolis	2018-10-22	3	-2/+8
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'refactor-project-rename-repo' into 'master'	Robert Speicher	2018-10-22	9	-247/+368
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move Project#rename_repo to a service class See merge request gitlab-org/gitlab-ce!22419
\| * \| \| \| \| \| \| \| \| \| \| \|	Move Project#rename_repo to a service classrefactor-project-rename-repo	Yorick Peterse	2018-10-22	9	-247/+368
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This moves the logic of Project#rename_repo and all methods _only_ used by this method into a new service class: Projects::AfterRenameService. By moving this code into a separate service class we can more easily refactor it, and we also get rid of some RuboCop "disable" statements automatically. During the refactoring of this code, I removed most of the explicit logging using Gitlab::AppLogger. The data that was logged would not be useful when debugging renaming issues, as it does not add any value on top of data provided by users. I also removed a variety of comments that either mentioned something the code does in literal form, or contained various grammatical errors. Instead we now resort to more clearly named methods, removing the need for code comments. This method was chosen based on analysis in https://gitlab.com/gitlab-org/release/framework/issues/28. In this issue we determined this method has seen a total of 293 lines being changed in it. We also noticed that RuboCop determined the ABC size (https://www.softwarerenovation.com/ABCMetric.pdf) was too great.
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'docs-accepting-merge-requests-label-is-the-ssot' into 'master'	Mek Stittri	2018-10-22	3	-22/+23
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make the 'Accepting merge requests' workflow consistent See merge request gitlab-org/gitlab-ce!22467
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Make the 'Accepting merge requests' workflow consistentdocs-accepting-merge-requests-label-is-the-ssot	Rémy Coutable	2018-10-22	3	-22/+23
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'mg-update-prettier-script' into 'master'	Clement Ho	2018-10-22	5	-116/+105
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix/update prettier script See merge request gitlab-org/gitlab-ce!22476
\| * \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix/update prettier script	Mike Greiling	2018-10-22	5	-116/+105
\|/ / / / / / / / / / / / / /