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

	Commit message (Collapse)	Author	Age	Files	Lines
*	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
\| \| \| * \| \| \| \| \| \|	Simplify Clusters::CreateService cluster check	Matija Čupić	2017-11-24	1	-5/+1
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Merge branch 'master' into list-multiple-clusters	Filipa Lacerda	2017-11-24	8	-42/+28
\| \| \|\ \ \ \ \ \ \ \ \| \| \| \|/ / / / / / / \| \| \|/\| \| \| \| \| / / \| \| \| \| \|_\|_\|_\|/ / \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: (53 commits) Updated timeago.js Prevent 500 error when inspecting job after trigger was removed Add classList polyfill for IE classList.toggle(.., force) Use feature flag instead of application settigns to control if method calls should be instrumented Rename wip to worker_id add missing schema entry and application settigns helper Use only real duration to measure method call performance via Prometheus check method timing threshold when observing method performance Add changelog for #15558 Reenable prometheus metrics Move prometheus middle ware to prometheus initialized. Fix WIP system note not being created Update CHANGELOG.md for 10.2.2 Fix hashed storage for attachments bugs Rename fetch_refs to refmap Clean up repository fetch and mirror methods Fix pulling and pushing using a personal access token with the sudo scope Allow password authentication to be disabled entirely Simplify the DB changes checklist Added Rubocop config for background migrations ...
\| \| * \| \| \| \| \| \|	Merge branch 'master' into list-multiple-clusters	Filipa Lacerda	2017-11-22	15	-46/+128
\| \| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: (158 commits) Improve output for extra queries in specs Fixed new group milestone breadcrumb Try to find the merge-base against the canonical master Add FetchSourceBranch Gitaly call Backport QA code that belongs to CE from EE Geo Add QUERY_RECORDER_DEBUG environment variable to improve performance debugging Add support of Mermaid Update VERSION to 10.3.0-pre Update CHANGELOG.md for 10.2.0 default fill color for SVGs Fix reply quote keyboard shortcut on MRs ignore hashed repos (for now) when using `rake gitlab:cleanup:repos` Use Redis cache for branch existence checks Update CONTRIBUTING.md: Link definition of done to criteria Use `make install` for Gitaly setups in non-test environments FileUploader should check for hashed_storage?(:attachments) to use disk_path Set the default gitlab-shell timeout to 3 hours Update composite pipelines index to include "id" Use arrays in Pipeline#latest_builds_with_artifacts Fix blank states using old css ...
\| \| * \| \| \| \| \| \| \|	Limit projects to just one cluster	Matija Čupić	2017-11-18	1	-0/+10
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch '37354-pipelines-update' into 'master'	Kamil Trzciński	2017-12-06	2	-5/+19
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make sure head pippeline always corresponds with an MR Closes #37354 See merge request gitlab-org/gitlab-ce!14358
\| * \| \| \| \| \| \| \| \|	Ensure pippeline corresponds with the sha of an MR	Jarka Kadlecova	2017-12-05	2	-5/+19
\| \| \|_\|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Perform SQL matching of Build&Runner tags to greatly speed-up job picking	Kamil Trzcinski	2017-12-05	1	-0/+10
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge branch 'zj-multiple-artifacts' into 'master'	Grzegorz Bizon	2017-12-05	1	-1/+1
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Multiple artifacts See merge request gitlab-org/gitlab-ce!14367
\| * \| \| \| \| \| \|	Test new artifacts for pages deploy	Zeger-Jan van de Weg	2017-12-03	1	-1/+1
\| \|/ / / / / /
* \| \| \| \| \| \|	Merge branch 'dm-application-worker' into 'master'	Sean McGivern	2017-12-05	2	-2/+6
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add ApplicationWorker and make every worker include it See merge request gitlab-org/gitlab-ce!15632
\| * \| \| \| \| \|	Consistently schedule Sidekiq jobsdm-application-worker	Douwe Maan	2017-12-05	2	-2/+6
\| \| \|_\|_\|_\|/ \| \|/\| \| \| \|
* \| \| \| \| \|	Merge branch '32878-merge-request-from-email' into 'master'	Sean McGivern	2017-12-05	2	-2/+12
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Create merge request from email Closes #32878 See merge request gitlab-org/gitlab-ce!13817