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

	Commit message (Collapse)	Author	Age	Files	Lines
*	[ci skip] pushzj-tst-push	Zeger-Jan van de Weg	2017-08-19	15	-1653/+2579
\|
*	Merge branch 'winh-filtered-search-dropdowns' into 'master'	Clement Ho	2017-08-18	3	-12/+20
\|\ \| \| \| \| \| \| \| \|	Make issuable filter dropdown style consistent See merge request !13421
\| *	Make issuable filter dropdown style consistent	Winnie Hellmann	2017-08-18	3	-12/+20
\|/
*	Merge branch 'repo-template-format-repo' into 'master'	Clement Ho	2017-08-18	1	-3/+6
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Correct repo.vue template Closes #36415 See merge request !13452
\| *	Correct repo.vue template	Luke "Jared" Bennett	2017-08-18	1	-3/+6
\|/
*	Merge branch 'dm-commit-cache-i18n' into 'master'	Robert Speicher	2017-08-18	2	-1/+6
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Add current locale to commit partial cache key Closes #36591 See merge request !13669
\| *	Describe what, not how, in changelog.dm-commit-cache-i18n	Douwe Maan	2017-08-18	1	-1/+1
\| \| \| \| \| \| \| \|	[ci skip]
\| *	Add current locale to commit partial cache key	Douwe Maan	2017-08-18	2	-1/+6
\| \|
* \|	Merge branch ↵	Stan Hu	2017-08-18	2	-3/+3
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'pawel/update_prometheus_client_gem_to_improve_performance_when_rendering_metrics' into 'master' Update prometheus mmap client library to fix performance issues when rendering many metrics. See merge request !13674
\| * \|	Update prometheus mmap client library to fix performance issues when ↵pawel/update_prometheus_client_gem_to_improve_performance_when_rendering_metrics	Pawel Chojnacki	2017-08-18	2	-3/+3
\|/ / \| \| \| \| \| \|	rendering many metrics.
* \|	Merge branch 'docs/clearcase' into 'master'	Marcia Ramos	2017-08-18	2	-0/+48
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Migrating from Clearcase docs See merge request !13569
\| * \|	Add docs: migrating from Clearcase to Git/GitLabdocs/clearcase	Achilleas Pipinellis	2017-08-18	2	-0/+48
\| \|/
* \|	Merge branch ↵	Grzegorz Bizon	2017-08-18	2	-1/+24
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'36630-activerecord-statementinvalid-pg-notnullviolation-error-null-value-in-column-a_mode-violates-not-null-constraint' into 'master' Resolve "ActiveRecord::StatementInvalid: PG::NotNullViolation: ERROR: null value in column "a_mode" violates not-null constraint" Closes #36630 See merge request !13663
\| * \|	Fix MR diffs background migration when file modes are missing36630-activerecord-statementinvalid-pg-notnullviolation-error-null-value-in-column-a_mode-violates-not-null-constraint	Sean McGivern	2017-08-18	2	-1/+24
\| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Guess the modes based on the following: 1. If the file didn't exist, it's zero. 2. If the diff contains 'Subproject commit', it might be a submodule, so 0600. 3. Otherwise, it's 0644. This isn't perfect, but it doesn't have to be - it won't change file modes in the repository.
* \|	Merge branch ↵	Achilleas Pipinellis	2017-08-18	1	-0/+4
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'docs/sm/36543-describe-supported-version-in-group_level_variables' into 'master' Describe the supported version of group-level variables API in document Closes #36543 See merge request !13648
\| * \|	Describe the supported version of group-level variables API in document	Shinya Maeda	2017-08-18	1	-0/+4
\|/ /
* \|	Merge branch 'docs/sm/fix_project_snippets_md' into 'master'	Achilleas Pipinellis	2017-08-18	1	-1/+1
\|\ \ \| \|/ \|/\| \| \| \| \|	Update project_snippets.md See merge request !13654
\| *	Update project_snippets.mddocs/sm/fix_project_snippets_md	Shinya Maeda	2017-08-18	1	-1/+1
\| \|
* \|	Merge branch 'gitaly_ref_exists' into 'master'	Sean McGivern	2017-08-18	8	-28/+106
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Client Implementation: RefService::RefExists Closes gitaly#452 See merge request !13528
\| * \|	Client Implementation: RefService::RefExistsgitaly_ref_exists	Andrew Newdigate	2017-08-18	8	-28/+106
\| \|/
* \|	Merge branch '36648-fix-backoff-util-tests' into 'master'	Phil Hughes	2017-08-18	2	-29/+31
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix unnecessarily long gl.utils.backOff test Closes #36648 See merge request !13651
\| * \|	fix unnecessarily long gl.utils.backOff test36648-fix-backoff-util-tests	Mike Greiling	2017-08-18	2	-29/+31
\| \| \|
* \| \|	Merge branch '32795-project-activity-i18n' into 'master'	Phil Hughes	2017-08-18	6	-18/+170
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add support for i18n on Project Activity Page Closes #32795 See merge request !13451
\| * \| \|	Add support for i18n on Project Activity Page	Kushal Pandya	2017-08-18	6	-18/+170
\|/ / /
* \| \|	Merge branch 'mk-setup-settings-properly' into 'master'	Douwe Maan	2017-08-18	2	-1/+34
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Setup settings properly See merge request !13645
\| * \| \|	Setup repositories settings properlymk-setup-settings-properly	Michael Kozono	2017-08-17	2	-1/+14
\| \| \| \|
\| * \| \|	Setup LDAP settings properly	Michael Kozono	2017-08-17	2	-0/+20
\| \| \| \|
* \| \| \|	Merge branch '36041-notification-title' into 'master'	Douwe Maan	2017-08-18	6	-43/+62
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't escape html entities in InlineDiffMarkdownMarker Closes #36041 See merge request !13553
\| * \| \|	Don't escape html entities when rich == raw line36041-notification-title	Jarka Kadlecova	2017-08-17	6	-43/+62
\| \| \| \|
* \| \| \|	Merge branch 'gitaly-apply-gitattributes' into 'master'	Sean McGivern	2017-08-18	4	-27/+124
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Gitaly apply gitattributes Closes gitaly#464 See merge request !13517
\| * \| \| \|	Incorporate RepositoryService.ApplyGitattributes Gitaly RPCgitaly-apply-gitattributes	Alejandro Rodríguez	2017-08-17	4	-27/+61
\| \| \| \| \|
\| * \| \| \|	Add GitalyClient::RepositoryService specs	Alejandro Rodríguez	2017-08-17	1	-0/+63
\| \| \| \| \|
* \| \| \| \|	Merge branch 'rename-repo-enabled' into 'master'	Phil Hughes	2017-08-18	2	-10/+6
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Updates for proper obj notation. See merge request !13430
\| * \| \| \| \|	use proper object notation and rename isNewRepo to isNewRepoEnabledrename-repo-enabled	Mike Greiling	2017-08-17	2	-10/+6
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'tc-git-tower-pagination-links' into 'master'	Grzegorz Bizon	2017-08-18	3	-10/+64
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	API: do not set rel="next" pagination header when no records found Closes #36618 See merge request !13629
\| * \| \| \| \| \|	Total Pages should be at least onetc-git-tower-pagination-links	Toon Claes	2017-08-17	2	-7/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	And the link to the last page cannot be `page=0`.
\| * \| \| \| \| \|	Add specs for pagination Link header	Toon Claes	2017-08-17	2	-4/+52
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add specs that check the 'Link' header for the inclusion of: - rel="first" - rel="last" - rel="prev" - rel="next" Fixes gitlab-org/gitlab-ce#36618 Related to gitlab-com/infrastructure#2532
\| * \| \| \| \| \|	don't add next page link if current page is out of range	Jordan Patterson	2017-08-17	1	-1/+1
\| \| \|/ / / / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge branch '36611-error-in-getcomposer-link' into 'master'	🏖 Rémy Coutable 🏖	2017-08-18	2	-1/+6
\|\ \ \ \ \ \ \| \|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix external link to Composer website Closes #36611 See merge request !13621
\| * \| \| \| \|	Fix external link to Composer website	Mark Fletcher	2017-08-17	2	-1/+6
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'winh-admin-user-actions-dropdown' into 'master'	Clement Ho	2017-08-17	3	-1/+9
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make admin user actions dropdown consistent See merge request !13630
\| * \| \| \| \| \|	Make admin user actions dropdown consistentwinh-admin-user-actions-dropdown	winh	2017-08-17	3	-1/+9
\| \|/ / / / /
* \| \| \| \| \|	Merge branch '36448-smiles-are-broken-in-9-5-0-rc2' into 'master'	Clement Ho	2017-08-17	1	-1/+2
\|\ \ \ \ \ \ \| \|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes the blown up emoji problem in notes Closes #36448 and #36282 See merge request !13632
\| * \| \| \| \|	Fixes the blown up emoji problem in notes	Tim Zallmann	2017-08-17	1	-1/+2
\|/ / / / /
* \| \| \| \|	Merge branch 'docs/docker-entrypoint' into 'master'	Marcia Ramos	2017-08-17	1	-17/+23
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Properly explain when advanced Docker options were introduced See merge request !13608
\| * \| \| \| \|	Properly explain when advanced Docker options were introduceddocs/docker-entrypoint	Achilleas Pipinellis	2017-08-16	1	-17/+23
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'docs-article-undo-things-in-git' into 'master'	Marcia Ramos	2017-08-17	6	-52/+551
\|\ \ \ \ \ \ \| \|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Docs: article - "Numerous undo possibilities in Git" Closes gitlab-com/community-writers#40 See merge request !13513
\| * \| \| \| \|	Fix conflictdocs-article-undo-things-in-git	Marcia Ramos	2017-08-17	650	-4524/+9990
\| \|\ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'master' into 'docs-article-undo-things-in-git' # Conflicts: # doc/articles/index.md
* \| \| \| \| \|	Merge branch 'docs/importing-refactor' into 'master'	Marcia Ramos	2017-08-17	31	-518/+526
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move workflow/importing/ to user/project/import/ See merge request !13593
\| * \| \| \| \| \|	Move workflow/importing/ to user/project/import/	Achilleas Pipinellis	2017-08-17	31	-518/+526
\| \| \|/ / / / \| \|/\| \| \| \|