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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Backport Service changes from ↵backport_slack_application_changes	Valery Sizov	2017-07-05	3	-14/+24
\| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2259
*	Merge branch 'new-nav-column-fix' into 'master'	Filipa Lacerda	2017-07-05	1	-2/+2
\|\ \| \| \| \| \| \| \| \|	Fixes the column widths for the new navigation option See merge request !12644
\| *	Fixes the column widths for the new navigation options in settings	Phil Hughes	2017-07-05	1	-2/+2
\| \|
* \|	Merge branch 'sh-fix-bad-rails-logger' into 'master'	Rémy Coutable	2017-07-05	1	-1/+1
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Fix invalid Rails.logger call in lib/gitlab/health_checks/fs_shards_check.rb See merge request !12641
\| * \|	Fix invalid Rails.logger call in lib/gitlab/health_checks/fs_shards_check.rbsh-fix-bad-rails-logger	Stan Hu	2017-07-04	1	-1/+1
\| \| \|
* \| \|	Merge branch 'sh-log-application-controller-exceptions-sentry' into 'master'	Rémy Coutable	2017-07-05	2	-0/+6
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Log rescued exceptions to Sentry See merge request !12638
\| * \| \|	Log rescued exceptions to Sentrysh-log-application-controller-exceptions-sentry	Stan Hu	2017-07-04	2	-0/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Support noticed that a number of exceptions, such as "Encoding::CompatibilityError (incompatible character encodings: UTF-8 and ASCII-8BIT)", failed to report to Sentry. The `rescue_from` in the ApplicationController prevented these exceptions from being recorded. This change ensures that these exceptions are properly captured.
* \| \| \|	Merge branch 'feature/gb/add-test-example-for-commit-status-retries' into ↵	Sean McGivern	2017-07-05	1	-0/+22
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Add test example for external commit status retries See merge request !12642
\| * \| \| \|	Add test example for external commit status retriesfeature/gb/add-test-example-for-commit-status-retries	Grzegorz Bizon	2017-07-05	1	-0/+22
\| \| \| \| \|
* \| \| \| \|	Merge branch 'fix/gb/improve-stage-id-foreign-key-migration' into 'master'	Kamil Trzciński	2017-07-05	3	-10/+41
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve stage_id foreign key migration Closes #34495 See merge request !12617
\| * \ \ \ \	Merge branch 'master' into 'fix/gb/improve-stage-id-foreign-key-migration'fix/gb/improve-stage-id-foreign-key-migration	Grzegorz Bizon	2017-07-04	29	-72/+383
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # db/schema.rb
\| * \| \| \| \| \|	Check foreign keys in migration in separate conditional	Grzegorz Bizon	2017-07-04	1	-1/+15
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Bump database schema version	Grzegorz Bizon	2017-07-04	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Improve stage_id in ci_builds foreign key migration	Grzegorz Bizon	2017-07-03	2	-9/+26
\| \| \|/ / / / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge branch '34531-remove-scroll' into 'master'	Phil Hughes	2017-07-05	5	-170/+133
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert change to design. Go back to scrollable page Closes #34531 See merge request !12587
\| * \| \| \| \| \|	Revert change to design. Go back to scrollable page	Filipa Lacerda	2017-07-05	5	-170/+133
\|/ / / / / /
* \| \| \| \| \|	Merge branch 'gitaly-submodule-url-for' into 'master'	Sean McGivern	2017-07-05	2	-5/+52
\|\ \ \ \ \ \ \| \|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Migrate #submodule_url_for to Gitaly See merge request !12629
\| * \| \| \| \|	Migrate #submodule_url_for to Gitaly	Jacob Vosmaer	2017-07-05	2	-5/+52
\| \| \|/ / / \| \|/\| \| \|
* \| \| \| \|	Merge branch 'update-raven-253' into 'master'	Sean McGivern	2017-07-05	2	-3/+3
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update sentry-raven from 2.4.0 to 2.5.3 See merge request !12605
\| * \| \| \| \|	Update sentry-raven from 2.4.0 to 2.5.3update-raven-253	Gabriel Mazetto	2017-07-03	2	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	2.5.x branch have updated performance and additional fixes
* \| \| \| \| \|	Merge branch 'dm-encode-tree-and-blob-paths' into 'master'	Rémy Coutable	2017-07-05	3	-0/+13
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix issues with non-UTF8 filenames by always fixing the encoding of tree and blob paths Closes #34529 See merge request !12636
\| * \| \| \| \| \|	Fix issues with non-UTF8 filenames by always fixing the encoding of tree and ↵dm-encode-tree-and-blob-paths	Douwe Maan	2017-07-04	3	-0/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	blob paths
* \| \| \| \| \| \|	Merge branch 'monitoring-dashboard-fine-tuning-ux' into 'master'	Phil Hughes	2017-07-05	4	-10/+26
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve the overall UX for the new monitoring dashboard See merge request !12616
\| * \| \| \| \| \|	Improve the overall UX for the new monitoring dashboardmonitoring-dashboard-fine-tuning-ux	Jose Ivan Vargas	2017-07-04	4	-10/+26
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch '34544_add_italian_translation_of_i18n' into 'master'34621-add-subgroups-limitations-to-pages-docs	Douwe Maan	2017-07-04	4	-1/+1149
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add Italian translation of Cycle Analytics Page & Project Page & Repository Page Closes #34544 See merge request !12578
\| * \| \| \| \| \| \|	fix the format of the translation string	黄涛	2017-07-03	1	-4/+4
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	fix the format of the translation string	黄涛	2017-06-30	1	-136/+137
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	add Italian translation to I18N	黄涛	2017-06-30	4	-1/+1148
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	translated of Cycle Analytics Page translated of Project Page translated of Repository Page add Changelog Closes #34544
* \| \| \| \| \| \| \|	Merge branch 'dm-always-verify-source-branch-can-be-deleted' into 'master'	Sean McGivern	2017-07-04	3	-13/+69
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prevent accidental deletion of protected MR source branch by repeating checks before actual deletion Closes #34456 See merge request !12574
\| * \| \| \| \| \| \| \|	Prevent accidental deletion of protected MR source branch by repeating ↵dm-always-verify-source-branch-can-be-deleted	Douwe Maan	2017-07-04	3	-13/+69
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	checks before actual deletion
* \| \| \| \| \| \| \| \|	Merge branch 'revert-2c879643' into 'master'	Sean McGivern	2017-07-04	5	-4/+52
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert "Merge branch 'revert-12499' into 'master'" See merge request !12633
\| * \| \| \| \| \| \| \| \|	Revert "Merge branch 'revert-12499' into 'master'"revert-2c879643	Douwe Maan	2017-07-04	5	-4/+52
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts merge request !12557
* \| \| \| \| \| \| \| \| \|	Merge branch 'bump-prometheus-version-to-fix-text-representation-problem' ↵	Grzegorz Bizon	2017-07-04	1	-2/+2
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Update prometheus client gem See merge request !12632
\| * \ \ \ \ \ \ \ \ \	Merge branch 'master' into ↵bump-prometheus-version-to-fix-text-representation-problem	Paweł Chojnacki	2017-07-04	47	-229/+1174
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'bump-prometheus-version-to-fix-text-representation-problem' # Conflicts: # Gemfile.lock
\| * \| \| \| \| \| \| \| \| \|	Update prometheus client gem	Pawel Chojnacki	2017-07-04	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'dm-9-3-requires-mysql-trigger' into 'master'	Sean McGivern	2017-07-04	3	-6/+15
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Document that GitLab 9.3 requires the TRIGGER permission on MySQL Closes #34358 See merge request !12573
\| * \| \| \| \| \| \| \| \| \| \|	Document that GitLab 9.3 requires the TRIGGER permission on MySQLdm-9-3-requires-mysql-trigger	Douwe Maan	2017-07-04	3	-6/+15
\| \| \|_\|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'feature/no-hypen-at-end-of-commit-ref-slug' into 'master'	Rémy Coutable	2017-07-04	4	-10/+21
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	no trailing / leading hyphens in CI_COMMIT_REF_SLUG. Closes #32035 See merge request !11218
\| * \| \| \| \| \| \| \| \| \|	updated changelog entry	Stefan Hanreich	2017-06-27	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	chaining the methods in ref_slug	Stefan Hanreich	2017-06-24	1	-3/+4
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	fixed incorrect test case (for real), added another one	Stefan Hanreich	2017-06-19	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	fixed incorrect test case	Stefan Hanreich	2017-06-19	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Merge branch 'feature/no-hypen-at-end-of-commit-ref-slug' of ↵	Stefan Hanreich	2017-06-18	0	-0/+0
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	gitlab.com:lawli3t/gitlab-ce into feature/no-hypen-at-end-of-commit-ref-slug
\| \| * \| \| \| \| \| \| \| \| \|	added additional test case	Stefan Hanreich	2017-06-18	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	using bang method for gsub	Stefan Hanreich	2017-05-11	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	remove trailing comma	Stefan Hanreich	2017-05-11	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	fix typo	Stefan Hanreich	2017-05-11	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	removed superfluos tests	Stefan Hanreich	2017-05-11	1	-7/+1
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	updated regex to use beginning / ending of string metacharacters	Stefan Hanreich	2017-05-11	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	Merge branch 'feature/no-hypen-at-end-of-commit-ref-slug' of ↵	Stefan Hanreich	2017-05-11	0	-0/+0
\| \| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	gitlab.com:lawli3t/gitlab-ce into feature/no-hypen-at-end-of-commit-ref-slug