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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Document the Prometheus Alertmanagerbjk/alertmanager_docs	Ben Kochie	2018-03-15	2	-0/+35
\| \| \| \|	Add basic documentation for the Prometheus Alertmanager.
*	Merge branch 'patch-28' into 'master'	Grzegorz Bizon	2018-03-15	1	-4/+4
\|\ \| \| \| \| \| \| \| \|	Update README.md See merge request gitlab-org/gitlab-ce!17344
\| *	Update README.md	John Burak	2018-02-27	1	-2/+2
\| \|
\| *	Update README.md	John Burak	2018-02-27	1	-4/+4
\| \|
\| *	Update README.md	John Burak	2018-02-26	0	-0/+0
\| \|
\| *	Update README.md	John Burak	2018-02-26	1	-1/+1
\| \|
\| *	Update README.md	John Burak	2018-02-26	1	-1/+1
\| \|
\| *	Update README.md	John Burak	2018-02-26	1	-1/+1
\| \|
\| *	Update README.md	John Burak	2018-02-24	1	-1/+1
\| \|
* \|	Merge branch 'dm-mirror-hard-failed-invites' into 'master'	Robert Speicher	2018-03-14	2	-3/+3
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Prevent sending an access request from failing when the project has invited masters/owners See merge request gitlab-org/gitlab-ce!17760
\| * \|	Prevent sending an access request to a project from failing when the project ↵dm-mirror-hard-failed-invites	Douwe Maan	2018-03-11	2	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \|	has invited members
* \| \|	Merge branch 'mk/fix-move-upload-files-on-group-transfer' into 'master'	Robert Speicher	2018-03-14	5	-46/+142
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix moving local, unhashed upload or pages directories during group transfer Closes #43993 See merge request gitlab-org/gitlab-ce!17658
\| * \| \|	Tag subgroup tests with :nested_groupsmk/fix-move-upload-files-on-group-transfer	Michael Kozono	2018-03-14	1	-1/+1
\| \| \| \|
\| * \| \|	Remove obsolete comment	Michael Kozono	2018-03-13	1	-1/+0
\| \| \| \|
\| * \| \|	Appease Metrics/AbcSize cop	Michael Kozono	2018-03-13	1	-18/+22
\| \| \| \|
\| * \| \|	Ensure data integrity	Michael Kozono	2018-03-13	1	-1/+5
\| \| \| \|
\| * \| \|	Refactor specs	Michael Kozono	2018-03-13	2	-15/+27
\| \| \| \|
\| * \| \|	Fix moving local files during namespace transfer	Michael Kozono	2018-03-13	5	-22/+99
\| \| \| \|
* \| \| \|	Merge branch 'patch-24' into 'master'	Douwe Maan	2018-03-14	1	-0/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add me as proofreader See merge request gitlab-org/gitlab-ce!17593
\| * \| \| \|	Add me as proofreader	ChangHo Cha	2018-03-07	1	-0/+1
\| \| \| \| \|
* \| \| \| \|	Merge branch 'patch-30' into 'master'	Douwe Maan	2018-03-14	1	-0/+2
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	add Indonesian proofreader See merge request gitlab-org/gitlab-ce!17579
\| * \| \| \| \|	add Indonesian proofreader	Ahmad Naufal Mukhtar	2018-03-06	1	-0/+2
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'tz-prettier-base' into 'master'42027-hide-hover-data-in-performance-dashboard-legend	Filipa Lacerda	2018-03-14	9	-14/+214
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prettier Phase 1: Prettier Configuration, Prettifying of files and documentation See merge request gitlab-org/gitlab-ce!17695
\| * \| \| \| \| \|	Prettier Phase 1: Prettier Configuration, Prettifying of files and documentation	Tim Zallmann	2018-03-14	9	-14/+214
\|/ / / / / /
* \| \| \| \| \|	Merge branch 'ci-lint-dispatcher-fix' into 'master'	Filipa Lacerda	2018-03-14	2	-0/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change path of CI lints create index.js file Closes #44181 See merge request gitlab-org/gitlab-ce!17751
\| * \| \| \| \| \|	add check for ace editor on create routeci-lint-dispatcher-fix	Phil Hughes	2018-03-14	1	-0/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Change path of CI lints create index.js file	Phil Hughes	2018-03-14	1	-0/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When the route action is create it defaults to new, this saves us having multiple files for the same route Closes #44181
* \| \| \| \| \| \|	Merge branch 'update-net-ssh' into 'master'	Douwe Maan	2018-03-14	2	-3/+3
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update net-ssh 4.1.0 -> 4.2.0 (Fixes #21734) Closes #21734 See merge request gitlab-org/gitlab-ce!17688
\| * \| \| \| \| \| \|	Update net-ssh 4.1.0 -> 4.2.0 (Fixes #21734)	Pirate Praveen	2018-03-14	2	-3/+3
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch '43806-update-ruby-saml-to-1.7.2' into 'master'	Robert Speicher	2018-03-14	3	-10/+15
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update ruby-saml to 1.7.2 and omniauth-saml to 1.10.0 (CVE-2017-11428, CVE-2017-11430) Closes #43806 See merge request gitlab-org/gitlab-ce!17734
\| * \| \| \| \| \| \| \|	Update ruby-saml to 1.7.2 and omniauth-saml to 1.10.0	Takuya Noguchi	2018-03-14	3	-10/+15
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'update-fog-aws' into 'master'	Robert Speicher	2018-03-14	2	-6/+6
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	update fog-aws 1.4 -> 2.0 See merge request gitlab-org/gitlab-ce!17708
\| * \| \| \| \| \| \| \| \|	update fog-aws 1.4 -> 2.0	Pirate Praveen	2018-03-13	2	-6/+6
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'update-acts-as-taggable-on' into 'master'	Robert Speicher	2018-03-14	2	-6/+6
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update acts-as-taggable-on to 5.0 See merge request gitlab-org/gitlab-ce!17689
\| * \| \| \| \| \| \| \| \| \|	Update acts-as-taggable-on to 5.0	Pirate Praveen	2018-03-12	2	-6/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- only older ruby and activerecord support dropped
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'update-sentry-raven' into 'master'	Douwe Maan	2018-03-14	2	-3/+3
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update sentry-raven 2.5.3 -> 2.7 (Fixes #24029) Closes #24029 See merge request gitlab-org/gitlab-ce!17709
\| * \| \| \| \| \| \| \| \| \| \|	Update sentry-raven 2.5.3 -> 2.7 (Fixes #24029)	Pirate Praveen	2018-03-13	2	-3/+3
\| \|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'update-octokit' into 'master'	Douwe Maan	2018-03-14	2	-3/+3
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update octokit 4.6.2 -> 4.8 See merge request gitlab-org/gitlab-ce!17738
\| * \| \| \| \| \| \| \| \| \| \|	Update octokit 4.6.2 -> 4.8	Pirate Praveen	2018-03-14	2	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'update-ruby-prof' into 'master'	Robert Speicher	2018-03-14	2	-3/+3
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update ruby-prof 0.16.2 -> 0.17.0 See merge request gitlab-org/gitlab-ce!17710
\| * \| \| \| \| \| \| \| \| \| \|	Update ruby-prof 0.16.2 -> 0.17.0	Pirate Praveen	2018-03-13	2	-3/+3
\| \| \|/ / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'update-httparty' into 'master'	Grzegorz Bizon	2018-03-14	2	-4/+3
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update httparty 0.13.3 -> 0.15.6 See merge request gitlab-org/gitlab-ce!17737
\| * \| \| \| \| \| \| \| \| \| \|	Update httparty 0.13.3 -> 0.15.6	Pirate Praveen	2018-03-14	2	-4/+3
\| \| \|/ / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'bvl-import-zip-multiple-assignees' into 'master'	Sean McGivern	2018-03-14	4	-15/+42
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Import multiple issue assignees from GitLab export Closes #40275 See merge request gitlab-org/gitlab-ce!17718
\| * \| \| \| \| \| \| \| \| \| \|	Import multiple issue assignees from GitLab export	Bob Van Landuyt	2018-03-14	4	-15/+42
\| \| \|_\|_\|_\|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When importing from a GitLab archive, an admin can carry over the assignations. Other users can not. When a regular user is importing an issue with multiple assignees, the assignee is replaced with the current user, meaning we would try to insert current user as an assignee multiple times. By filtering the array before storing it, the import becomes more robust.
* \| \| \| \| \| \| \| \| \| \|	Merge branch '43717-breadcrumb-on-admin-runner-page' into 'master'	Sean McGivern	2018-03-14	2	-0/+9
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Breadcrumb on Admin Runner page Closes #43717 See merge request gitlab-org/gitlab-ce!17431
\| * \| \| \| \| \| \| \| \| \| \|	Set breadcrumb for admin/runners/show	Takuya Noguchi	2018-03-14	2	-0/+9
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch '44160-update-foreman-to-0.84.0' into 'master'	Grzegorz Bizon	2018-03-14	3	-3/+8
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update foreman to 0.84.0 Closes #44160 See merge request gitlab-org/gitlab-ce!17690
\| * \| \| \| \| \| \| \| \| \| \| \|	Update foreman from 0.78.0 to 0.84.0	Takuya Noguchi	2018-03-13	3	-3/+8
\| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'patch-29' into 'master'	Sean McGivern	2018-03-14	1	-0/+1
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Docs: Incoming e-mails: require gitlab-ctl restart See merge request gitlab-org/gitlab-ce!17587