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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Document click_ vs. go_to_ standard for e2e testsqa/document_click_vs_go_to	Walmyr Lima	2019-04-01	2	-0/+47
\| \| \| \|	Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/59645.
*	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
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'nowtryz/docker-pages-docs' into 'master'	Evan Read	2019-04-01	1	-7/+22
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add troubleshooting info for Docker and GitLab Pages See merge request gitlab-org/gitlab-ce!26662
\| * \| \| \| \| \| \|	Add troubleshooting info for Docker and GitLab Pagesnowtryz/docker-pages-docs	Damien	2019-03-27	1	-7/+22
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'clarify_onlychanges' into 'master'	Evan Read	2019-04-01	1	-13/+12
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Clarify onlychanges See merge request gitlab-org/gitlab-ce!22790
\| * \| \| \| \| \| \|	doc: Professionalize only:changes section	Olliver Schinagl	2019-03-25	1	-13/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Using we and you isn't very pleasant to read nor is it professional. So lets remove these invocations to have a more pleasant read. Signed-off-by: Olliver Schinagl <oliver@schinagl.nl>
* \| \| \| \| \| \| \|	Merge branch '59309-objectstorage-set-no-acl' into 'master'	Stan Hu	2019-03-30	2	-2/+6
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't try to set any ACL on uploaded objects Closes #59309 See merge request gitlab-org/gitlab-ce!26781
\| * \| \| \| \| \| \|	Don't try to set any ACL on uploaded objects	Bastian Blank	2019-03-30	2	-2/+6
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Set ACL of uploaded objects to not-public (fog-aws) or no ACL at all (fog-google). Value is ignored by other supported backends (fog-aliyun, fog-openstack, fog-rackspace) This allows uploads to GCS with ACL support disabled.
* \| \| \| \| \| \|	Merge branch 'sh-fix-failing-spec-on-first-da' into 'master'	James Lopez	2019-03-30	1	-1/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix failing spec in spec/features/users/login_spec.rb Closes #59731 See merge request gitlab-org/gitlab-ce!26787
\| * \| \| \| \| \| \|	Fix failing spec in spec/features/users/login_spec.rb	Stan Hu	2019-03-29	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This spec would start to fail on the first of the month because the generated text would have a zero-padded day (e.g. 01 vs 1), whereas the expected text check used an unpadded day via the `-d` parameter in strftime (https://apidock.com/ruby/Date/strftime). To fix this, we use use the `d` parameter to pad zeros. This spec was introduced recently in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/25731. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/59731
* \| \| \| \| \| \| \|	Merge branch 'qa-ml-fix-push-file-size-test' into 'master'button-arrangement	Dan Davison	2019-03-29	1	-2/+3
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[QA] Fix 2 of 3 problems with the push file size tests See merge request gitlab-org/gitlab-ce!26741
\| * \| \| \| \| \| \| \|	Fix push file size testqa-ml-fix-push-file-size-test	Mark Lapierre	2019-03-28	1	-2/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't try to re-create master as a new branch. Expect a Git error raised when the file it too large.
* \| \| \| \| \| \| \| \|	Merge branch 'leipert-hotfix-ci-yml' into 'master'	Stan Hu	2019-03-29	1	-7/+7
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix GitLab CI branch matching pattern See merge request gitlab-org/gitlab-ce!26777
\| * \| \| \| \| \| \| \| \|	Fix GitLab CI branch matching pattern	Lukas Eipert	2019-03-29	1	-7/+7
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'dennis-positioning-important' into 'master'	Clement Ho	2019-03-29	1	-4/+4
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Designate common positioning classes as `!important` a la Bootstrap See merge request gitlab-org/gitlab-ce!26621
\| * \| \| \| \| \| \| \| \| \|	Designate common positioning classes as important a la Bootstrapdennis-positioning-important	Dennis Tang	2019-03-26	1	-4/+4
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'docs/zj-patch-json' into 'master'	Nick Thomas	2019-03-29	1	-2/+2
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use valid data in our GetCommit example response See merge request gitlab-org/gitlab-ce!26770
\| * \| \| \| \| \| \| \| \| \| \|	Use valid data in our GetCommit example responsedocs/zj-patch-json	Zeger-Jan van de Weg	2019-03-29	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When validating parsing, copy pasting should just work, but instead we created
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'rename-cluster-managed-method' into 'master'	Douglas Barbosa Alexandre	2019-03-29	12	-26/+137
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Renames Cluster#managed? to provided_by_user? See merge request gitlab-org/gitlab-ce!26567
\| * \| \| \| \| \| \| \| \| \| \| \|	Renames Cluster#managed? to provided_by_user?	Mayra Cabrera	2019-03-29	12	-26/+137
\|/ / / / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This will allow to user the term managed? on https://gitlab.com/gitlab-org/gitlab-ce/issues/56557. Managed? will be used to distinct clusters that are automatically managed by GitLab
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'update-contribution-closing-policy' into 'master'	Marcia Ramos	2019-03-29	1	-2/+5
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update contribution closing policy See merge request gitlab-org/gitlab-ce!26728
\| * \| \| \| \| \| \| \| \| \| \|	Docs: Update contribution closing policy to include community attribution	Lucas Charles	2019-03-29	1	-2/+5
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'winh-jest-html-fixtures' into 'master'	Clement Ho	2019-03-29	4	-10/+47
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add helpers for HTML fixtures to Jest Closes #57998 See merge request gitlab-org/gitlab-ce!26739
\| * \| \| \| \| \| \| \| \| \| \| \|	Add Karma-style fixture helpers to Jestwinh-jest-html-fixtures	Winnie Hellmann	2019-03-29	3	-2/+17
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Add helpers for HTML fixtures to Jest	Winnie Hellmann	2019-03-29	1	-6/+20
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Add workaround for innerText in Jest	Winnie Hellmann	2019-03-29	1	-0/+9
\| \| \| \| \| \| \| \| \| \| \| \| \|