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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Add Project#lfs_http_url_to_repo from EEashmckenzie/8114-geo-push-ssh-lfs-http-auth-bug	Ash McKenzie	2018-12-03	2	-0/+16
\| \| \| \| \|	For CE, #lfs_http_url_to_repo calls #http_url_to_repo where as for EE we examine for a Geo setup so we can support push to secondary for LFS.
*	LfsToken uses JSONWebToken::HMACToken by default	Ash McKenzie	2018-12-03	4	-40/+259
\| \| \| \| \|	LfsToken::HMACToken#token_valid?() will be examined and if false, look in redis via LfsToken::LegacyRedisDeviseToken#token_valid?().
*	Use user? instead	Ash McKenzie	2018-12-03	1	-1/+1
\|
*	Merge branch 'workhorse-7-3-0' into 'master'	Stan Hu	2018-11-30	2	-1/+6
\|\ \| \| \| \| \| \| \| \|	Upgrade GitLab Workhorse to v7.3.0 See merge request gitlab-org/gitlab-ce!23489
\| *	Upgrade GitLab Workhorse to v7.3.0	Nick Thomas	2018-11-30	2	-1/+6
\| \|
* \|	Merge branch 'rs-fix-todo-spec' into 'master'	Stan Hu	2018-11-30	1	-1/+2
\|\ \ \| \|/ \|/\| \| \| \| \|	Add additional scope check to Todo#for_target spec See merge request gitlab-org/gitlab-ce!23487
\| *	Add additional scope check to Todo#for_target spec	Robert Speicher	2018-11-30	1	-1/+2
\|/ \| \| \| \| \|	This works around a condition where the Issue and the MergeRequest created by FactoryBoth both had the same ID, which caused `for_target` to return two records when we only expected one.
*	Merge branch 'docs-gitaly-debug' into 'master'	Achilleas Pipinellis	2018-11-30	1	-0/+11
\|\ \| \| \| \| \| \| \| \|	Add documentation reference to gitaly-debug See merge request gitlab-org/gitlab-ce!23386
\| *	Add documentation reference to gitaly-debug	Jacob Vosmaer	2018-11-30	1	-0/+11
\|/
*	Merge branch '6861-group-level-project-templates-ce' into 'master'	Phil Hughes	2018-11-30	13	-16/+86
\|\ \| \| \| \| \| \| \| \|	Backport from gitlab-org/gitlab-ee!6878 See merge request gitlab-org/gitlab-ce!23391
\| *	Clarify support of subgroups as project template source	Dennis Tang	2018-11-30	1	-1/+1
\| \|
\| *	Update doc/user/group/index.md6861-group-level-project-templates-ce	Dennis Tang	2018-11-30	1	-1/+1
\| \|
\| *	Add docs for custom project templates	Dennis Tang	2018-11-30	2	-0/+48
\| \|
\| *	Link group/index.md to group-level project templates page	Dennis Tang	2018-11-29	1	-0/+5
\| \|
\| *	Backport changes from spec/migrations/clean_up_for_members_spec.rb	Rubén Dávila	2018-11-27	1	-2/+3
\| \|
\| *	Backport: Callout CSS, group edit selection JS	Dennis Tang	2018-11-27	3	-2/+15
\| \|
\| *	Backport from gitlab-org/gitlab-ee!6878	Rubén Dávila	2018-11-27	6	-12/+15
\| \|
* \|	Merge branch 'if-52811-fix_namespaces_api_routing' into 'master'	Nick Thomas	2018-11-30	52	-63/+68
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Fix API::Namespaces routing to accept namepaces with dots See merge request gitlab-org/gitlab-ce!22912
\| * \|	Fix API::Namespaces to accept namepaces with dotsif-52811-fix_namespaces_api_routing	Imre Farkas	2018-11-28	52	-63/+68
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	It also renames the API::PROJECT_ENDPOINT_REQUIREMENTS constant to API::NAMESPACE_OR_PROJECT_REQUIREMENTS
* \| \|	Merge branch 'patch-33' into 'master'	Robert Speicher	2018-11-30	1	-1/+1
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix Red/Orange data link markdown See merge request gitlab-org/gitlab-ce!23461
\| * \| \|	Fix Red/Orange data link markdown	Philippe Lafoucrière	2018-11-30	1	-1/+1
\|/ / /
* \| \|	Merge branch '51029-status-emoji-currently-replaces-avatar-on-mobile' into ↵	Filipa Lacerda	2018-11-30	3	-16/+5
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Resolve "Status Emoji currently replaces avatar on mobile" Closes #51029 See merge request gitlab-org/gitlab-ce!23408
\| * \| \|	Ensure that profile avatar displays on mobile	Brandon Labuschagne	2018-11-29	3	-16/+5
\| \| \| \|
* \| \| \|	Merge branch 'docs/remove-link-and-fix-page' into 'master'	Achilleas Pipinellis	2018-11-30	1	-8/+9
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove broken link and fix markdown formatting See merge request gitlab-org/gitlab-ce!23467
\| * \| \| \|	Remove broken link and fix markdown formatting	Evan Read	2018-11-30	1	-8/+9
\| \| \| \| \|
* \| \| \| \|	Merge branch 'if-40385_fix_doc' into 'master'	Achilleas Pipinellis	2018-11-30	1	-3/+2
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve wording on disabling impersonation in api/README See merge request gitlab-org/gitlab-ce!23472
\| * \| \| \| \|	Improve wording on disabling impersonation in api/README	Imre Farkas	2018-11-30	1	-3/+2
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'gt-externalize-app-views-invites' into 'master'	Kushal Pandya	2018-11-30	3	-7/+36
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Externalize strings from `/app/views/invites` See merge request gitlab-org/gitlab-ce!23205
\| * \| \| \| \| \|	Externalize strings from `/app/views/invites`	George Tsiolis	2018-11-27	3	-7/+36
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch '53778-post-deployment-fix' into 'master'	Yorick Peterse	2018-11-30	1	-0/+0
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move drop_site_statistics to be a post deployment migration See merge request gitlab-org/gitlab-ce!23455
\| * \| \| \| \| \| \|	Move drop_site_statistics to be a post deployment migration	Gabriel Mazetto	2018-11-29	1	-0/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	As post deployment migration we don't need to make it a migration that requires downtime
* \| \| \| \| \| \| \|	Merge branch 'smooshpack-upgrade' into 'master'	Filipa Lacerda	2018-11-30	2	-11/+11
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Upgraded Codesandbox packages Closes #51210 See merge request gitlab-org/gitlab-ce!23475
\| * \| \| \| \| \| \| \|	Upgraded Codesandbox packages	Phil Hughes	2018-11-30	2	-11/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/51210
* \| \| \| \| \| \| \| \|	Merge branch 'generalize-ci-config' into 'master'	Grzegorz Bizon	2018-11-30	60	-850/+841
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	ci/config: generalize Config validation into Gitlab::Config:: module See merge request gitlab-org/gitlab-ce!23443
\| * \| \| \| \| \| \| \| \|	ci/config: generalize Config validation into Gitlab::Config:: module	Kamil Trzciński	2018-11-29	60	-850/+841
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This decouples Ci::Config to provide a common interface for handling user configuration files.
* \| \| \| \| \| \| \| \| \|	Merge branch 'bw-fix-silence-stderr-typo' into 'master'	Sean McGivern	2018-11-30	1	-2/+2
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix typo in method name "silence_stderr" See merge request gitlab-org/gitlab-ce!23468
\| * \| \| \| \| \| \| \| \|	Fix typo in method name "silence_stderr"	Brett Walker	2018-11-29	1	-2/+2
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'ignore-failed-pipeline-creation-on-pipeline-schedule' into ↵	Kamil Trzciński	2018-11-30	6	-16/+154
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Remove auto deactivation when failed to create a pipeline via pipeline schedules Closes #41231 See merge request gitlab-org/gitlab-ce!22243
\| * \| \| \| \| \| \| \| \| \|	Squashed commit of the following:	Shinya Maeda	2018-11-30	6	-16/+154
\| \|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	commit 0c00e52d339f8471a6ea425d5a4a59751a3f4a35 Author: Shinya Maeda <shinya@gitlab.com> Date: Fri Nov 30 15:41:46 2018 +0900 Update schedules.md commit 0ae56bf5a0ba9254d2ebd4c846395113ae72d686 Merge: c143777c9f2 9ce28bf08b7 Author: Shinya Maeda <shinya@gitlab.com> Date: Fri Nov 30 15:38:01 2018 +0900 Merge branch 'master-ce' into ignore-failed-pipeline-creation-on-pipeline-schedule commit c143777c9f250c8075355ac07e9bae7b074665c3 Author: Shinya Maeda <shinya@gitlab.com> Date: Thu Nov 29 17:18:07 2018 +0900 Fix coding offence commit 7c816dfa634b5911310c67c285fc3c37d5f03517 Author: Shinya Maeda <shinya@gitlab.com> Date: Thu Nov 29 16:12:06 2018 +0900 Improve spec quality commit f78eed45e991123f8af4a7b24f041529bbb35e91 Merge: 96d20ce9144 a5f4627857b Author: Shinya Maeda <shinya@gitlab.com> Date: Thu Nov 29 15:20:16 2018 +0900 Merge branch 'master-ce' into ignore-failed-pipeline-creation-on-pipeline-schedule commit 96d20ce914458f86e68b57bc1bb88ab8d27f010b Author: Shinya Maeda <shinya@gitlab.com> Date: Tue Nov 27 16:25:42 2018 +0900 Print pipeline error commit 97842068b6cf1432cd400ead749843946b4f51ee Merge: c2b015949af 2ee8c40fc16 Author: Shinya Maeda <shinya@gitlab.com> Date: Tue Nov 27 15:51:49 2018 +0900 Merge branch 'master-ce' into ignore-failed-pipeline-creation-on-pipeline-schedule commit c2b015949afb3ecc70cb057e2d13672f378c0d03 Merge: 3435137c17b fbbe5ccd1be Author: Shinya Maeda <shinya@gitlab.com> Date: Mon Nov 26 15:26:17 2018 +0900 Merge branch 'master-ce' into ignore-failed-pipeline-creation-on-pipeline-schedule commit 3435137c17b0ef03003e39dd08c7370fe916c626 Author: Shinya Maeda <shinya@gitlab.com> Date: Tue Nov 20 17:45:38 2018 +0900 Track exception with Sentry commit 3f01f10d3b7380f0e8ceb3a379d8b6c602e9d6ca Merge: 5749c62355f 8a581d531ba Author: Shinya Maeda <shinya@gitlab.com> Date: Tue Nov 20 17:12:41 2018 +0900 Merge branch 'master-ce' into ignore-failed-pipeline-creation-on-pipeline-schedule commit 5749c62355f8de62bb4e36ba1e351a78350607c1 Author: Shinya Maeda <shinya@gitlab.com> Date: Thu Nov 1 11:14:26 2018 +0900 Create a pipeline even if it is corrupted commit e01789890b6949b346d40fadef41aa133191cc43 Author: Shinya Maeda <shinya@gitlab.com> Date: Wed Oct 31 14:26:09 2018 +0900 Improve production log message commit f20d698a535f1dc70d5437c20b629fd1d956fb27 Author: Shinya Maeda <shinya@gitlab.com> Date: Fri Oct 19 17:11:20 2018 +0900 Fix typo commit 01323b02ac41ec50bcf237409f2e3c5c214bbfc1 Author: Shinya Maeda <shinya@gitlab.com> Date: Thu Oct 18 14:46:44 2018 +0900 Update documents commit 460337bf4a7e67a35d6c342678b4cfe66710ad56 Author: Shinya Maeda <shinya@gitlab.com> Date: Wed Oct 10 13:21:26 2018 +0900 Add changelog commit a3c4711752fedebfacbdf52da94058524af3c9f4 Author: Shinya Maeda <shinya@gitlab.com> Date: Wed Oct 10 09:20:06 2018 +0900 Ignore failed pipeline creation in pipeline schedule worker. Instead, logging the event.
* \| \| \| \| \| \| \| \| \|	Merge branch '54218-fix-mergeUrlParams' into 'master'	Phil Hughes	2018-11-30	3	-19/+48
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "mergeUrlParams wrong with fragment url" Closes #54218 See merge request gitlab-org/gitlab-ce!23193
\| * \| \| \| \| \| \| \| \| \|	Resolve "mergeUrlParams wrong with fragment url"	Thomas Holder	2018-11-30	3	-19/+48
\|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge branch 'winh-timeline-entry-component' into 'master'	Kushal Pandya	2018-11-30	9	-368/+418
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Extract shared timeline entry component See merge request gitlab-org/gitlab-ce!23447
\| * \| \| \| \| \| \| \| \| \|	Replace existing uses of timeline-entry with timeline entry component	Winnie Hellmann	2018-11-29	9	-372/+371
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Create shared timeline entry component	Winnie Hellmann	2018-11-29	2	-0/+51
\| \| \|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch '48496-merge-request-refactor-does-not-highlight-selected-line' ↵	Phil Hughes	2018-11-30	16	-12/+288
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Resolve "Merge request refactor does not highlight selected line" Closes #48496 See merge request gitlab-org/gitlab-ce!23121
\| * \| \| \| \| \| \| \| \|	Resolve "Merge request refactor does not highlight selected line"	Sam Bigelow	2018-11-30	16	-12/+288
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge branch 'fix-wrong-grape-version-requirement' into 'master'	Stan Hu	2018-11-30	3	-3/+3
\|\ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Currently a dependency for grape `~> 1.1` is defined but gitlab does not work… See merge request gitlab-org/gitlab-ce!23451
\| * \| \| \| \| \| \| \|	Manually edited the Gemfile.lock to make the gitlab-ce pipeline happy.	Matthias Fechner	2018-11-30	2	-2/+2
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Currently a dependency for grape `~> 1.1` is defined but gitlab does not ↵	Matthias Fechner	2018-11-29	1	-1/+1
\| \| \|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	work with `grape` version `1.2` installed. Fix version of `grape` to 1.1.x.
* \| \| \| \| \| \| \|	Merge branch '50264-add-border-around-the-repository-file-tree' into 'master'	Clement Ho	2018-11-29	3	-1/+18
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Add border around the repository file tree" Closes #50264 See merge request gitlab-org/gitlab-ce!23018