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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Remove unused rails5-variablesremove-unused-rails5-variables	Lin Jen-Shin	2018-10-24	1	-6/+0
\| \| \| \|	They're no longer used and have no effect
*	Merge branch 'add-security-dashboard-link-ce' into 'master'	Kamil Trzciński	2018-10-24	2	-1/+22
\|\ \| \| \| \| \| \| \| \|	Sync group sidebar template with EE See merge request gitlab-org/gitlab-ce!22549
\| *	Sync group sidebar template with EEadd-security-dashboard-link-ce	samdbeckham	2018-10-23	2	-1/+22
\| \| \| \| \| \| \| \|	- Allow to extend nav links for the Group sidebar
* \|	Merge branch ↵	Mike Greiling	2018-10-24	4	-7/+20
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'53023-endless-scroll-loader-is-visible-on-user-profile-overview-page' into 'master' Resolve "Endless scroll loader is visible on user profile overview page" Closes #53023 See merge request gitlab-org/gitlab-ce!22529
\| * \|	Resolve "Endless scroll loader is visible on user profile overview page"	Martin Wortschack	2018-10-24	4	-7/+20
\|/ /
* \|	Merge branch 'patch-28' into 'master'	Evan Read	2018-10-24	1	-6/+3
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Fix link in doc/user/project/repository/branches/index.md See merge request gitlab-org/gitlab-ce!22554
\| * \|	Fix link in doc/user/project/repository/branches/index.md	Stephen Wade	2018-10-24	1	-6/+3
\|/ /
* \|	Merge branch 'patch-12' into 'master'	Stan Hu	2018-10-24	1	-0/+2
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	doc: Fix broken link hrefs for ee and gitlab-versions See merge request gitlab-org/gitlab-ce!22540
\| * \|	add broken link hrefs for ee and gitlab-versions	Elan Ruusamäe	2018-10-23	1	-0/+2
\| \| \|
* \| \|	Merge branch 'docs-enable-feature-flag' into 'master'	Evan Read	2018-10-23	1	-0/+5
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add instructions on how to enable a feature flag Closes gitlab-org/release/framework#23 See merge request gitlab-org/gitlab-ce!22518
\| * \| \|	Add instructions on how to enable a feature flag	Filipa Lacerda	2018-10-23	1	-0/+5
\|/ / /
* \| \|	Merge branch 'patch-32' into 'master'	Evan Read	2018-10-23	1	-1/+1
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Correcting a typo See merge request gitlab-org/gitlab-ce!22511
\| * \| \|	Correcting a typo	Alex	2018-10-22	1	-1/+1
\| \| \| \|
* \| \| \|	Merge branch 'pages-access-control-docs' into 'master'	Robert Speicher	2018-10-23	2	-0/+65
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \|	Administrator documentation for Pages access control See merge request gitlab-org/gitlab-ce!22146
\| * \| \|	Add administrator documentation for Pages access control	Nick Thomas	2018-10-23	2	-0/+65
\| \| \| \|
* \| \| \|	Merge branch '53013-duplicate-escape' into 'master'	Phil Hughes	2018-10-23	3	-9/+12
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removes duplicate escape from job item Closes #53013 See merge request gitlab-org/gitlab-ce!22536
\| * \| \| \|	Removes escape from job item53013-duplicate-escape	Filipa Lacerda	2018-10-23	3	-9/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Tooltips aren't using v-html anymore thus causing escape not to be needed
* \| \| \| \|	Merge branch '53030-ee-compat-check-frozen-literal' into 'master'test-review-root-password	Sean McGivern	2018-10-23	1	-4/+6
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix ee-compat-check by not modifying frozen strings Closes #53030 See merge request gitlab-org/gitlab-ce!22527
\| * \| \| \| \|	Fix ee-compat-check by not modifying frozen strings53030-ee-compat-check-frozen-literal	Mario de la Ossa	2018-10-23	1	-4/+6
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'add-review-app' into 'master'	Marin Jankovski	2018-10-23	2	-5/+125
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add review app Closes #52188 and #49569 See merge request gitlab-org/gitlab-ce!22010
\| * \| \| \| \| \|	Fix the schedule:review_apps_cleanup jobadd-review-app	Rémy Coutable	2018-10-23	1	-1/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \| \| \|	Add omitted indentation fix	Ian Baum	2018-10-23	1	-4/+4
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Fix indentation, and move task to proper stage	Ian Baum	2018-10-23	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Use 2 space indentation in review-apps.sh script * Move automated_review_cleanup back to build stage
\| * \| \| \| \| \|	Add review app to gitlab-ce	Ian Baum	2018-10-23	2	-12/+46
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Uses the same supporting code as used in EE * Includes automated cleanup * Install external-dns helm chart to review apps cluster if it isn't already * Adds variables REVIEW_APPS_AWS_SECRET_KEY and REVIEW_APPS_AWS_ACCESS_key * review-apps-ce uses a different cipher
\| * \| \| \| \| \|	Merge branch 'improve-review-apps' into 'master'	Robert Speicher	2018-10-23	1	-0/+81
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve review apps Closes #6875 See merge request gitlab-org/gitlab-ee!6665 [ci skip]
* \| \| \| \| \| \|	Merge branch 'fix/security-workflow-dev' into 'master'	Robert Speicher	2018-10-23	1	-2/+2
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update dev security workflow template See merge request gitlab-org/gitlab-ce!22532
\| * \| \| \| \| \|	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 'update-runner-chart-to-0-1-35' into 'master'	Kamil Trzciński	2018-10-23	3	-4/+9
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update Runner Chart to 0.1.35 See merge request gitlab-org/gitlab-ce!22541
\| * \| \| \| \| \|	Update Runner Chart to 0.1.35	Tomasz Maczukin	2018-10-23	3	-4/+9
\|/ / / / / /
* \| \| \| \| \|	Merge branch 'mysql-migration-trigger-permissions' into 'master'	Andreas Brandl	2018-10-23	1	-1/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add dbname to MySQL migration GRANT command See merge request gitlab-org/gitlab-ce!21719
\| * \| \| \| \| \|	Add dbname to MySQL migration GRANT command	Ryan Hefner	2018-09-13	1	-1/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'support-license-management-and-performance' into 'master'	Grzegorz Bizon	2018-10-23	5	-4/+20
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Support licenses and performance See merge request gitlab-org/gitlab-ce!22175
\| * \| \| \| \| \|	Support licenses and performancesupport-license-management-and-performance	Kamil Trzciński	2018-10-22	5	-4/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This introduces a new syntax for all licenses and performance jobs: ```yaml job: reports: performance: performance.json license_management: gl-license-management-report.json ```
* \| \| \| \| \| \|	Merge branch '32959-update-todo-icon' into 'master'	Annabel Dunstone Gray	2018-10-23	4	-8/+17
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update Todo icons in collapsed sidebar for Issues and MRs See merge request gitlab-org/gitlab-ce!22534
\| * \| \| \| \| \| \|	Update Todo icons in collapsed sidebar for Issues and MRs	Kushal Pandya	2018-10-23	4	-8/+17
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch 'lfs-project-attribute-alias' into 'master'	Nick Thomas	2018-10-23	3	-1/+8
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Alias the lfs_enabled method Closes #49348 See merge request gitlab-org/gitlab-ce!22501
\| * \| \| \| \| \| \|	Alias the lfs_enabled methodlfs-project-attribute-alias	Cindy Pallares	2018-10-22	3	-1/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We currently check for `project.lfs_enabled` to display the state of lfs being enabled/disabled, but this is set to nil by default, even when lfs is enabled. Aliasing the method to #lfs_enabled? will return the correct state.
* \| \| \| \| \| \| \|	Merge branch 'add-role-binding-to-kubeclient' into 'master'	Kamil Trzciński	2018-10-23	4	-0/+106
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add RoleBinding method and class See merge request gitlab-org/gitlab-ce!22524
\| * \| \| \| \| \| \| \|	Add RoleBinding methodsadd-role-binding-to-kubeclient	Mayra Cabrera	2018-10-22	4	-0/+106
\| \| \|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Includes RoleBinding methods to Kubeclient and introduce a new lib class to generate RoleBinding resources. This MR is part of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/22011
* \| \| \| \| \| \| \|	Merge branch 'zj-broken-storage' into 'master'	Grzegorz Bizon	2018-10-23	7	-25/+8
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove broken git storage for testing See merge request gitlab-org/gitlab-ce!22530
\| * \| \| \| \| \| \|	Bump Gitaly to v0.126.0	Zeger-Jan van de Weg	2018-10-23	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This will allow changes in Gitaly that will make it fail when running rspec, to make it to GitLab. Else Gitaly won't start as it can't reach the broken storage directory.
\| * \| \| \| \| \| \|	Remove broken git storage for testing	Zeger-Jan van de Weg	2018-10-23	6	-24/+7
\| \| \|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Broken storage used to be used to test situations where the Git storage wasn't being reached. These days we can just mock the Gitaly response. But given the broken storage is removed now, Gitaly can take over control of the storage being reachable. If it's not, Gitaly won't boot. That's nice for situations where a disk wasn't mounted for instance. Gitaly MR: https://gitlab.com/gitlab-org/gitaly/merge_requests/675
* \| \| \| \| \| \|	Merge branch '52059-filter-milestone-by-none-any' into 'master'	Phil Hughes	2018-10-23	6	-8/+39
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add `Any` option to milestone filter See merge request gitlab-org/gitlab-ce!22351
\| * \| \| \| \| \| \|	Add `Any` option to milestone filter	Heinrich Lee Yu	2018-10-23	6	-8/+39
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch '26723-discussion-filters' into 'master'	Phil Hughes	2018-10-23	45	-31/+694
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Filter discussion (tab) by comments or activity in issues and merge requests" Closes #26723 See merge request gitlab-org/gitlab-ce!19193
\| * \| \| \| \| \|	Resolve "Filter discussion (tab) by comments or activity in issues and merge ↵	Oswaldo Ferreira	2018-10-23	45	-31/+694
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	requests"
* \| \| \| \| \|	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