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

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| \| \| \| * \| \| \| \| \| \|	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
\| \| * \| \| \| \| \|	Create merge request from email	Jan Provaznik	2017-12-05	2	-2/+12
\| \| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* new merge request can be created by sending an email to the specific email address (similar to creating issues by email) * for the first iteration, source branch must be specified in the mail subject, other merge request parameters can not be set yet * user should enable "Receive notifications about your own activity" in user settings to receive a notification about created merge request Part of #32878
\| * \| \| \| \| \|	Second iteration of Move Kubernetes from service to Cluster page	Filipa Lacerda	2017-12-05	1	-1/+1
\| \|/ / / / /
\| * \| \| \| \|	Merge branch 'sh-optimize-groups-api' into 'master'	Douwe Maan	2017-12-04	7	-12/+95
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Optimize API /groups/:id/projects by preloading assocations Closes #40308 See merge request gitlab-org/gitlab-ce!15475
\| \| * \| \| \| \|	Fixed bugsh-optimize-groups-api	Francisco Lopez	2017-12-04	1	-0/+7
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Moving query to base count service	Francisco Lopez	2017-12-04	3	-8/+4
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Using map to retrieve the element ids because of some issues with mysql	Francisco Lopez	2017-12-01	3	-4/+9
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Undoing the change to ForkNetworkMember	Francisco Lopez	2017-12-01	1	-1/+4
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Comments from code review applied. Also switched forked_from_project and ↵	Francisco Lopez	2017-12-01	6	-28/+26
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	ForkedProjectLinks to ForkNetworkMember
\| \| * \| \| \| \|	Code review comments applied	Francisco Lopez	2017-12-01	2	-2/+10
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	More preloading improvement and added batch count services	Francisco Lopez	2017-12-01	5	-2/+68
\| \| \|/ / / /
\| * \| \| \| \|	Fix watch level for mentions in description	Sean McGivern	2017-12-04	1	-1/+12
\| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	For a user with the mention notification level set, the type of their corresponding NotificationRecipient must be :mention for them to receive an email. We set this correctly on notes, but we weren't adding it on new issues or MRs - perhaps because these users are also participants. But the type of the NotificationRecipient in that case would be :participant, not mention, so we have to add the mentioned users manually when creating an issue or MR. When editing an issue or MR, and there are newly-mentioned users to email, we still use the :new_issue and :new_merge_request actions, so this works for that case as well.
\| * \| \| \|	Merge branch 'backstage/gb/build-pipeline-in-a-separate-class' into 'master'	Kamil Trzciński	2017-12-01	1	-43/+12
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Extract class responsible for building a pipeline Closes #38460 See merge request gitlab-org/gitlab-ce!14762
\| \| * \ \ \	Merge branch 'master' into backstage/gb/build-pipeline-in-a-separate-class	Grzegorz Bizon	2017-11-30	74	-617/+1236
\| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* master: (1794 commits)
\| \| * \| \| \| \|	Extract class responsible for building a pipeline	Grzegorz Bizon	2017-10-09	1	-43/+12
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	allow caching options to be specified for counting services	Brett Walker	2017-11-30	1	-1/+7
\| \| \|/ / / / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge remote-tracking branch 'upstream/master' into no-ivar-in-modules	Lin Jen-Shin	2017-11-30	20	-166/+288
\|\ \ \ \ \ \ \| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* upstream/master: (170 commits) support ordering of project notes in notes api Redirect to an already forked project if it exists Reschedule the migration to populate fork networks Create fork networks for forks for which the source was deleted. Fix item name and namespace text overflow in Projects dropdown Minor backport from EE fix link that was linking to `html` instead of `md` Backport epic tasklist Add timeouts for Gitaly calls SSHUploadPack over Gitaly is now OptOut fix icon colors in commit list Fix star icon color/stroke Backport border inline edit Add checkboxes to automatically run AutoDevops pipeline BE for automatic pipeline when enabling Auto DevOps I am certainly weary of debugging sidekiq but I don't think that's what was meant Ensure MRs always use branch refs for comparison Fix issue comment submit button disabled on GFM paste Lock seed-fu at the correct version in Gemfile.lock Improve indexes on merge_request_diffs ...
\| * \| \| \| \|	Merge branch ↵	Sean McGivern	2017-11-29	2	-32/+58
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'21143-customize-branch-name-when-using-create-branch-in-an-issue' into 'master' Resolve "Customize branch name when using create branch in an issue" Closes #21143 See merge request gitlab-org/gitlab-ce!13884
\| \| * \| \| \| \|	Add an ability to use a custom branch name on creation from issues	Vitaliy @blackst0ne Klachkov	2017-11-25	2	-32/+58
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge branch ↵	Kamil Trzciński	2017-11-28	1	-1/+9
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'38962-automatically-run-a-pipeline-when-auto-devops-is-turned-on-in-project-settings' into 'master' Add checkbox to automatically run a pipeline when Auto DevOps is turned on in project settings Closes #38962 See merge request gitlab-org/gitlab-ce!15380
\| \| * \| \| \| \| \|	BE for automatic pipeline when enabling Auto DevOps	Matija Čupić	2017-11-28	1	-1/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/38962
\| * \| \| \| \| \| \|	Merge branch ↵	Rémy Coutable	2017-11-28	2	-9/+19
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'40530-merge-request-generates-wrong-diff-when-branch-and-tag-have-the-same-name' into 'master' Resolve "Merge request generates wrong diff when branch and tag have the same name" Closes #40530 See merge request gitlab-org/gitlab-ce!15591
\| \| * \| \| \| \| \| \|	Ensure MRs always use branch refs for comparison	Sean McGivern	2017-11-28	2	-9/+19
\| \| \| \|_\|_\|_\|_\|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	If a merge request was created with a branch name that also matched a tag name, we'd generate a comparison to or from the tag respectively, rather than the branch. Merging would still use the branch, of course. To avoid this, ensure that when we get the branch heads, we prepend the reference prefix for branches, which will ensure that we generate the correct comparison.
\| * \| \| \| \| \| \|	Merge branch 'hashed-storage-attachments-migration-path' into 'master'	Nick Thomas	2017-11-28	3	-54/+132
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Hashed storage attachments migration path See merge request gitlab-org/gitlab-ce!15352
\| \| * \| \| \| \| \| \|	Changes to Attachments Migration for EE and Geo compatibility	Gabriel Mazetto	2017-11-28	1	-5/+12
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Backport EE changes to make test possible when prepending modules	Gabriel Mazetto	2017-11-24	2	-0/+8
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Codestyle changes and Added Exclusive Lease to hashed storage migration	Gabriel Mazetto	2017-11-23	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	when rollingback repository migration, toggle readonly mode back	Gabriel Mazetto	2017-11-23	2	-3/+3
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Raises error when migration cannot happen so job is cancelled	Gabriel Mazetto	2017-11-23	1	-1/+3
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	attachments migration should move only the base folder	Gabriel Mazetto	2017-11-23	1	-25/+12
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	WIP Attachments migration	Gabriel Mazetto	2017-11-23	2	-1/+60
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Refactor Hashed Storage migration to add additional migration steps	Gabriel Mazetto	2017-11-23	2	-57/+72
\| \| \| \|_\|_\|_\|_\|/ \| \| \|/\| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch '40226-refactor-the-issuable-s-webhooks-data-architecture' into ↵	Douwe Maan	2017-11-28	5	-28/+33
\| \|\ \ \ \ \ \ \ \| \| \|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Refactor the way we pass `old associations` to issuable's update services Closes #40226 See merge request gitlab-org/gitlab-ce!15542
\| \| * \| \| \| \| \|	Refactor the way we pass `old associations` to issuable's update services40226-refactor-the-issuable-s-webhooks-data-architecture	Rémy Coutable	2017-11-24	5	-28/+33
\| \| \| \|/ / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \| \| \|	Create issue and merge request destroy services	George Andrinopoulos	2017-11-25	1	-0/+9
\| \|/ / / / /
\| * \| \| \| \|	Merge branch 'issue_40374' into 'master'	Sean McGivern	2017-11-24	3	-22/+16
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix WIP system note not being created Closes #40374 See merge request gitlab-org/gitlab-ce!15528
\| \| * \| \| \| \|	Fix WIP system note not being createdissue_40374	Felipe Artur	2017-11-23	3	-22/+16
\| \| \|/ / / /
\| * \| \| \| \|	Merge branch 'dm-cleanup-fetch-and-mirror-methods' into 'master'	Sean McGivern	2017-11-23	1	-14/+6
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Clean up repository fetch and mirror methods See merge request gitlab-org/gitlab-ce!15424
\| \| * \| \| \| \|	Rename fetch_refs to refmap	Douwe Maan	2017-11-23	1	-3/+3
\| \| \| \| \| \| \|