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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch '41666-cannot-search-with-keyword-merge' into 'master'	Rémy Coutable	2018-01-16	3	-13/+35
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Cannot search with keyword "merge"" Closes #41666 See merge request gitlab-org/gitlab-ce!16462
\| *	Only highlight search results under the highlighting size limit41666-cannot-search-with-keyword-merge	Sean McGivern	2018-01-16	1	-0/+7
\| \| \| \| \| \| \| \| \| \| \| \|	We should use this limit everywhere, but especially in project search results, where we could be highlighting very long single lines. (Typical examples: minified JavaScript, and JSON data files.)
\| *	Fix project search results for digits surrounded by colons	Sean McGivern	2018-01-16	2	-13/+28
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	A file containing /:\d+:/ in its contents would break the search results if those contents were part of the results, because we were splitting on colons, which can't work with untrusted input. Changing to use the null byte as a separator is much safer.
* \|	Enables Project Milestone Deletion via API	Jacopo	2018-01-16	1	-0/+40
\| \| \| \| \| \| \| \|	Enables project milestone deletion via DELETE /projects/:id/milestones/:milestone_id
* \|	Merge branch 'issue_41460' into 'master'	Sean McGivern	2018-01-16	1	-17/+25
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix error on changes tab when merge request cannot be created Closes #41460 See merge request gitlab-org/gitlab-ce!16409
\| * \|	Fix error on changes tab when merge request cannot be createdissue_41460	Felipe Artur	2018-01-15	1	-17/+25
\| \| \|
* \| \|	Merge branch ↵	Rémy Coutable	2018-01-16	1	-0/+4
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'42074-rspec-spec-lib-gitlab-background_migration-deserialize_merge_request_diffs_and_commits_spec-rb-spec-services-system_note_service_spec-rb-fails' into 'master' Resolve "rspec spec/lib/gitlab/background_migration/deserialize_merge_request_diffs_and_commits_spec.rb spec/services/system_note_service_spec.rb fails" Closes #42074 See merge request gitlab-org/gitlab-ce!16487
\| * \| \|	Prevent background migration spec from polluting later models	Sean McGivern	2018-01-16	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	If the schema changes after 20171114162227 for any of these models, and specs after this one use factories, then those factories will use the models with outdated column information cached. We shouldn't really use factories in migration specs, but this is a special case because there is a lot of git-related setup code in the model that would be painful to copy to the migration. Instead, we just manually reset the column information for the models we could pollute.
* \| \| \|	Merge branch 'mr-status-box-update' into 'master'	Filipa Lacerda	2018-01-16	2	-4/+48
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed merge request status badge not updating after merging See merge request gitlab-org/gitlab-ce!16470
\| * \| \| \|	fixed merge request specs	Phil Hughes	2018-01-16	1	-2/+2
\| \| \| \| \|
\| * \| \| \|	Fixed merge request status badge not updating after mergingmr-status-box-update	Phil Hughes	2018-01-15	2	-2/+46
\| \| \| \| \|
* \| \| \| \|	Merge branch 'feature/migrate-commit-uri-to-gitaly' into 'master'	Sean McGivern	2018-01-16	1	-7/+17
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Migrate Commit#uri_type to Gitaly Closes gitaly#915 See merge request gitlab-org/gitlab-ce!16453
\| * \| \| \| \|	Migrate Commit#uri_type to Gitalyfeature/migrate-commit-uri-to-gitaly	Ahmad Sherif	2018-01-15	1	-7/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes gitaly#915
* \| \| \| \| \|	Merge branch '36571-ignore-root-in-repo' into 'master'	Sean McGivern	2018-01-16	1	-0/+12
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Error while searching for text starting with slash "/"" Closes #36571 See merge request gitlab-org/gitlab-ce!16455
\| * \| \| \| \| \|	Move Regexp.escape(), fix formatting on tests.	Andrew McCallum	2018-01-16	1	-2/+2
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Account for query of only forward slash(es).	Andrew McCallum	2018-01-15	1	-0/+7
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Fix spelling mistake.	Andrew McCallum	2018-01-15	1	-2/+2
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Add scenario of searching within context of repository with root slash to tests.	Andrew McCallum	2018-01-15	1	-0/+5
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'issue-30101' into 'master'	Rémy Coutable	2018-01-16	1	-1/+1
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update 'removed assignee' note to include old assignee reference Closes #30101 See merge request gitlab-org/gitlab-ce!16301
\| * \| \| \| \| \|	Update 'removed assignee' note to include old assignee reference	Maurizio De Santis	2018-01-09	1	-1/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'sh-optimize-ci-build-project' into 'master'	Grzegorz Bizon	2018-01-16	2	-0/+14
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ensure CI pipelines and builds have the correction project associations See merge request gitlab-org/gitlab-ce!16448
\| * \| \| \| \| \| \|	Add specs for CI builds and pipeline relationshipssh-optimize-ci-build-project	Stan Hu	2018-01-14	2	-0/+14
\| \| \|_\|/ / / / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge branch '1819-override-ce' into 'master'	Rémy Coutable	2018-01-15	1	-0/+158
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CE: Override module to specify that we're overriding See merge request gitlab-org/gitlab-ce!16131
\| * \ \ \ \ \ \	Merge remote-tracking branch 'upstream/master' into 1819-override-ce	Lin Jen-Shin	2018-01-12	284	-1912/+7176
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* upstream/master: (621 commits) Add a note about GitLab QA page objects validator to docs Refactor dispatcher projects blame and blob path Update export message to mention we can download the file from the UI Fix Ctrl+Enter keyboard shortcut saving comment/note edit fix case where tooltip messes up :last-child selector Add reason to keep postgresql 9.2 for CI Remove warning noise in ProjectImportOptions Add changelog entry Add RedirectRoute factory Update Ingress extra cost note to be more generic Fix Rubocop offense Refactor dispatcher project branches path Revert "Revert "Fix Route validation for unchanged path"" Document that we need rsync for backing up Docs: move article "Laravel and Envoy w/ CI/CD" Recommend against the use of EFS Adds Rubocop rule for line break around conditionals Update CHANGELOG.md for 10.1.6 Filter out build traces from logged parameters Refactored project:n* imports in dispatcher.js ...
\| * \| \| \| \| \| \| \|	Use `Gitlab::Utils::Override` over defined?(super)	Lin Jen-Shin	2017-12-26	1	-0/+158
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch '19493-fork-does-not-protect-default-branch' into 'master'	Douwe Maan	2018-01-15	1	-0/+8
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make forking protect default branch on completion Closes #19493 See merge request gitlab-org/gitlab-ce!16449
\| * \| \| \| \| \| \| \| \|	Fork now protects default branch on completion19493-fork-does-not-protect-default-branch	Tiago Botelho	2018-01-15	1	-0/+8
\| \| \|_\|/ / / / / / \| \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'feature/migrate-import-repository-to-gitaly' into 'master'	Robert Speicher	2018-01-15	1	-20/+36
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Migrate importing repository to Gitaly Closes gitaly#907 See merge request gitlab-org/gitlab-ce!16431
\| * \| \| \| \| \| \| \|	Migrate importing repository to Gitalyfeature/migrate-import-repository-to-gitaly	Ahmad Sherif	2018-01-15	1	-20/+36
\| \| \|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes gitaly#907
* \| \| \| \| \| \| \|	Resolve "Managed Prometheus deployment installs a lot of extra stuff"	Mayra Cabrera	2018-01-15	2	-4/+25
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'stop-gitaly-atexit' into 'master'	Rémy Coutable	2018-01-15	2	-9/+3
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use an at_exit hook to stop test gitaly Closes #41991 See merge request gitlab-org/gitlab-ce!16433
\| * \| \| \| \| \| \| \|	Use an at_exit hook to stop test gitalystop-gitaly-atexit	Jacob Vosmaer	2018-01-15	2	-9/+3
\| \|/ / / / / / /
* \| \| \| \| \| \| \|	Merge branch '41856-backport-stacked-progress-bar' into 'master'	Phil Hughes	2018-01-15	1	-0/+77
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backport StackedProgressBar component from GitLab EE Closes #41856 See merge request gitlab-org/gitlab-ce!16457
\| * \| \| \| \| \| \|	StackedProgressBar Component tests	Kushal Pandya	2018-01-15	1	-0/+77
\| \| \|/ / / / / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge branch '42025-fix-issue-api' into 'master'	Sean McGivern	2018-01-15	1	-0/+9
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[API] Fix creating issue when assignee_id is empty See merge request gitlab-org/gitlab-ce!16458
\| * \| \| \| \| \| \|	[API] Fix creating issue when assignee_id is empty42025-fix-issue-api	Valery Sizov	2018-01-15	1	-0/+9
\| \| \|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	see https://gitlab.com/gitlab-org/gitlab-ce/issues/42025
* \| \| \| \| \| \|	Merge branch '41970-job-play-button' into 'master'	Kamil Trzciński	2018-01-15	1	-3/+11
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Empty state for manual job - play button does not work" Closes #41970 See merge request gitlab-org/gitlab-ce!16426
\| * \| \| \| \| \|	Remove extra period41970-job-play-button	Filipa Lacerda	2018-01-12	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Improve tests	Filipa Lacerda	2018-01-12	1	-2/+6
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Sets method post for playing action	Filipa Lacerda	2018-01-12	1	-2/+6
\| \| \|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removes explanation text for non triggered job Adds tests
* \| \| \| \| \|	Fixing request json mime type	Francisco Javier López	2018-01-15	1	-0/+10
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'sh-log-when-user-blocked' into 'master'	Douwe Maan	2018-01-15	2	-0/+66
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Log and send a system hook if a blocked user attempts to login Closes #41633 See merge request gitlab-org/gitlab-ce!16451
\| * \| \| \| \| \|	Log and send a system hook if a blocked user fails to loginsh-log-when-user-blocked	Stan Hu	2018-01-14	2	-0/+66
\| \| \|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #41633
* \| \| \| \| \|	Merge branch 'feature/migrate-can-be-merged-to-gitaly' into 'master'	Grzegorz Bizon	2018-01-15	3	-45/+80
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Migrate Repository#can_be_merged? to Gitaly Closes gitaly#893 See merge request gitlab-org/gitlab-ce!16316
\| * \| \| \| \|	Migrate Repository#can_be_merged? to Gitalyfeature/migrate-can-be-merged-to-gitaly	Ahmad Sherif	2018-01-11	3	-45/+80
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch '16988-use-toggle-for-subscribed-unsubscribed-to-notifications' ↵	Annabel Dunstone Gray	2018-01-12	3	-22/+20
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Resolve "Use toggle for subscribed/unsubscribed to notifications" Closes #16988 See merge request gitlab-org/gitlab-ce!16408
\| * \| \| \| \| \|	update capybara specs for subscription toggle	Mike Greiling	2018-01-12	2	-16/+14
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	update karma tests	Mike Greiling	2018-01-12	1	-6/+6
\| \| \|_\|_\|_\|/ \| \|/\| \| \| \|
* \| \| \| \| \|	Display related merge requests in commit detail page	Hiroyuki Sato	2018-01-12	4	-0/+128
\| \| \| \| \| \|
* \| \| \| \| \|	Merge remote-tracking branch 'upstream/master' into 41731-predicate-memoization	Lin Jen-Shin	2018-01-13	5	-13/+123
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* upstream/master: Docs: move article "Autoscaling Runners on AWS" to its topic-related dir Update missing API documentation on `GET /users/:id/projects` Docs: remove duplicate CI examples Only search for MR revert commits on notes after MR was merged Added .rej files to gitignore Fixed performance of projects dropdown Add a note about GitLab QA page objects validator to docs Refactor dispatcher projects blame and blob path Fix Ctrl+Enter keyboard shortcut saving comment/note edit Fix boolean prop being provided as string Fixes minor aspects on Prometheus description Refactor dispatcher project branches path Use simple Next/Prev paging for jobs to avoid large count queries on arbitrarily large sets of historical jobs Update the grpc gem to 1.8.3