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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Forking a project to a namespace with lower visibility.bvl-fork-public-project-to-private-namespace	Bob Van Landuyt	2017-12-29	1	-7/+7
\| \| \| \| \| \| \|	In this case the project will get the minimum between both visibilities. If that visibility is restricted, then a lower level will be picked.
*	Extend Cluster Applications to allow installation of Prometheus	Mayra Cabrera	2017-12-22	1	-1/+1
\|
*	Skip projects filter on merge requests searchjprovazn-search	Jan Provaznik	2017-12-21	2	-1/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When searching for merge requests, an additional subquery is added which by default filters only merge requests which belong to source or target project user has permission for. This filter is not needed because more restrictive filter which checks if user has permission for target project is used in the query. So unless a custom projects filter is used by user, it's possible to skip the default projects filter and speed up the final query. Related to #40540
*	Merge branch '38356-add-last_commit_sha-to-the-commit-api' into 'master'	Douwe Maan	2017-12-21	4	-20/+38
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Add new last_commit_id param for create commit endpoint Closes #38356 See merge request gitlab-org/gitlab-ce!15922
\| *	Updates from last code review:38356-add-last_commit_sha-to-the-commit-api	Rubén Dávila	2017-12-20	4	-27/+33
\| \| \| \| \| \| \| \| \| \| \| \|	- Apply some refactoring for code reuse - Add file status validation for Files::DeleteService - Write additional specs
\| *	Check if file has been modified for each action provided.	Rubén Dávila	2017-12-20	1	-0/+12
\| \| \| \| \| \| \| \| \| \| \| \|	When commiting multiple files we're now checking if any of those files has been modified by another commit and we're rejecting the new commit in this case.
* \|	Merge branch 'rs-blocks-json-serialization' into 'master'	Douwe Maan	2017-12-20	1	-2/+2
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add BlocksJsonSerialization model concern and include it in User Closes #37947 See merge request gitlab-org/gitlab-ce!14350
\| * \|	Only include the user's ID in the time_spent command's update hash	Robert Speicher	2017-12-19	1	-2/+2
\| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Previously, this would include the entire User record in the update hash, which was rendered in the response using `to_json`, erroneously exposing every attribute of that record, including their (now removed) private token. Now we only include the user ID, and perform the lookup on-demand.
* \|	Don't link LFS-objects multiple times.bvl-fix-unlinking-with-lfs-objects	Bob Van Landuyt	2017-12-19	1	-1/+1
\|/ \| \| \| \| \|	If Unlinking a fork would fail somewhere after this, the LFS objects might still be linked. Which would cause issues when trying to destroy a project.
*	Merge branch ↵	Douwe Maan	2017-12-18	3	-7/+19
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'40871-todo-notification-count-shows-notification-without-having-a-todo' into 'master' Resolve "Todo notification count shows notification without having a todo" Closes #40871 See merge request gitlab-org/gitlab-ce!15807
\| *	Reset todo counters when the target is deleted40871-todo-notification-count-shows-notification-without-having-a-todo	Sean McGivern	2017-12-18	3	-7/+19
\| \| \| \| \| \| \| \| \| \| \| \|	When the target is deleted, todos are destroyed, but we did not reset the todo cache for users with todos on the deleted target. This would only update after the next time the todo cache was updated for that user.
* \|	Merge remote-tracking branch 'upstream/master' into no-ivar-in-modules	Lin Jen-Shin	2017-12-15	27	-95/+326
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* upstream/master: (671 commits) Make rubocop happy Use guard clause Improve language Prettify Use temp branch Pass info about who started the job and which job triggered it Docs: add indexes for monitoring and performance monitoring clearer-documentation-on-inline-diffs Add docs for commit diff discussion in merge requests sorting for tags api Clear BatchLoader after each spec to prevent holding onto records longer than necessary Include project in BatchLoader key to prevent returning blobs for the wrong project moved lfs_blob_ids method into ExtractsPath module Converted JS modules into exported modules spec fixes Bump gitlab-shell version to 5.10.3 Clear caches before updating MR diffs Use new Ruby version 2.4 in GitLab QA images moved lfs blob fetch from extractspath file Update GitLab QA dependencies ...
\| * \	Merge branch 'issue_41021' into 'master'	Sean McGivern	2017-12-13	1	-1/+1
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prevent worker that updates merge requests head pipeline from failing jobs Closes #41021 See merge request gitlab-org/gitlab-ce!15870
\| \| * \|	Prevent worker that updates merge requests head pipeline from failing jobs	Felipe Artur	2017-12-13	1	-1/+1
\| \| \| \|
\| * \| \|	Merge branch 'fix-create-mr-from-issue-with-template' into 'master'	Rémy Coutable	2017-12-13	1	-2/+4
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Execute quick actions when creating MR from issue Closes gitlab-ee#4277 See merge request gitlab-org/gitlab-ce!15810
\| \| * \| \|	Execute quick actions when creating MR from issuefix-create-mr-from-issue-with-template	Sean McGivern	2017-12-13	1	-2/+4
\| \| \| \|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In CE, this does nothing - the `MergeRequests::BuildService` will, at the time of writing, never return a description for this case. In EE, a project can have a default MR template, which will be returned by the service. Previously we were only using the description passed in the params, ignoring any already set on the object. Now we fall back to the one set on the object if there was none in the params, allowing quick actions to be executed from default MR templates when creating an MR from an issue.
\| * \| \|	Merge branch ↵	Robert Speicher	2017-12-12	2	-2/+20
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'tmlee/gitlab-ce-28004-consider-refactoring-member-view-by-using-presenter' into 'master' Refactor member view by using presenter Closes #28004 See merge request gitlab-org/gitlab-ce!15715
\| \| * \| \|	Refactor member view by using presenter	TM Lee	2017-12-11	2	-2/+20
\| \| \| \|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Create MemberPresenter alongside with GroupMemberPresenter and ProjectMemberPresenter - Make Member model Presentable - Move action_member_permission from MembersHelper into the MemberPresenter - Added rspec using double, separate specs for GroupMemberPresenter and ProjectMemberPresenter Fixes #28004. Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \|	ActiveRecord::StaleObjectError: Attempted to update a stale object: Ci::Build41023-activerecord-staleobjecterror--attempted-to-update-a-stale-object--ci-build	Shinya Maeda	2017-12-12	1	-8/+9
\| \|/ /
\| * \|	Merge branch 'fix/gb/fix-pipeline-build-chain-tag-evaluation' into 'master'	Douwe Maan	2017-12-08	1	-12/+13
\| \|\ \ \| \| \|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	Fix invalid pipeline build chain tag evaluation Closes #40944 See merge request gitlab-org/gitlab-ce!15805
\| \| *	Implement and use Gitlab::Ci::Pipeline::Chain::Command	Kamil Trzcinski	2017-12-08	1	-12/+13
\| \| \|
\| * \|	Merge branch 'feature/sm/34834-missing-dependency-should-fail-job-2' into ↵	Kamil Trzciński	2017-12-07	1	-0/+3
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Dependency validator Closes #34834 See merge request gitlab-org/gitlab-ce!14009
\| \| * \|	Use Class.new(StandardError) instead of custom extended error class. Bring ↵	Shinya Maeda	2017-12-06	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	back specified_dependencies?.
\| \| * \|	Fail jobs if its dependency is missing	Shinya Maeda	2017-12-06	1	-0/+3
\| \| \| \|
\| * \| \|	Merge branch 'pawel/update-prometheus_gem_to_highly_optimized_version' into ↵	Stan Hu	2017-12-07	1	-1/+1
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Update prometheus-client-mmap gem to highly optimized version See merge request gitlab-org/gitlab-ce!15796
\| \| * \| \|	Update prometheus-client-mmap gem to highly optimized version	Pawel Chojnacki	2017-12-07	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	+ change string concatenation to help with GC pressure. + fix metric producing incompatible label sets
\| * \| \| \|	Merge branch ↵	Kamil Trzciński	2017-12-07	1	-6/+4
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'40761-remove-the-checkbox-for-starting-a-new-pipeline-in-auto-devops-settings' into 'master' Resolve "Remove the checkbox for starting a new pipeline in Auto DevOps settings" Closes #40761 See merge request gitlab-org/gitlab-ce!15714
\| \| * \| \| \|	Remove Auto DevOps checkboxes - backend	bikebilly	2017-12-04	1	-6/+4
\| \| \| \| \| \|
\| * \| \| \| \|	add support for the commit reference filter	micael.bergeron	2017-12-07	1	-11/+3
\| \| \| \| \| \|
\| * \| \| \| \|	corrects the url building	micael.bergeron	2017-12-07	1	-4/+3
\| \| \| \| \| \|
\| * \| \| \| \|	diff notes created in merge request on a commit have the right context	micael.bergeron	2017-12-07	2	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	add a spec for commit merge request diff notes
\| * \| \| \| \|	Allow commenting on individual commits inside an MR	Douwe Maan	2017-12-07	1	-3/+12
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch 'jej/per-user-protected-branches-api-ce' into 'master'	Sean McGivern	2017-12-07	2	-0/+57
\| \|\ \ \ \ \ \| \| \|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CE backport of "ProtectedBranches API handles per user/group granularity" See merge request gitlab-org/gitlab-ce!15747
\| \| * \| \| \|	CE backport of ProtectedBranches API changes	James Edwards-Jones	2017-12-07	2	-0/+57
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In EE we now allow individual users/groups to be set on POST, which required some refactoring. See https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/3516
\| * \| \| \| \|	The API isn't using the appropriate services for managing forks	Francisco Javier López	2017-12-07	1	-7/+29
\| \| \|_\|/ / \| \|/\| \| \|
\| * \| \| \|	Merge branch ↵	Tim Zallmann	2017-12-06	1	-3/+18
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'22680-unlabel-slash-command-limit-autocomplete-to-applied-labels' into 'master' Resolve "/unlabel quick action - limit autocomplete to applied labels" Closes #22680 and #27319 See merge request gitlab-org/gitlab-ce!11110
\| \| * \| \| \|	Limit autocomplete menu to applied labels	Vitaliy @blackst0ne Klachkov	2017-11-28	1	-3/+18
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch 'ee-backport-issue_40654' into 'master'	Sean McGivern	2017-12-06	1	-4/+5
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[CE-Backport] Fix board filter when milestone is predefined See merge request gitlab-org/gitlab-ce!15750
\| \| * \| \| \| \|	[CE-Backport] Fix board filter when milestone is predefinedee-backport-issue_40654	Felipe Artur	2017-12-05	1	-4/+5
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'list-multiple-clusters' into 'master'	Grzegorz Bizon	2017-12-06	1	-0/+6
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	List multiple clusters See merge request gitlab-org/gitlab-ce!15403
\| \| * \ \ \ \ \	Merge remote-tracking branch 'origin/master' into list-multiple-clusters	Matija Čupić	2017-12-05	4	-3/+17
\| \| \|\ \ \ \ \ \ \| \| \| \| \|_\|_\|_\|/ \| \| \| \|/\| \| \| \|
\| \| * \| \| \| \| \|	Replace Exception with ArgumentError	Matija Čupić	2017-12-05	1	-1/+1
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Remove redundant return in Clusters::CreateService	Matija Čupić	2017-12-05	1	-1/+1
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Merge remote-tracking branch 'origin/master' into list-multiple-clusters	Kamil Trzcinski	2017-12-05	2	-2/+12
\| \| \|\ \ \ \ \ \
\| \| * \ \ \ \ \ \	Merge branch '35616-move-k8-to-cluster-page' into ↵	Kamil Trzcinski	2017-12-05	9	-14/+108
\| \| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	cluster-page-with-list-clusters
\| \| \| * \ \ \ \ \ \	Merge branch 'master' into 35616-move-k8-to-cluster-page	Shinya Maeda	2017-12-05	8	-13/+107
\| \| \| \|\ \ \ \ \ \ \
\| \| \| * \| \| \| \| \| \| \|	Optimize Clusters::CreateService#execute	Shinya Maeda	2017-12-04	1	-1/+1
\| \| \| \| \|_\|_\|_\|_\|_\|/ \| \| \| \|/\| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Merge remote-tracking branch 'origin/list-multiple-clusters' into ↵	Kamil Trzcinski	2017-12-03	1	-0/+6
\| \| \|\ \ \ \ \ \ \ \ \| \| \| \|/ / / / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	cluster-page-with-list-clusters
\| \| \| * \| \| \| \| \| \|	Raise error when trying to create second cluster	Matija Čupić	2017-12-03	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \|	Merge branch 'list-multiple-clusters' of ↵	Filipa Lacerda	2017-11-27	1	-5/+1
\| \| \| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ce into list-multiple-clusters * 'list-multiple-clusters' of https://gitlab.com/gitlab-org/gitlab-ce: Simplify Clusters::CreateService cluster check