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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Force a full GC after importing a projectsh-force-gc-after-import	Stan Hu	2019-04-01	5	-3/+24
\| \| \| \| \| \| \| \| \| \| \| \|	During a project import, it's possible that new branches are created by the importer to handle pull requests that have been created from forked projects, which would increment the `pushes_since_gc` value via `HousekeepingService.increment!` before a full garbage collection gets to run. This causes HousekeepingService to skip the full `git gc` and move to the incremental repack mode. To ensure that a garbage collection is run to pack refs and objects, explicitly execute the task. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/59477
*	Merge branch '59441-add-base-domain-to-cluster-api' into 'master'	Nick Thomas	2019-04-01	5	-3/+21
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Include cluster domain in Project Clusters API Closes #59441 See merge request gitlab-org/gitlab-ce!26735
\| *	Include cluster domain into Project Cluster API	Mayra Cabrera	2019-04-01	5	-3/+21
\|/ \| \| \| \| \| \| \| \|	Domain was introduced on 11.8 and was not included on the Project Cluster API. With this change user will be able to include domain when adding and updating a cluster. Domain will also be included on the GET calls. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/59441
*	Merge branch 'check-mergeability-in-merge-to-ref-service' into 'master'	Douglas Barbosa Alexandre	2019-04-01	5	-14/+50
\|\ \| \| \| \| \| \| \| \|	Check mergeability in merge to ref service See merge request gitlab-org/gitlab-ce!26757
\| *	Check mergeability in merge to ref servicecheck-mergeability-in-merge-to-ref-service	Shinya Maeda	2019-04-01	5	-14/+50
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	and add spec Add changelog ok ok
* \|	Merge branch 'contribute/fix-nav-links-archived-project' into 'master'	Douglas Barbosa Alexandre	2019-04-01	3	-2/+59
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Disable inaccessible navigation links upon archiving a project Closes #58793 See merge request gitlab-org/gitlab-ce!26020
\| * \|	Disable inaccessible navigation links upon archiving a project	Elias Werberich	2019-03-31	3	-2/+59
\| \| \|
* \| \|	Merge branch 'enable-rubocop-application-record' into 'master'	Lin Jen-Shin	2019-04-01	4	-2/+31
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Document ApplicationRecord / pluck_primary_key Closes #59690 See merge request gitlab-org/gitlab-ce!26764
\| * \| \|	Document ApplicationRecord / pluck_primary_key	Nick Thomas	2019-03-29	4	-2/+31
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We also enable the rubocop that makes it mandatory
* \| \| \|	Merge branch '57669-fix-bug-clicking-file-header-refreshes-page' into 'master'	Clement Ho	2019-04-01	6	-24/+171
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix bug where clicking file header in diff refreshes page Closes #57669 See merge request gitlab-org/gitlab-ce!26422
\| * \| \| \|	Scroll to diff file when clicking on file name57669-fix-bug-clicking-file-header-refreshes-page	Sam Bigelow	2019-03-29	6	-24/+171
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Add an ID to the diff content - handle clicking on file name in diffFileHeader when it is not a link to another page but rather a link to an element on the page
* \| \| \| \|	Merge branch 'fj-59547-fix-has-commits' into 'master'	Nick Thomas	2019-04-01	2	-4/+11
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix MergeRequest#has_commits? nil comparison Closes #59547 See merge request gitlab-org/gitlab-ce!26828
\| * \| \| \| \|	Fix MergeRequest#has_commits? nil comparison	Francisco Javier López	2019-04-01	2	-4/+11
\|/ / / / /
* \| \| \| \|	Merge branch 'frozen_string_spec_models' into 'master'	Grzegorz Bizon	2019-04-01	275	-11/+583
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add # frozen_string_literal to spec/models See merge request gitlab-org/gitlab-ce!26791
\| * \| \| \| \|	Don't use frozen_string_literal for nowfrozen_string_spec_models	Thong Kuah	2019-04-01	1	-2/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	While we debug why this is failing
\| * \| \| \| \|	Fix license_template_spec to not modify String	Thong Kuah	2019-04-01	1	-6/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revamp how spec verifies proc#call called only once
\| * \| \| \| \|	Don't modify String in instance_configuration_spec	Thong Kuah	2019-04-01	1	-2/+2
\| \| \| \| \| \|
\| * \| \| \| \|	Fix cert_manager_spec to not modify String	Thong Kuah	2019-04-01	1	-3/+24
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also break up long string to be readable
\| * \| \| \| \|	Add # frozen_string_literal to spec/models	Thong Kuah	2019-04-01	276	-0/+552
\| \| \|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	Adds `# frozen_string_literal: true` to spec/models ruby files
* \| \| \| \|	Merge branch 'refactor/services_list_of_apps_responsibility' into 'master'	Grzegorz Bizon	2019-04-01	4	-47/+32
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Dry up and remove responsibilities from services Closes #58646 See merge request gitlab-org/gitlab-ce!26731
\| * \| \| \| \|	Dry up and remove responsibilities	João Cunha	2019-04-01	4	-47/+32
\|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Dry create_service.rb and update_service.rb duplicated code - Remove known list of applications responsibility from services - Refactor the complex builders->builder call from base_service.rb
* \| \| \| \|	Merge branch '59694-markdown-area' into 'master'	Phil Hughes	2019-04-01	3	-6/+2
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix styleling for `app/assets/stylesheets/framework/markdown_area.scss` See merge request gitlab-org/gitlab-ce!26768
\| * \| \| \| \|	Replaces md-area with position-relative for markdown areas	Filipa Lacerda	2019-04-01	3	-6/+2
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'patch-49' into 'master'	Stan Hu	2019-04-01	1	-0/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update lfs_administration.md to add new line in order to have table draw properly See merge request gitlab-org/gitlab-ce!26827
\| * \| \| \| \| \|	Update lfs_administration.md to add new line in order to have table draw ↵	Rick Heil	2019-04-01	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	properly
* \| \| \| \| \| \|	Merge branch 'ce-10220-link-to-note-from-email' into 'master'	Kushal Pandya	2019-04-01	1	-0/+4
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Display link to next to note in text email See merge request gitlab-org/gitlab-ce!26695
\| * \| \| \| \| \| \|	Display link to review note in text emailce-10220-link-to-note-from-email	Mark Chao	2019-03-28	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	similar with HTML email
* \| \| \| \| \| \| \|	Merge branch 'fix_qa_auto_devops_spec' into 'master'	Sanad Liaquat	2019-04-01	1	-1/+1
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix typo in QA auto_devops spec See merge request gitlab-org/gitlab-ce!26809
\| * \| \| \| \| \| \| \|	Fix typo in QA auto_devops specfix_qa_auto_devops_spec	Thong Kuah	2019-04-01	1	-1/+1
\| \| \|_\|_\|/ / / / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'sh-fix-project-branches-merge-status' into 'master'	Douwe Maan	2019-04-01	3	-5/+30
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix API /project/:id/branches not returning correct merge status Closes #56250 See merge request gitlab-org/gitlab-ce!26785
\| * \| \| \| \| \| \| \|	Revise merged branch check to green light up to N branchessh-fix-project-branches-merge-status	Stan Hu	2019-03-30	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The main point of this check is to ensure we aren't checking all branches, not that we have an exact count.
\| * \| \| \| \| \| \| \|	Fix API /project/:id/branches not returning correct merge status	Stan Hu	2019-03-30	3	-3/+28
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/24034 introduced a regression where only the first 20 branches were used to determine whether a branch has been merged because the pagination was applied incorrectly. Requesting the second page of branches via the API would always have the wrong merge status. We fix this by properly paginating the branches before requesting their merge status. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/56250
* \| \| \| \| \| \| \| \|	Merge branch 'uniq-constraints-on-issue/mr-labels' into 'master'	Sean McGivern	2019-04-01	4	-1/+30
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	add a uniq constraints on issues and mrs labels See merge request gitlab-org/gitlab-ce!25435
\| * \| \| \| \| \| \| \| \|	add a uniq constraints on issues and mrs labels	Antoine Huret	2019-04-01	4	-1/+30
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge branch '6539-extract-ee-specific-code' into 'master'	Rémy Coutable	2019-04-01	3	-0/+10
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add no-op license helper to CE See merge request gitlab-org/gitlab-ce!26723
\| * \| \| \| \| \| \| \| \|	Add no-op license helper to CE6539-extract-ee-specific-code	Alexandru Croitor	2019-03-28	3	-0/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add no-op license helper to CE to make it compatible with EE codebase. Helper will be overwritten in EE to allow for CE specs to be run under EE codebase. https://gitlab.com/gitlab-org/gitlab-ee/issues/6539
* \| \| \| \| \| \| \| \| \|	Merge branch 'ce_issue_10672' into 'master'	Rémy Coutable	2019-04-01	1	-0/+11
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[CE] - Load 'Gitlab::Jira::Middleware' if it exists See merge request gitlab-org/gitlab-ce!26665
\| * \| \| \| \| \| \| \| \|	Load 'Gitlab::Jira::Middleware' if it exists	Felipe Artur	2019-04-01	1	-0/+11
\|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Loads 'Gitlab::Jira::Middleware' only if it exists so this initializer can be backported to CE.
* \| \| \| \| \| \| \| \|	Merge branch 'patch-31' into 'master'	Evan Read	2019-04-01	1	-5/+2
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Clarify that personal access token should be sent as password for authentication. See merge request gitlab-org/gitlab-ce!22603
\| * \| \| \| \| \| \| \| \|	Clarify that personal access token should be sent as password for ↵	Tim Hobbs	2019-04-01	1	-5/+2
\|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	authentication.
* \| \| \| \| \| \| \| \|	Merge branch 'patch-48' into 'master'	Evan Read	2019-04-01	1	-0/+26
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update to the commits.md, more details about how to use the --form method for creating a commit See merge request gitlab-org/gitlab-ce!26329
\| * \| \| \| \| \| \| \| \|	Update to the commits.md, more details about how to use the --form method ↵	Jochum van der Ploeg	2019-04-01	1	-0/+26
\|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	for creating a commit
* \| \| \| \| \| \| \| \|	Merge branch 'docs-fix-import-mixin-from-ee-else-ce-path-example' into 'master'	Evan Read	2019-04-01	1	-6/+7
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix example block for mixin from ee-else-ce path See merge request gitlab-org/gitlab-ce!26808
\| * \| \| \| \| \| \| \| \|	Fix example block for mixin from ee-else-ce pathdocs-fix-import-mixin-from-ee-else-ce-path-example	Ezekiel Kigbo	2019-03-31	1	-6/+7
\| \| \|_\|/ / / / / / \| \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'sh-fix-image-permissions' into 'master'	Evan Read	2019-04-01	3	-0/+0
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove executable permission on images See merge request gitlab-org/gitlab-ce!26800
\| * \| \| \| \| \| \| \| \|	Remove executable permission on imagessh-fix-image-permissions	Stan Hu	2019-03-30	3	-0/+0
\| \|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes https://gitlab.com/gitlab-org/gitlab-ee/-/jobs/187433314
* \| \| \| \| \| \| \| \|	Merge branch 'patch-49' into 'master'	Evan Read	2019-04-01	1	-0/+11
\|\ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update lfs_administration.md to add documentation on Rackspace Cloud Files for... See merge request gitlab-org/gitlab-ce!26720
\| * \| \| \| \| \| \| \|	Update lfs_administration.md to add documentation on Rackspace Cloud Files ↵	Rick Heil	2019-03-28	1	-0/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	for LFS object storage, including a note on Fog requiring the temp-url key even when the object container is public ("CDN enabled" in Rackspace terms)
* \| \| \| \| \| \| \| \|	Merge branch 'jira-transition-id-field' into 'master'	Evan Read	2019-04-01	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Jira Services Doc update to String See merge request gitlab-org/gitlab-ce!26683
\| * \| \| \| \| \| \| \| \|	Jira Services Doc update to Stringjira-transition-id-field	Davin Walker	2019-03-27	1	-1/+1
\| \| \| \| \| \| \| \| \| \|