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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Invalidate cache for issue and MR counters more granularlycounters_cache_invalidation	Valery Sizov	2017-05-15	4	-2/+49
\|
*	Merge branch 'allow_numeric_values_in_gitlab_ci_yml' into 'master'	Kamil Trzciński	2017-05-15	6	-4/+30
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Allow numeric values in gitlab-ci.yml Closes #30017 See merge request !10607
\| *	Allow numeric values in gitlab-ci.yml	blackst0ne	2017-05-07	6	-4/+30
\| \|
* \|	Merge branch 'rename-column-concurrently-defaults' into 'master'	Rémy Coutable	2017-05-15	2	-3/+11
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Fix adding defaults for concurrent column renames See merge request !11335
\| * \|	Fix adding defaults for concurrent column renamesrename-column-concurrently-defaults	Yorick Peterse	2017-05-12	2	-3/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	By adding the default value _after_ adding the column we avoid updating all rows in a table, saving a lot of time and unnecessary work in the process.
* \| \|	Merge branch 'add-balsamiq-integration-test' into 'master'	Phil Hughes	2017-05-15	8	-48/+119
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added balsamiq jasmine integration test Closes #31889 See merge request !11257
\| * \| \|	Added balsamiq jasmine integration test	Luke "Jared" Bennett	2017-05-15	8	-48/+119
\|/ / /
* \| \|	Merge branch 'dturner/username' into 'master'	Rémy Coutable	2017-05-15	4	-0/+8
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	add username field to push webhook Closes #32136 See merge request !11272
\| * \| \|	Add username field to push webhook	David Turner	2017-05-10	4	-0/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: David Turner <novalis@novalis.org>
* \| \| \|	Merge branch 'master' into 'master'	Rémy Coutable	2017-05-15	1	-1/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix typo in code snippet to match text below See merge request !11101
\| * \| \| \|	Fix typo in code snippet to match text below	Steve Hall	2017-05-04	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Merge branch 'patch-18' into 'master'	Rémy Coutable	2017-05-15	1	-1/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix the GitLab EE link See merge request !11021
\| * \| \| \| \|	Fix the GitLab EE link	Sota Yamashita	2017-05-02	1	-1/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'patch-8' into 'master'	Rémy Coutable	2017-05-15	1	-1/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix $CI_JOB_ID variable See merge request !10966
\| * \| \| \| \| \|	fix $CI_JOB_ID variable	Elan Ruusamäe	2017-04-27	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	introduced with rename variables commit: a084437b5c1b7226ce64e74bab1972bb1dbd49e0
* \| \| \| \| \| \|	Merge branch 'fix/support-commit-deltas-only-for-gitaly' into 'master'	Robert Speicher	2017-05-14	7	-58/+99
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fetch commit deltas from Gitaly Closes gitaly#199 See merge request !11122
\| * \| \| \| \| \| \|	Add support for deltas_only under Gitaly	Ahmad Sherif	2017-05-13	7	-58/+99
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes gitaly#199
* \| \| \| \| \| \| \|	Merge branch 'use-common-vue-for-pipeline-schedule-bundles' into 'master'	Filipa Lacerda	2017-05-14	3	-4/+7
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ensure schedule_form and schedules_index both utilize common_vue bundle See merge request !11274
\| * \| \| \| \| \| \| \|	ensure schedule_form and schedules_index both utilize common_vue bundleuse-common-vue-for-pipeline-schedule-bundles	Mike Greiling	2017-05-12	3	-4/+7
\| \| \|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch '26325-system-hooks' into 'master'	Robert Speicher	2017-05-13	19	-11/+230
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backport New SystemHook: `repository_update` Closes #26325 See merge request !11140
\| * \| \| \| \| \| \| \|	Codestyle	Gabriel Mazetto	2017-05-13	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Minor cosmetic fixes in hooks admin screen	Gabriel Mazetto	2017-05-12	2	-4/+4
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Documentation for repository_update_events	Gabriel Mazetto	2017-05-12	1	-1/+49
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Changelog	Gabriel Mazetto	2017-05-12	1	-0/+4
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Update SystemHooks API to expose and handle new repository_update_events	Gabriel Mazetto	2017-05-12	3	-3/+5
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Make the new repository_update_events configurable in System Hooks UI	Gabriel Mazetto	2017-05-12	6	-2/+54
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Added repository_update hook	Gabriel Mazetto	2017-05-12	10	-4/+117
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Update CHANGELOG.md for 9.1.4	Felipe Artur	2017-05-12	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \| \| \| \|	Update CHANGELOG.md for 9.1.4	Felipe Artur	2017-05-12	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \| \| \| \|	Merge branch 'dm-wait-for-requests' into 'master'	Douwe Maan	2017-05-12	2	-8/+3
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Wait for requests after each Spinach scenario instead of feature See merge request !11349
\| * \| \| \| \| \| \| \| \|	Wait for requests after each Spinach scenario instead of featuredm-wait-for-requests	Douwe Maan	2017-05-12	2	-8/+3
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Update CHANGELOG.md for 9.1.4	Felipe Artur	2017-05-12	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \| \| \| \| \|	Update CHANGELOG.md for 9.1.4	Felipe Artur	2017-05-12	9	-33/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \| \| \| \| \|	Merge branch 'add-problematic-mysql-examples' into 'master'	Sid Sijbrandij	2017-05-12	1	-2/+5
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Link to a case where we can't support MySQL Closes #32181 See merge request !11334
\| * \| \| \| \| \| \| \| \|	Link to a case where we can't support MySQLadd-problematic-mysql-examples	Yorick Peterse	2017-05-12	1	-2/+5
\| \| \|/ / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This updates the requirements guide to include a link to an issue where we discuss dropping MySQL support for nested groups. This should give users a better understanding of why we highly recommend them to use PostgreSQL instead. [ci skip]
* \| \| \| \| \| \| \| \|	Merge branch 'sh-remove-trailing-comma' into 'master'	Douwe Maan	2017-05-12	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove trailing comma in dependency linker to satisfy Rubocop See merge request !11348
\| * \| \| \| \| \| \| \| \|	Remove trailing comma in dependency linker to satisfy Rubocop	Stan Hu	2017-05-12	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch '30975-fixed-top-nav-POC' into 'master'	Annabel Dunstone Gray	2017-05-12	24	-35/+70
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add fixed positioning to top level navbar Closes #30975 See merge request !10751
\| * \| \| \| \| \| \| \| \| \|	Fix specs	Annabel Dunstone Gray	2017-05-12	3	-4/+4
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Clean up fixed navbar	Annabel Dunstone Gray	2017-05-12	3	-6/+9
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Fix specs	Annabel Dunstone Gray	2017-05-12	13	-25/+30
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Fade out border on scroll	Annabel Dunstone Gray	2017-05-12	4	-11/+14
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Add animation to navbar border	Annabel Dunstone Gray	2017-05-12	1	-2/+3
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Add nav border on scroll	Annabel Dunstone Gray	2017-05-12	2	-0/+15
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Remove trailing semicolon	Annabel Dunstone Gray	2017-05-12	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Add fixed positioning to top level navbar	Annabel Dunstone Gray	2017-05-12	9	-8/+16
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'sh-relax-backup-rake-spec' into 'master'	Stan Hu	2017-05-12	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Relax rake backup regex to handle CE and EE RCs See merge request !11345
\| * \| \| \| \| \| \| \| \| \|	Relax rake backup regex to handle CE and EE RCssh-relax-backup-rake-spec	Stan Hu	2017-05-12	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	See http://rubular.com/r/uTDlT85zW1
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'fix-conflict-resolution-with-corrupt-repos' into 'master'	Douwe Maan	2017-05-12	15	-200/+268
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix conflict resolution from corrupted upstream Closes gitlab-ee#2128 See merge request !11298
\| * \| \| \| \| \| \| \| \| \| \|	Fix conflict resolution from corrupted upstreamfix-conflict-resolution-with-corrupt-repos	Sean McGivern	2017-05-12	15	-200/+268
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	I don't know why this happens exactly, but given an upstream and fork repository from a customer, both of which required GC, resolving conflicts would corrupt the fork so badly that it couldn't be cloned. This isn't a perfect fix for that case, because the MR may still need to be merged manually, but it does ensure that the repository is at least usable. My best guess is that when we generate the index for the conflict resolution (which we previously did in the target project), we obtain a reference to an OID that doesn't exist in the source, even though we already fetch the refs from the target into the source. Explicitly setting the source project as the place to get the merge index from seems to prevent repository corruption in this way.