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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Rename VUE JS to Vuedocs-vue-templates	Clement Ho	2018-03-08	1	-1/+1
\|
*	Merge branch 'sh-fix-update-service' into 'master'	James Lopez	2018-03-08	2	-1/+10
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Fix Error 500 when updating a project Closes #44019 See merge request gitlab-org/gitlab-ce!17647
\| *	Fix Error 500 when updating a projectsh-fix-update-service	Stan Hu	2018-03-08	2	-1/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	If no parameters were specified for project features but Wikis were disabled, we would get "NoMethodError: undefined method `[]' for nil:NilClass". Closes #44019
* \|	Merge branch 'update-templates-and-dependencies-10-6' into 'master'	Robert Speicher	2018-03-08	7	-200/+357
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Update templates and licenses See merge request gitlab-org/gitlab-ce!17637
\| * \|	Update templates and licensesupdate-templates-and-dependencies-10-6	James Lopez	2018-03-08	7	-200/+357
\| \| \|
* \| \|	Merge branch 'update-guides-10-6' into 'master'	Robert Speicher	2018-03-08	2	-2/+363
\|\ \ \ \| \|_\|/ \|/\| \| \| \| \| \| \| \|	Update guides for 10.6 See merge request gitlab-org/gitlab-ce!17635
\| * \|	update guides for 10.6update-guides-10-6	James Lopez	2018-03-08	2	-2/+363
\| \|/
* \|	Merge branch 'gitlab-git-duplicate-code' into 'master'	Sean McGivern	2018-03-08	1	-18/+0
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Remove duplicate method definitions See merge request gitlab-org/gitlab-ce!17478
\| * \|	Remove duplicate method definitions	Jacob Vosmaer	2018-03-08	1	-18/+0
\| \| \|
* \| \|	Merge branch '40525-listing-user-activity-timeouts' into 'master'	Yorick Peterse	2018-03-08	4	-9/+46
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve database response time for listing user activity Closes #40525 See merge request gitlab-org/gitlab-ce!17454
\| * \| \|	Leverage user_contributed_projects to find recent events.40525-listing-user-activity-timeouts	Andreas Brandl	2018-03-07	4	-9/+46
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #40525.
* \| \| \|	Merge branch 'jprovazn-revert-commit-cleanup' into 'master'	Sean McGivern	2018-03-08	8	-17/+6
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert "Cleanup after adding MR diff's commit_count" See merge request gitlab-org/gitlab-ce!17639
\| * \| \| \|	Revert "Cleanup after adding MR diff's commit_count"	Jan Provaznik	2018-03-08	8	-17/+6
\| \| \|/ / \| \|/\| \| \| \| \| \| \| \| \| \|	This reverts commit 0b7d10851456018328da137beeca931767b4fd0a.
* \| \| \|	Merge branch '43802-ensure-foreign-keys-on-clusters-applications' into 'master'	Yorick Peterse	2018-03-08	3	-0/+57
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Add missing foreign key constraint in clusters_applications_ingress" Closes #43802 See merge request gitlab-org/gitlab-ce!17488
\| * \| \| \|	Ensure orphaned rows are deleted before adding the foreign key43802-ensure-foreign-keys-on-clusters-applications	Mayra Cabrera	2018-03-07	2	-2/+18
\| \| \| \| \|
\| * \| \| \|	Ensure foreign keys on Clusters Applications	Mayra Cabrera	2018-03-07	3	-0/+41
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #43802
* \| \| \| \|	Merge branch 'ce-rubocop-naming-filename' into 'master'	Nick Thomas	2018-03-08	28	-147/+224
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[CE] Add Naming/FileName rule checking expected class/module per filename See merge request gitlab-org/gitlab-ce!17631
\| * \| \| \| \|	[CE] Add Naming/FileName rule checking expected class/module per filename	Gabriel Mazetto	2018-03-08	28	-147/+224
\|/ / / / /
* \| \| \| \|	Merge branch 'sh-add-missing-acts-as-taggable-indices' into 'master'	Yorick Peterse	2018-03-08	3	-0/+28
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adding missing indexes migrations from taggings table Closes #43927 See merge request gitlab-org/gitlab-ce!17563
\| * \| \| \| \|	Adding missing indexes on taggings tablesh-add-missing-acts-as-taggable-indices	Stan Hu	2018-03-07	3	-0/+28
\| \| \|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	API requests were timing out because `tag_id` was missing an index. These migrations were imported by running https://github.com/mbleigh/acts-as-taggable-on#post-installation: ``` bundle exec rake acts_as_taggable_on_engine:install:migrations ``` It looks like the `acts-as-tagglable` gem added the indexes in v4.0.0, but when we upgraded from v3.5.0 (back in 2016 via f571aeb5ce38dce1a9e5f58d76360836d4a8f8a0) we did not add them. On staging, there are about 10.7 million rows on the `taggings` table. It took about 30 seconds for each index to be created. On production, there are about 17.4 million rows, so I suspect the time to be about a minute per index. Closes #43927
* \| \| \| \|	Merge branch 'sh-add-section-name-index' into 'master'	Yorick Peterse	2018-03-08	3	-1/+29
\|\ \ \ \ \ \| \|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add index on section_name_id on ci_build_trace_sections table Closes #44008 See merge request gitlab-org/gitlab-ce!17632
\| * \| \| \|	Add index on section_name_id on ci_build_trace_sections tablesh-add-section-name-index	Stan Hu	2018-03-08	3	-1/+29
\| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This was causing user deletions to time out. Closes #44008
* \| \| \|	Merge branch 'docs-exception-request-labels' into 'master'	Sean McGivern	2018-03-08	1	-0/+3
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Clarify that the Pick Into X.Y label is added after approval See merge request gitlab-org/gitlab-ce!17636
\| * \| \| \|	Clarify that the Pick Into X.Y label is added after approval	Sean McGivern	2018-03-08	1	-0/+3
\| \| \| \| \|
* \| \| \| \|	Merge branch 'sh-remove-double-caching-repo-empty' into 'master'	Sean McGivern	2018-03-08	3	-5/+10
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove double caching of Repository#empty? Closes #43882 See merge request gitlab-org/gitlab-ce!17588
\| * \| \| \|	Memoize Repository#empty? instead of double caching the valuesh-remove-double-caching-repo-empty	Stan Hu	2018-03-07	3	-5/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We saw that in a customer instance, `empty?` was cached to be `true` even though `has_visible_content?` and `exists?` were `true`. This double caching can run into edge cases because there's no guarantee that the inner values will properly expire the outer one, especially if there is Redis replication lag. Consider this scenario: 1. `exists?` and `has_visible_content?` are false 2. `empty?` is expired 3. A subsequent call to `empty?` returns `true` because `exists?` is false even though `empty` is true 4. `exists?` and `has_visible_content?` are then expired 5. `exists?` and `has_visible_content?` are set to true 6. `empty?` is still stuck in the wrong value as `true` Closes #43882
* \| \| \| \|	Merge branch 'patch-28' into 'master'	Filipa Lacerda	2018-03-08	1	-1/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix link to Merge Request Coach See merge request gitlab-org/gitlab-ce!17633
\| * \| \| \| \|	Fix link to Merge Request Coach	Fabien Catteau	2018-03-08	1	-1/+1
\| \| \|/ / / \| \|/\| \| \|
* \| \| \| \|	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