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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Move UnresolvedDiscussions vue component	George Tsiolis	2018-03-08	5	-32/+43
\|
*	Merge branch ↵	Kamil Trzciński	2018-03-08	8	-51/+91
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'43770-change-clear-runners-cache-ujs-action-to-an-axios-request' into 'master' Resolve "Change Clear Runners cache UJS action to an API request" Closes #43770 See merge request gitlab-org/gitlab-ce!17466
\| *	Fix broken tests43770-change-clear-runners-cache-ujs-action-to-an-axios-request	Filipa Lacerda	2018-03-07	2	-9/+9
\| \|
\| *	[ci skip] Merge branch 'master' into ↵	Filipa Lacerda	2018-03-07	120	-920/+2712
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	43770-change-clear-runners-cache-ujs-action-to-an-axios-request * master: (68 commits) Upgrade Workhorse to 4.0.0 naming things Update GitLab Pages to v0.7.0 Minor fixes in API doc Use Project#full_name instead of name_with_namespace Fix tests not completely disabling Gitaly Move OperationService#UserRemoveBranch Move OperationService#UserCreateBranch Move CommitService#Languages to OPT_OUT Move RefService#CreateBranch to OPT_OUT Move RefService#DeleteBranch to OPT_OUT Move OperationService#UserRevert to OPT_OUT Move OperationService#UserAddTag to OPT_OUT Move CommitService::CommitPatch to OPT_OUT Change to Pacific Time Zone Merge branch 'pages-6-1-gitlab-10-5' into 'security-10-5' Merge branch 'sh-fix-otp-backup-invalidation-10-5' into 'security-10-5' Remove wrong assumption about Runners cache GC Add CommonMark markdown engine add nginx_status monitoring details ...
\| * \|	Removes UJS from reset cache button	Filipa Lacerda	2018-03-07	5	-26/+73
\| \| \| \| \| \| \| \| \| \| \| \|	Uses loading button for better UX
\| * \|	[ci skip] Merge branch 'master' into ↵	Filipa Lacerda	2018-03-07	240	-3048/+25824
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	43770-change-clear-runners-cache-ujs-action-to-an-axios-request * master: (97 commits) Remove common_vue bundle Gitlab::Utils - backport `.ensure_array_from_string` from EE Fix false positive spec of using digest instead of hexdigest Change queue namespace of UpdateHeadPipelineForMergeRequestWorker prefer checking explicitly for null replace fixture with simple mount point add new tests for metrics dashboard changes Set sha256 checksum when archiving traces Move update_head_pipeline_for_merge_request queue to pipeline_processing namespace Docs guidelines: cherry-picking commits from CE to EE CI charts now include the current day New .dedicated-no-docs-pull-cache-job and .no-db-job definitions Add date calls in .gitlab-ci.yml to see how long each step take move misplaced entry point Arg.id via method pointer Backport description composition from EE Fix a typo, a conflict and improve documentation Remove extra breadcrumb on tags Lazy fetch parent commits for a commit Fix Gitaly n+1 in NetworkController#show ...
\| * \ \	[ci skip] Merge branch 'master' into ↵	Filipa Lacerda	2018-03-06	670	-13299/+11571
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	43770-change-clear-runners-cache-ujs-action-to-an-axios-request * master: (163 commits) Resolve "Group Leave action is broken on Groups Dashboard and Homepage" So that it's consistent with other entries and EE Fix race condition when previewing docs Resolve "Enable privileged mode for Runner installed on Kubernetes" Change column to file_sha256. Add test. Add changelog Add checksum at runner grape api Revert logic of calculating checksum Add post migration for checksum calculation Add ObjectStorageQueue concern and test Import use_file method from EE and use it for calculation of checksum Change column type to binary from string Add checksum to ci_job_artifacts Make oauth provider login generic Don't error out in system hook if user has `nil` datetime columns Use host URL to build JIRA remote link icon CI/CD-only projects FE Resolve "SSH key add text" Changes after review Projects and groups badges API Remove default scope from todos ...
\| * \| \| \|	Update Projects::Settings::CiCdController#reset_cache specs	Matija Čupić	2018-03-01	1	-14/+5
\| \| \| \| \|
\| * \| \| \|	Make Projects::Settings:CiCdController#reset_cache a json endpoint	Matija Čupić	2018-03-01	1	-4/+6
\| \| \| \| \|
* \| \| \| \|	Merge branch 'fix-mattermost-delete-team' into 'master'	Sean McGivern	2018-03-08	4	-3/+117
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add missing delete method in mattermost session Closes #37367 and #40660 See merge request gitlab-org/gitlab-ce!16209
\| * \| \| \| \|	Add missing delete method in mattermost session	julien MILLAU	2018-03-08	4	-3/+117
\|/ / / / /
* \| \| \| \|	Merge branch 'ce-jej/github-project-service-for-ci' into 'master'	Douwe Maan	2018-03-08	11	-15/+98
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backport changes from introducing GithubService interation in EE See merge request gitlab-org/gitlab-ce!17607
\| * \| \| \| \|	Hides Triggers if integration only has one event	James Edwards-Jones	2018-03-08	4	-2/+54
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removes confusing/unnecessary checkboxes when trying to configure an integration. If there is only one supported event we don't need to allow these to be individually disabled since the integration can be disabled instead. E.g. Project Integrations for GitHub, Bugzilla, Asana, Pipeline emails and Gemnasium Allows integrations to override which triggers are configurable
\| * \| \| \| \|	Service integration displays validation errors on test fail	James Edwards-Jones	2018-03-07	3	-13/+29
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes attempts to update a service integration which had `can_test?` set to true but validations were causing the "Test and save changes" button to return "Something went wrong on our end." Removes references to index action left from 0af99433143727088b6a0a1b2163751c05d80ce6
\| * \| \| \| \|	Backport changes from EE's GithubService integration	James Edwards-Jones	2018-03-07	5	-0/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds detailed_status to pipeline hook data Adds detailed_description option for Services Integration edit page renders 404 if a service is disabled
* \| \| \| \| \|	Merge branch 'unassign-when-leaving' into 'master'	Robert Speicher	2018-03-08	7	-116/+95
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't delete todos or unassign issues and MRs when a user leaves a project Closes #43899 See merge request gitlab-org/gitlab-ce!17615
\| * \| \| \| \| \|	Don't delete todos or unassign issues and MRs when a user leaves a projectunassign-when-leaving	Douwe Maan	2018-03-07	7	-116/+95
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'bvl-port-ee-improvements-from-maintainer-push' into 'master'	Douwe Maan	2018-03-08	6	-18/+32
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Port changes from EE: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/4885 (Maintainer push to fork) See merge request gitlab-org/gitlab-ce!17629
\| * \| \| \| \| \| \|	Validate `:push_code` before checking protected branchesbvl-port-ee-improvements-from-maintainer-push	Bob Van Landuyt	2018-03-08	1	-6/+3
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Address frontend feedback	Bob Van Landuyt	2018-03-08	5	-12/+29
\|/ / / / / / /
* \| \| \| \| \| \|	Merge branch 'jivl-backport-custom-metrics-frontend' into 'master'	Filipa Lacerda	2018-03-07	6	-32/+60
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	backport of custom metrics for the common metrics section of CE See merge request gitlab-org/gitlab-ce!17586
\| * \| \| \| \| \| \|	backport of custom metrics for the common metrics section of CEjivl-backport-custom-metrics-frontend	Jose Ivan Vargas	2018-03-07	6	-32/+60
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'da-update-project-activity' into 'master'	Stan Hu	2018-03-07	2	-1/+13
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update project activity when pushing to a wiki repository See merge request gitlab-org/gitlab-ce!17621
\| * \| \| \| \| \| \| \|	Update project activity when pushing to a wiki repositoryda-update-project-activity	Douglas Barbosa Alexandre	2018-03-07	2	-1/+13
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'ce-3839-ci-cd-only-github-projects-fe' into 'master'	Douwe Maan	2018-03-07	11	-59/+194
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Create CI/CD-only projects from GitHub -- CE backport See merge request gitlab-org/gitlab-ce!17432
\| * \ \ \ \ \ \ \ \	Merge branch 'master' into 'ce-3839-ci-cd-only-github-projects-fe'ce-3839-ci-cd-only-github-projects-fe	Douwe Maan	2018-03-07	120	-275/+1694
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # locale/gitlab.pot
\| * \| \| \| \| \| \| \| \| \|	CE backport for creating CI/CD projects from GitHub	Rubén Dávila	2018-03-07	11	-94/+214
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'docs-fe-typo' into 'master'	Jacob Schatz	2018-03-07	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix accessibility typo See merge request gitlab-org/gitlab-ce!17612
\| * \| \| \| \| \| \| \| \| \| \|	Fix accessibility typodocs-fe-typo	Clement Ho	2018-03-07	1	-1/+1
\| \| \|/ / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'backport-ee-3892-to-ce' into 'master'	Douwe Maan	2018-03-07	2	-0/+11
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backport relevant changes from EE https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/4827 to CE See merge request gitlab-org/gitlab-ce!17608
\| * \| \| \| \| \| \| \| \| \| \|	Backport relevant changes from EE ↵backport-ee-3892-to-ce	Tiago Botelho	2018-03-07	2	-0/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/4827 to CE
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'refactor/move-sidebar-assignee-vue-component' into 'master'	Clement Ho	2018-03-07	4	-45/+53
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move SidebarAssignees vue component See merge request gitlab-org/gitlab-ce!17398
\| * \| \| \| \| \| \| \| \| \| \|	Move SidebarAssignees vue component	George Tsiolis	2018-03-07	4	-45/+53
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch '43780-add-a-paragraph-about-clusters-security-implications' ↵	Kamil Trzciński	2018-03-07	3	-3/+50
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Resolve "Add a mention and link to doc for security implications in the Kubernetes cluster page" Closes #43780 and #43781 See merge request gitlab-org/gitlab-ce!17486
\| * \| \| \| \| \| \| \| \| \| \|	Resolve "Add a mention and link to doc for security implications in the ↵	Mayra Cabrera	2018-03-07	3	-3/+50
\|/ / / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Kubernetes cluster page"
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'docs-new-fe-guide' into 'master'	Jacob Schatz	2018-03-07	18	-0/+111
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add new frontend guide structure See merge request gitlab-org/gitlab-ce!17611
\| * \| \| \| \| \| \| \| \| \| \|	Add new frontend guide structure	Clement Ho	2018-03-07	18	-0/+111
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'bvl-allow-maintainer-to-push' into 'master'	Douwe Maan	2018-03-07	58	-118/+911
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow maintainers to push forks of a project for branches that have open MRs Closes #22292 See merge request gitlab-org/gitlab-ce!17395
\| * \| \| \| \| \| \| \| \| \| \|	Only allow users that can merge to push to sourcebvl-allow-maintainer-to-push	Bob Van Landuyt	2018-03-07	4	-15/+33
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We only allow users that can merge the merge request to push to the fork.
\| * \| \| \| \| \| \| \| \| \| \|	Link correct project when adding file to empty MR	Bob Van Landuyt	2018-03-07	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When creating a cross project merge request without changes. The MR widget shows the option to create a new file. It would however link to the wrong project.
\| * \| \| \| \| \| \| \| \| \| \|	Use Project#source_of_merge_requests-relation	Bob Van Landuyt	2018-03-07	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Using the relation `Project#source_of_merge_requests` in `Ci::CreatePipelineService` That way we take advantage of all the `ActiveRecord::Relation` magic
\| * \| \| \| \| \| \| \| \| \| \|	Limit queries to a user-branch combination	Bob Van Landuyt	2018-03-07	8	-65/+109
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The query becomes a lot simpler if we can check the branch name as well instead of having to load all branch names.
\| * \| \| \| \| \| \| \| \| \| \|	Add documentation for allowing maintainers to push	Bob Van Landuyt	2018-03-07	6	-3/+18
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Set `allow_maintainer_to_push` using the API	Bob Van Landuyt	2018-03-07	5	-30/+65
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Allow maintainers to edit directly in a fork	Bob Van Landuyt	2018-03-07	19	-79/+247
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Allow maintainers to push to a single branch	Bob Van Landuyt	2018-03-07	2	-1/+40
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Allow abilities on forks while MR is open	Bob Van Landuyt	2018-03-07	6	-3/+138
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When an MR is created using `allow_maintainer_to_push`, we enable some abilities while the MR is open. This should allow every user with developer abilities on the target project, to push to the source project.
\| * \| \| \| \| \| \| \| \| \| \|	Allow a user to select `allow maintainer to push`	Bob Van Landuyt	2018-03-07	22	-4/+324
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When a project is not private, and the source branch not protected the user can now select the option to allow maintainers to push to this branch
\| * \| \| \| \| \| \| \| \| \| \|	Add `allow_maintainer_to_push` to `merge_requests`	Bob Van Landuyt	2018-03-07	2	-0/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This flag will allow maintainers of a project to push to specific branches of a fork of a project
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'pages-0-7-0' into 'master'	Grzegorz Bizon	2018-03-07	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update GitLab Pages to v0.7.0 See merge request gitlab-org/gitlab-ce!17603