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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'fix-8.17-upgrade-process' into 'master'	Alfredo Sumaran	2017-02-16	1	-0/+1
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Fix 8.17 upgrade documentation Closes #28021 See merge request !9285
\| *	move "Install node modules" step before "Migrate DB" within update process	Mike Greiling	2017-02-16	1	-1/+1
\| \|
\| *	update migration docs for 8.17 to include minimum node version	Mike Greiling	2017-02-16	1	-0/+1
\| \|
* \|	Merge branch 'fix/import-hooks' into 'master'	Rémy Coutable	2017-02-16	3	-32/+5
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix import webhooks performance issue Closes #27958 See merge request !9197
\| * \|	Use gitlab shell import instead of manually creating the webhooks	James Lopez	2017-02-16	3	-32/+5
\| \| \| \| \| \| \| \| \| \| \| \|	Also update repo restorer to use project wiki method.
* \| \|	Merge branch 'snippets-search-performance' into 'master'	Yorick Peterse	2017-02-16	1	-2/+2
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reduce query count for snippet search See merge request !9254
\| * \| \|	Reduce query count for snippet searchsnippets-search-performance	Phil Hughes	2017-02-16	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Recudes the number of queries within the snippet search from approx. 50 to approx. 14 by preloading the authors Part of #27392
* \| \| \|	Merge branch ↵	Rémy Coutable	2017-02-16	1	-1/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'27873-when-a-commit-appears-in-several-projects-commit-comments-are-shared-across-projects' into 'master' Ensure only commit comments relevant to target project are returned Closes #27873 See merge request !9264
\| * \| \| \|	Ensure only commit comments relevant to target project are returned	Mark Fletcher	2017-02-15	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Merge branch 'add-auto-submited-header' into 'master'	Sean McGivern	2017-02-16	1	-0/+8
\|\ \ \ \ \ \| \|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Set `Auto-Submitted: auto-generated` header to emails Closes #20305 See merge request !9163
\| * \| \| \|	Set `Auto-Submitted: auto-generated` header to emails	Semyon Pupkov	2017-02-15	1	-0/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/20305
* \| \| \| \|	Merge branch 'move_tags_service_to_namespace' into 'master'	Rémy Coutable	2017-02-15	1	-2/+2
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move tag services to `Tags` namespace See merge request !9231
\| * \| \| \| \|	Move tag services to `Tags` namespace	dixpac	2017-02-14	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CreateTagService and DeleteTagService where in root namespace, by following service code organization I moved them in Tags::CreateService and Tags::DestroyService
* \| \| \| \| \|	Merge branch 'add-missing-api-entities' into 'master'	Rémy Coutable	2017-02-15	1	-17/+18
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add missing api entities Closes #23895 See merge request !7138
\| * \| \| \| \| \|	entities: use the RepoCommit entity for branch commits	Ben Boeckel	2017-02-14	1	-17/+18
\| \| \|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes #23895.
* \| \| \| \| \|	Merge branch 'fix-github-import-MR-wrong-project' into 'security'	Robert Speicher	2017-02-15	1	-3/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix labels being applied to wrong merge requests on GitHub import See https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2064
* \| \| \| \| \|	Merge branch 'fix-rdoc-xss' into 'security'	Robert Speicher	2017-02-15	1	-0/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix XSS in rdoc and other markups See https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2058
* \| \| \| \| \|	Merge branch 'asciidoctor-xss-patch' into 'security'	Robert Speicher	2017-02-15	1	-0/+3
\| \|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add sanitization filter to asciidocs output to prevent XSS See https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2057
* \| \| \| \|	Merge branch 'dz-nested-groups-improvements-3' into 'master'	Dmitriy Zaporozhets	2017-02-15	6	-6/+6
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Nested groups improvements pt 3 See merge request !9227
\| * \ \ \ \	Merge branch 'master' into 'dz-nested-groups-improvements-3'	Dmitriy Zaporozhets	2017-02-14	7	-61/+48
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # doc/api/projects.md
\| * \| \| \| \| \|	Use Namespace#full_path instead of Namespace#path	Dmitriy Zaporozhets	2017-02-14	5	-5/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \|	Expose Namespace#full_path in namespaces API	Dmitriy Zaporozhets	2017-02-14	1	-1/+1
\| \| \|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \|	Merge branch 'pass_coverage_value_to_commit_status_api' into 'master'	Rémy Coutable	2017-02-15	2	-2/+4
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make it possible to pass coverage value to commit status API Closes #27807 See merge request !9214
\| * \| \| \| \| \|	Make it possible to pass coverage value to commit status API	wendy0402	2017-02-14	2	-2/+4
\| \| \|_\|/ / / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge branch '27759-fix-sidekiq_status-client_middleware-issue' into 'master'	Robert Speicher	2017-02-14	2	-2/+2
\|\ \ \ \ \ \ \| \|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	SidekiqStatus need to be qualified in some cases Closes #27759 See merge request !9235
\| * \| \| \| \|	SidekiqStatus need to be qualified in some cases27759-fix-sidekiq_status-client_middleware-issue	Rémy Coutable	2017-02-14	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \|	Merge branch 'replace-npm-with-yarn' into 'master'	Filipa Lacerda	2017-02-14	2	-2/+2
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Replace NPM with Yarn See merge request !9055
\| * \| \| \| \|	replace npm run calls with yarn	Mike Greiling	2017-02-13	2	-2/+2
\| \| \| \| \| \|
* \| \| \| \| \|	API: Consolidate /projects endpoint	Toon Claes	2017-02-14	3	-55/+15
\| \|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	It consolidates these endpoints: - /projects - /projects/owned - /projects/visible - /projects/starred - /projects/all Into the /projects endpoint using query parameters.
* \| \| \| \|	Merge branch 'create-connection-pool' into 'master'	Yorick Peterse	2017-02-14	1	-0/+25
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Introduce Gitlab::Database.with_connection_pool See merge request !9192
\| * \| \| \| \|	Only ensure against yield so that pool should be availablecreate-connection-pool	Lin Jen-Shin	2017-02-14	1	-4/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9192#note_23293693
\| * \| \| \| \|	Have some simple way to create connection pool	Lin Jen-Shin	2017-02-14	1	-0/+24
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch '14492-change-fork-endpoint' into 'master'	Sean McGivern	2017-02-14	1	-1/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move /projects/fork/:id to /projects/:id/fork in V4 API Closes #14492 See merge request !8940
\| * \| \| \| \| \|	Move /projects/fork/:id to /projects/:id/fork14492-change-fork-endpoint	Oswaldo Ferreira	2017-02-13	1	-1/+1
\| \| \|_\|/ / / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge branch 'fix-ar-connection-leaks' into 'master'	Rémy Coutable	2017-02-14	1	-1/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix ActiveRecord connection leaks Closes #27949 and gitlab-com/infrastructure#1139 See merge request !9109
\| * \| \| \| \| \|	Don't connect in Gitlab::Database.adapter_namefix-ar-connection-leaks	Yorick Peterse	2017-02-13	1	-1/+1
\| \| \|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We don't need to connect when requesting the name of the database adapter. This in turn should prevent us from requesting/leaking connections just by asking whether we're using PostgreSQL or MySQL.
* \| \| \| \| \|	Merge branch '22645-add-discussion-contribs-to-calendar' into 'master'	Sean McGivern	2017-02-14	1	-2/+4
\|\ \ \ \ \ \ \| \|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add discussion events to contributions calendar Closes #22645 See merge request !8821
\| * \| \| \| \|	Add comment events to contributions calendar22645-add-discussion-contribs-to-calendar	Rémy Coutable	2017-02-13	1	-2/+4
\| \| \|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \|	Add GFM support to nested groupsdz-nested-groups-gfm-alt	Dmitriy Zaporozhets	2017-02-13	3	-4/+8
\| \|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \|	Merge branch '22818-licence-gitignore-and-yml-endpoints-removal' into 'master'	Rémy Coutable	2017-02-13	3	-56/+162
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove deprecated templates endpoints in V4 Closes #22818 See merge request !8853
\| * \| \|	Remove deprecated templates endpoints in V422818-licence-gitignore-and-yml-endpoints-removal	Oswaldo Ferreira	2017-02-13	3	-56/+162
\| \|/ /
* \| \|	Merge branch 'rs-rubocop-rspec' into 'master'	Rémy Coutable	2017-02-13	1	-1/+1
\|\ \ \ \| \|/ / \|/\| \| \| \| \| \| \| \|	Enable Style/RedundantException, Lint/EmptyWhen, and RSpec/ExpectActual cops See merge request !9151
\| * \|	Enable `Lint/EmptyWhen` cop and correct offense	Robert Speicher	2017-02-13	1	-1/+1
\| \|/
* \|	Merge branch 'fix/cycle-analytics-events-limit' into 'master'	Sean McGivern	2017-02-13	1	-1/+3
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Add limit to the number of events showed in cycle analytics See merge request !7743
\| * \|	move query limit to base event fetcher	James Lopez	2017-02-06	1	-1/+3
\| \| \|
* \| \|	Merge branch '24976-start-of-line-mention' into 'master'	Sean McGivern	2017-02-13	5	-9/+73
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Feature to create directly addressed Todos when mentioned in beginning Closes #24976 See merge request !7926
\| * \| \|	Create directly_addressed Todos when mentioned in beginning of a line	Ershad Kunnakkadan	2017-02-08	5	-9/+73
\| \| \| \|
* \| \| \|	Merge branch '20732_member_exists_409' into 'master'	Sean McGivern	2017-02-13	3	-10/+138
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add member: Always return 409 when a member exists Closes #20732 See merge request !9093
\| * \| \| \|	Add member: Always return 409 when a member exists	Jarka Kadlecova	2017-02-10	3	-10/+138
\| \| \| \| \|
* \| \| \| \|	Merge branch 'zj-drop-ruby-21-tests' into 'master'	Rémy Coutable	2017-02-13	6	-11/+9
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update Rubocop to Ruby 2.3 See merge request !8994