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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'bvl-security-9-2-remove-appearance-symlink' into 'security-9-2'	Douwe Maan	2017-07-19	3	-2/+55
\| \| \| \| \|	(security-9-2) Remove the `appearance` symlink that was previously missed See merge request !2125
*	Merge branch 'zj-drop-fk-if-exists' into 'master'	Yorick Peterse	2017-06-08	1	-1/+11
\| \| \| \| \|	Only remove FK if it exists See merge request !11828
*	Merge branch 'bvl-fix-typo-renaming-appearance' into 'security-9-2'	Douwe Maan	2017-06-07	3	-2/+59
\| \| \| \| \|	Fix typo in moving the`appearance` folder in migrations See merge request !2116
*	Merge branch 'bvl-security-9-2-28917-contain-uploads-in-system-dir' into ↵	Douwe Maan	2017-05-31	4	-0/+397
\| \| \| \| \| \| \| \| \| \| \| \| \|	'security-9-2' (security-9-2) Upload files into `public/upload/system` instead of `public/upload` See merge request !2104 Conflicts: app/validators/dynamic_path_validator.rb Fixed conflicts based on 3c7c859c359bf5d3955dd300d6861ff33af21ca7
*	Merge branch 'fix-retried-for-postgres' into 'master'	Kushal Pandya	2017-05-23	1	-4/+6
\| \| \| \| \| \| \|	Fix migrations for older PostgreSQL versions Closes #32721 See merge request !11620
*	Resolve conflicts, using changes from master	Lin Jen-Shin	2017-05-22	1	-22/+2
\|
*	Merge branch 'fix-retried-for-mysql' into 'master'9-2-stable-fix-conflicts-for-mr-11593	Timothy Andrew	2017-05-22	1	-0/+57
\| \| \| \| \| \| \| \| \| \| \|	Fixes broken MySQL migration for retried Closes #32647 See merge request !11593 Conflicts: db/post_migrate/20170503004427_upate_retried_for_ci_build.rb
*	Merge branch 'bvl-fix-already-renamed-paths' into 'master'	Douwe Maan	2017-05-19	3	-2/+155
\| \| \| \| \| \| \| \|	Fix incorrect renaming migrations Closes #32526 and #32530 See merge request !11515
*	Merge branch 'fix_set_null_false_migration' into 'master'	Yorick Peterse	2017-05-18	1	-4/+4
\| \| \| \| \| \| \|	Adding NULL:false constraint with change_column_null instead of change_column Closes #32450 See merge request !11471
*	Merge branch 'fix-issue-assignee-trigger' into 'master'	Stan Hu	2017-05-17	1	-1/+1
\| \| \| \| \| \| \|	Check if OLD is set when migrating issue assignees Closes #32439 See merge request !11461
*	Merge branch 'zj-fix-migration' into 'master'	Robert Speicher	2017-05-17	1	-0/+7
\| \| \| \| \|	Fix data migration from trigger schedules See merge request !11460
*	Merge branch 'fix_assignee_yourick_approach' into 'master'	Douwe Maan	2017-05-16	7	-53/+205
\| \| \| \| \| \|	Improve migration for Multipple issue assignee feature See merge request !11417
*	Merge branch 'retried-in-database-mysql' into 'master'	Regis Boudinot	2017-05-10	3	-0/+39
\| \| \| \| \| \| \|	Retried in database Closes #25737 See merge request !11115
*	Add Pipeline Schedules that supersedes experimental Trigger Schedule	Zeger-Jan van de Weg	2017-05-07	9	-26/+209
\|
*	Merge branch '17361-redirect-renamed-paths' into 'master'	Sean McGivern	2017-05-06	4	-0/+76
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Redirect to new project link after a rename" Closes #17361 and #30317 See merge request !11136
\| *	Resolve discussions	Michael Kozono	2017-05-05	1	-3/+2
\| \|
\| *	Fix Rubocop failures	Michael Kozono	2017-05-05	1	-1/+0
\| \|
\| *	Index redirect_routes path for LIKE	Michael Kozono	2017-05-05	2	-0/+30
\| \|
\| *	Add index for source association and for path	Michael Kozono	2017-05-05	2	-1/+26
\| \|
\| *	Redirect from redirect routes to canonical routes	Michael Kozono	2017-05-05	2	-0/+23
\| \|
* \|	Merge branch 'blackst0ne/gitlab-ce-add_system_note_for_editing_issuable'	Sean McGivern	2017-05-05	3	-1/+33
\|\ \
\| * \|	Add alias_attributes for notes	blackst0ne	2017-05-04	2	-16/+0
\| \| \|
\| * \|	Add last_edited_at and last_edited_by attributes	blackst0ne	2017-05-04	4	-1/+49
\| \| \|
* \| \|	Merge branch 'mia_backort' into 'master'	Jacob Schatz	2017-05-05	4	-1/+103
\|\ \ \ \| \|_\|/ \|/\| \| \| \| \| \| \| \|	Backport of Multiple Assignees feature See merge request !11089
\| * \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into mia_backort[ci ↵	Valery Sizov	2017-05-05	5	-1/+49
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	skip]
\| * \| \|	[Multiple issue assignee] Fix a number of specs	Valery Sizov	2017-05-05	2	-2/+2
\| \| \| \|
\| * \| \|	Backport of multiple_assignees_feature [ci skip]	Valery Sizov	2017-05-04	4	-1/+103
\| \| \| \|
* \| \| \|	Merge branch 'add-sentry-js-again-with-vue' into 'master'	Phil Hughes	2017-05-05	2	-2/+37
\|\ \ \ \ \| \|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \|	Add sentry JS See merge request !6764
\| * \| \|	Merge branch 'master' into 'add-sentry-js-again-with-vue'	Luke "Jared" Bennett	2017-05-04	4	-1/+32
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # db/schema.rb
\| * \| \| \|	clientside_sentry migration and schema changes commit	Luke "Jared" Bennett	2017-05-04	2	-1/+36
\| \| \| \| \|
\| * \| \| \|	Reset migration to head	Luke "Jared" Bennett	2017-05-04	3	-98/+0
\| \| \| \| \|
\| * \| \| \|	Merge remote-tracking branch 'origin/master' into add-sentry-js-again-with-vue	Luke "Jared" Bennett	2017-05-04	3	-1/+16
\| \|\ \ \ \ \| \| \| \|/ / \| \| \|/\| \|
\| * \| \| \|	Reset schema and migration	Luke "Jared" Bennett	2017-05-04	1	-0/+65
\| \| \| \| \|
\| * \| \| \|	Fixed schema diffs	Luke "Jared" Bennett	2017-05-03	1	-5/+6
\| \| \| \| \|
\| * \| \| \|	Updated schema.rb with patch mode	Luke "Jared" Bennett	2017-05-03	1	-7/+6
\| \| \| \| \|
\| * \| \| \|	[ci skip] Update migration to be reversible and use add_column_with_default	Luke "Jared" Bennett	2017-05-03	1	-9/+28
\| \| \| \| \|
\| * \| \| \|	Merge remote-tracking branch 'origin/master' into add-sentry-js-again-with-vue	Luke "Jared" Bennett	2017-05-03	14	-0/+82
\| \|\ \ \ \ \| \| \| \|_\|/ \| \| \|/\| \|
\| * \| \| \|	Added migration downtime tag	Luke "Jared" Bennett	2017-04-28	1	-0/+3
\| \| \| \| \|
\| * \| \| \|	Reverted false schema diffs	Luke "Jared" Bennett	2017-04-28	1	-5/+6
\| \| \| \| \|
\| * \| \| \|	Applied schema update with patch	Luke "Jared" Bennett	2017-04-28	1	-7/+8
\| \| \| \| \|
\| * \| \| \|	Revert schema.db to master	Luke "Jared" Bennett	2017-04-28	1	-11/+6
\| \| \| \| \|
\| * \| \| \|	Merge remote-tracking branch 'origin/master' into add-sentry-js-again-with-vue	Luke "Jared" Bennett	2017-04-28	4	-0/+45
\| \|\ \ \ \
\| * \| \| \| \|	Added migration	Luke "Jared" Bennett	2017-04-28	2	-1/+13
\| \| \| \| \| \|
\| * \| \| \| \|	Attempted adding separate clientside_sentry settings	Luke "Jared" Bennett	2017-04-28	1	-7/+6
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'master' into 28433-internationalise-cycle-analytics-page	Ruben Davila	2017-05-04	6	-1/+47
\|\ \ \ \ \ \ \| \| \|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: lib/gitlab/cycle_analytics/review_stage.rb lib/gitlab/cycle_analytics/staging_stage.rb lib/gitlab/cycle_analytics/test_stage.rb
\| * \| \| \| \|	Add index to last_repository_updated_at on projects	Douglas Barbosa Alexandre	2017-05-04	2	-1/+17
\| \| \| \| \| \|
\| * \| \| \| \|	Add last_repository_updated_at to projects	Douglas Barbosa Alexandre	2017-05-04	2	-1/+9
\| \| \| \| \| \|
\| * \| \| \| \|	Reject EE reserved namespace paths in CE as wellbvl-reject-ee-namespace-names	Bob Van Landuyt	2017-05-04	1	-0/+7
\| \| \|_\|_\|/ \| \|/\| \| \|
\| * \| \| \|	Fix caching large snippet HTML content on MySQL databases	Nick Thomas	2017-05-03	3	-1/+16
\| \| \|_\|/ \| \|/\| \|
* \| \| \|	More updates for translations plus small tweaks.	Ruben Davila	2017-05-04	1	-1/+1
\| \| \| \|