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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'fix/template-project-visibility' into 'master'	Douwe Maan	2018-02-14	2	-11/+13
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Respect description and visibility when creating project from template Closes #42601 See merge request gitlab-org/gitlab-ce!16820
\| *	Update projects import service	George Tsiolis	2018-02-12	2	-11/+13
\| \| \| \| \| \| \| \| \| \|	- Remove Gitlab::ImportExport::ProjectCreator from GitlabProjectsImportService - Override ::Projects::CreateService params
* \|	Resolve "Remove notification settings for groups and projects you were ↵	🙈 jacopo beschi 🙉	2018-02-14	1	-0/+1
\| \| \| \| \| \| \| \|	previously a member of"
* \|	Merge branch 'fix/remove-allow-n-plus-1-from-delete-merged-branches-service' ↵	Robert Speicher	2018-02-13	1	-11/+7
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Remove allow_n_plus_1 block from DeleteMergedBranchesService Closes #37438 and gitaly#999 See merge request gitlab-org/gitlab-ce!17058
\| * \|	Remove allow_n_plus_1 block from DeleteMergedBranchesServicefix/remove-allow-n-plus-1-from-delete-merged-branches-service	Ahmad Sherif	2018-02-12	1	-11/+7
\| \|/ \| \| \| \| \| \| \| \|	Fixes #37438 Fixes gitaly#999
* \|	Merge branch '26466-natural-sort-mrs' into 'master'	Sean McGivern	2018-02-13	1	-0/+12
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Group MR numbers on issue show page by project and namespace Closes #26466 See merge request gitlab-org/gitlab-ce!8494
\| * \|	Change issue show page to group MRs by projects and namespaces	Jeff Stubler	2018-02-13	1	-0/+12
\| \| \| \| \| \| \| \| \| \| \| \|	Closes #26466.
* \| \|	Fix Error 500s creating merge requests with external issue trackersh-fix-issue-43193	Stan Hu	2018-02-12	1	-3/+5
\| \|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	When JIRA or Redmine were enabled and the branch name did not match the matching regular expression, the `issue_iid` would be `nil`, preventing users from creating merge requests. Closes #43193
* \|	Merge branch 'fix/gh-namespace-issue' into 'security-10-4'	James Lopez	2018-02-09	1	-3/+7
\| \| \| \| \| \| \| \|	[10.4] Fix GH namespace security issue
* \|	Merge branch 'rd-35856-backport-lfs-file-locking-api' into 'master'	Sean McGivern	2018-02-07	3	-0/+99
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backport LFS File Locking API Closes #35856 See merge request gitlab-org/gitlab-ce!16935
\| * \|	Backport of LFS File Locking APIrd-35856-backport-lfs-file-locking-api	Rubén Dávila	2018-02-07	3	-0/+99
\| \| \|
* \| \|	Merge branch 'fix/reduce-number-of-ref-exists-calls' into 'master'	Sean McGivern	2018-02-07	1	-4/+1
\|\ \ \ \| \|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Check for keep-around commits once if target and source projects are the same Closes #37439 and gitaly#1000 See merge request gitlab-org/gitlab-ce!16972
\| * \|	Remove allow_n_plus_1_calls from MergeRequests::CreateServicefix/reduce-number-of-ref-exists-calls	Ahmad Sherif	2018-02-07	1	-4/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes #37439 Fixes gitaly#1000
* \| \|	Merge commit '4457cf9d178dc9912fd9c16427ad81b389179d00' into ↵fix/gb/fix-redundant-pipeline-stages	Grzegorz Bizon	2018-02-07	5	-3/+71
\|\ \ \ \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix/gb/fix-redundant-pipeline-stages * commit '4457cf9d178dc9912fd9c16427ad81b389179d00': (76 commits) Conflicts: spec/services/ci/retry_build_service_spec.rb
\| * \|	Merge branch 'jej/upload-file-tracks-lfs' into 'master'	Sean McGivern	2018-02-06	2	-1/+53
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	File upload UI obeys LFS filter Closes #29876 See merge request gitlab-org/gitlab-ce!16412
\| \| * \|	File upload UI obeys LFS filters	James Edwards-Jones	2018-02-06	2	-1/+53
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Uses Lfs::FileModificationHandler to coordinate LFS detection, creation of LfsObject, etc Caveats: 1. This isn't used by the multi-file editor / Web IDE 2. This isn't used on rename. We'd need to be able to download LFS files and add them to the commit if they no longer match so not as simple. 3. We only check the root .gitattributes file, so this should be improved to correctly check for nested .gitattributes files in subfolders.
\| * \| \|	Merge branch 'winh-kubernetes-clusters' into 'master'	Phil Hughes	2018-02-06	2	-2/+2
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Replace "cluster" with "Kubernetes cluster" Closes #41963 See merge request gitlab-org/gitlab-ce!16778
\| \| * \| \|	Replace "cluster" with "Kubernetes cluster"winh-kubernetes-clusters	Winnie Hellmann	2018-02-06	2	-2/+2
\| \| \| \| \|
\| * \| \| \|	Fix inital test failures	Shinya Maeda	2018-02-06	1	-4/+6
\| \| \| \| \|
\| * \| \| \|	Add worker queue	Shinya Maeda	2018-02-06	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Rename CreateArtifactsTraceService to CreateTraceArtifactService	Shinya Maeda	2018-02-06	2	-16/+14
\| \| \| \| \|
\| * \| \| \|	Add CreateArtifactsTraceWorker	Shinya Maeda	2018-02-06	1	-0/+16
\| \|/ / /
* \| \| \|	Improve exceptions messages in code creating stages	Grzegorz Bizon	2018-02-06	1	-2/+4
\| \| \| \|
* \| \| \|	Make exception in ensure stage service more descriptive	Grzegorz Bizon	2018-02-06	1	-2/+5
\| \| \| \|
* \| \| \|	Merge branch 'master' into fix/gb/fix-redundant-pipeline-stages	Grzegorz Bizon	2018-02-06	17	-54/+173
\|\ \ \ \ \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: (441 commits) Conflicts: db/schema.rb
\| * \| \|	31885 - Ability to transfer a single group to another group	Mayra Cabrera	2018-02-06	1	-0/+96
\| \| \| \|
\| * \| \|	Merge branch 'osw-markdown-bypass-for-commit-messages' into 'master'	Sean McGivern	2018-02-05	1	-8/+18
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bypass markdown for commit titles on MR notes Closes #37616 See merge request gitlab-org/gitlab-ce!16883
\| \| * \| \|	Remove unnused escape_html methodosw-markdown-bypass-for-commit-messages	Oswaldo Ferreira	2018-02-02	1	-4/+0
\| \| \| \| \|
\| \| * \| \|	Bypass commits title markdown on notes	Oswaldo Ferreira	2018-02-02	1	-4/+18
\| \| \| \|/ \| \| \|/\|
\| * \| \|	use Gitlab::UserSettings directly as a singleton instead of ↵	Mario de la Ossa	2018-02-02	12	-34/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	including/extending it
\| * \| \|	Merge branch '40793-fix-mr-title-for-jira' into 'master'	Sean McGivern	2018-02-02	1	-7/+23
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Incorrect merge request title when Jira activated and multiple commits on branch" Closes #40793 See merge request gitlab-org/gitlab-ce!16491
\| \| * \| \|	Resolve "Incorrect merge request title when Jira activated and multiple ↵	Andrew McCallum	2018-02-02	1	-7/+23
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	commits on branch"
\| * \| \| \|	Merge branch 'osw-system-notes-for-commits-regression' into 'master'	Sean McGivern	2018-02-02	1	-1/+6
\| \|\ \ \ \ \| \| \|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reload source MRs memoization after diffs creation Closes #42668 See merge request gitlab-org/gitlab-ce!16868
\| \| * \| \|	Reload MRs memoization after diffs creationosw-system-notes-for-commits-regression	Oswaldo Ferreira	2018-02-01	1	-1/+6
\| \| \|/ /
\| * \| \|	port of 594e6a0a625^..f74c90f68c6	Micaël Bergeron	2018-02-01	1	-2/+2
\| \|/ /
\| * \|	Close and do not reload MR diffs when source branch is deleted	Oswaldo Ferreira	2018-01-29	1	-2/+14
\| \|/
* \|	Fix transactions-related race condition in stages code	Grzegorz Bizon	2018-02-05	1	-1/+6
\| \|
* \|	Revert create job service because of load balancing	Grzegorz Bizon	2018-02-05	2	-22/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Currently we still need to run EnsureStageService within a transaction, because when it runs within in a transaction we are going to stick to the primary database when using database load balancing. Extracting this out of the transaction makes it possible to hit into problems with replication lag in pipeline commit status API, which can cause a lot of trouble.
* \|	Fix specs for retry build after making stages unique	Grzegorz Bizon	2018-01-25	1	-1/+1
\| \|
* \|	Do not raise an error when trying to persist a job	Grzegorz Bizon	2018-01-24	1	-1/+1
\| \|
* \|	Add a new service for creating detached CI/CD jobs	Grzegorz Bizon	2018-01-24	2	-8/+22
\|/
*	Merge branch '41532-email-reason' into 'master'	Sean McGivern	2018-01-19	2	-34/+40
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Show why a notification email was sent Closes #41532 and #1366 See merge request gitlab-org/gitlab-ce!16160
\| *	Initial work to add notification reason to emails	Mario de la Ossa	2018-01-16	2	-34/+40
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds `#build_notification_recipients` to `NotificationRecipientService` that returns the `NotificationRecipient` objects in order to be able to access the new attribute `reason`. This new attribute is used in the different notifier methods in order to add the reason as a header: `X-GitLab-NotificationReason`. Only the reason with the most priority gets sent.
* \|	Merge branch 'feature/merge-request-system-hook' into 'master'	Douwe Maan	2018-01-18	3	-2/+9
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	System hooks for Merge Requests See merge request gitlab-org/gitlab-ce!14387
\| * \|	use class reader instead of dynamic constant	Alexis Reigel	2018-01-17	1	-1/+1
\| \| \|
\| * \|	use safer .hooks_for instead of .public_send	Alexis Reigel	2018-01-17	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	with .public_send we can't make sure that the scope on the model actually exists.
\| * \|	test hook for system merge request hook	Alexis Reigel	2018-01-04	1	-0/+7
\| \| \|
* \| \|	Merge branch 'sh-backport-10-3-4-security-fixes' into 'master'	Oswaldo Ferreira	2018-01-17	3	-8/+24
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backport 10.3.4 security fixes into master See merge request gitlab-org/gitlab-ce!16509
\| * \| \|	Merge branch ↵	Robert Speicher	2018-01-16	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'41293-fix-command-injection-vulnerability-on-system_hook_push-queue-through-web-hook' into 'security-10-3' Don't allow line breaks on HTTP headers See merge request gitlab/gitlabhq!2277 (cherry picked from commit 7fc0a6fc096768a5604d6dd24d7d952e53300c82) 073b8f9c Don't allow line breaks on HTTP headers
\| * \| \|	Merge branch '41567-projectfix' into 'security-10-3'	Sean McGivern	2018-01-16	1	-6/+22
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	check project access on MR create See merge request gitlab/gitlabhq!2273 (cherry picked from commit 1fe2325d6ef2bced4c5e97b57691c894f38b2834) 43e85f49 check project access on MR create