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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'ce-5987-group-file-templates' into 'master'	Robert Speicher	2018-10-19	4	-6/+8
\|\ \| \| \| \| \| \| \| \|	CE backport of changes to suppport group file templates See merge request gitlab-org/gitlab-ce!22310
\| *	Backport CE to changes to support group-level file templates	Nick Thomas	2018-10-19	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	When the feature is available, this setting allows admins to choose a project as a source of custom file templates. This is in addition to any instance-wide templates, whether custom or vendored into the GitLab codebase.
\| *	Stop using ivars in BlobHelper template methods	Nick Thomas	2018-10-19	3	-6/+6
\| \|
* \|	Rename "scheduled" label/badge of delayed jobs to "delayed"	Shinya Maeda	2018-10-19	1	-1/+1
\| \|
* \|	Change single-item breadcrumbs to page titles	Dmitriy Zaporozhets	2018-10-19	14	-24/+63
\| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \|	Adjust size and alignment of emojis of user status in user menu	Dennis Tang	2018-10-19	1	-3/+5
\| \|
* \|	Change markdown header tab anchor links to buttons	George Tsiolis	2018-10-19	1	-2/+2
\| \|
* \|	Merge branch 'bvl-remove-forked-project-link' into 'master'	Sean McGivern	2018-10-19	1	-1/+1
\|\ \ \| \|/ \|/\| \| \| \| \| \| \| \| \|	Remove ForkedProjectLink model Closes #38883 See merge request gitlab-org/gitlab-ce!22226
\| *	Remove the `ForkedProjectLink` model	Bob Van Landuyt	2018-10-19	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This removes the `ForkedProjectLink` model that has been replaced by the `ForkNetworkMember` and `ForkNetwork` combination. All existing relations have been adjusted to use these new models. The `forked_project_link` table has been dropped. The "Forks" count on the admin dashboard has been updated to count all `ForkNetworkMember` rows and deduct the number of `ForkNetwork` rows. This is because now the "root-project" of a fork network also has a `ForkNetworkMember` row. This count could become inaccurate when the root of a fork network is deleted.
* \|	Resolve "Re-arrange help-related user menu items into new Help menu"	Dennis Tang	2018-10-18	4	-8/+13
\| \|
* \|	Show wiki empty state layout on wiki-only project overview page	Jacques Erasmus	2018-10-18	1	-8/+8
\| \|
* \|	Merge branch 'ml-qa-code-owners' into 'master'	Rémy Coutable	2018-10-18	1	-1/+1
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	QA: Add support for pushing and viewing files See merge request gitlab-org/gitlab-ce!21911
\| * \|	Add support for pushing and viewing files	Mark Lapierre	2018-10-17	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The MR below adds a test for the code owners feature. This adds the part of those changes specific to CE - the ability to add and view files in a project. https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/7368
* \| \|	Merge branch 'change-generating-url-functions' into 'master'	Rémy Coutable	2018-10-18	2	-2/+2
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	change generating url functions for external url See merge request gitlab-org/gitlab-ce!22389
\| * \| \|	change generating url functions for external url	benjamin	2018-10-16	2	-2/+2
\| \|/ /
* \| \|	Merge branch '52527-harden-wiki-against-missing-last-version' into 'master'	Douglas Barbosa Alexandre	2018-10-17	2	-3/+5
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Harden the wiki against missing last_versions Closes #52527 See merge request gitlab-org/gitlab-ce!22377
\| * \| \|	Harden the wiki against missing last_versions	Nick Thomas	2018-10-17	2	-3/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Currently, we assume a "last_version" always exists for a wiki page. In production, this is not always true. So, guard uses of it with a null check.
* \| \| \|	Extend Create New Merge Request test to also add a label	Aleksandr Soborov	2018-10-17	5	-9/+9
\| \| \| \|
* \| \| \|	Allow JIRA to login using email and API token	Felipe Artur	2018-10-17	1	-1/+1
\| \| \| \|
* \| \| \|	Resolve "Integrate new vue+vuex code base with new API and remove old haml code"	Filipa Lacerda	2018-10-17	4	-57/+8
\| \| \| \|
* \| \| \|	Merge branch 'sh-fix-commit-signatures-error' into 'master'	Douwe Maan	2018-10-16	1	-2/+2
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix commit signature error when project is disabled Closes #50903 See merge request gitlab-org/gitlab-ce!22344
\| * \| \| \|	Fix commit signature error when project is disabled	Stan Hu	2018-10-15	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When a project is disabled, visiting the home page would show, "An error occurred while loading commit signatures". This change checks that the user has permission to view the project to avoid unnecessary GPG signature lookups. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/50903
* \| \| \| \|	Merge branch 'qa-handle-sign-up-with-terms' into 'master'	Nick Thomas	2018-10-16	1	-1/+1
\|\ \ \ \ \ \| \|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	[QA] Handle sign-up when terms must be accepted See merge request gitlab-org/gitlab-ce!22374
\| * \| \| \|	[QA] Handle sign-up when terms must be accepted	Rémy Coutable	2018-10-15	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \|	Show available clusters when installed or updated	Peter Leitzen	2018-10-16	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Before this commit updating Prometheus (e.g. adding alerts) made it "updated" therefore not installed.
* \| \| \| \|	Merge branch 'revert-f90fc922' into 'master'	Mike Greiling	2018-10-15	14	-38/+4
\|\ \ \ \ \ \| \|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert "Merge branch 'ce-6983-promote-starting-a-gitlab-com-trial' into 'master'" See merge request gitlab-org/gitlab-ce!22315
\| * \| \| \|	Revert "Merge branch 'ce-6983-promote-starting-a-gitlab-com-trial' into ↵	Luke Bennett	2018-10-12	14	-38/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master'" This reverts merge request !21551
* \| \| \| \|	Replace `<i>` in vue components with `<icon>`	George Tsiolis	2018-10-15	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Merge branch 'sh-remove-koding' into 'master'	Douwe Maan	2018-10-15	6	-50/+0
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove Koding integration and documentation Closes #39697 See merge request gitlab-org/gitlab-ce!22334
\| * \| \| \|	Remove Koding integration and documentation	Stan Hu	2018-10-12	6	-50/+0
\| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This integration no longer works and does not appear to be supported. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/39697
* \| \| \|	Prioritize group settings, improve panel titles, disable submit without changes	Luke Bennett	2018-10-15	12	-90/+120
\| \| \| \|
* \| \| \|	Resolve "Personal projects pagination in Profile Overview tab is broken"	Martin Wortschack	2018-10-15	1	-1/+2
\| \|_\|/ \|/\| \|
* \| \|	Merge branch 'sh-add-deploy-token-qa' into 'master'	Rémy Coutable	2018-10-15	3	-9/+9
\|\ \ \ \| \|_\|/ \|/\| \| \| \| \| \| \| \|	Add GitLab QA spec for adding a deploy token See merge request gitlab-org/gitlab-ce!22207
\| * \|	Add GitLab QA spec for adding a deploy token	Stan Hu	2018-10-12	3	-9/+9
\| \|/
* \|	Backport CE changes for Ops Dashboard in EE	Peter Leitzen	2018-10-12	1	-0/+1
\|/
*	Merge branch 'gt-update-application-copy-secret-to-clipboard-data' into 'master'	Annabel Dunstone Gray	2018-10-11	2	-2/+2
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Update copy to clipboard button data for application secret Closes #52572 See merge request gitlab-org/gitlab-ce!22268
\| *	Update copy to clipboard button data for application secret	George Tsiolis	2018-10-10	2	-2/+2
\| \|
* \|	Stuck block URL links to runners settings	Filipa Lacerda	2018-10-11	1	-1/+3
\| \|
* \|	Merge branch 'qa-257-instance-wide-saml-sso' into 'master'	Rémy Coutable	2018-10-11	1	-1/+1
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Instance SAML SSO e2e test Closes gitlab-qa#257 See merge request gitlab-org/gitlab-ce!22271
\| * \|	Initial commit	Sanad Liaquat	2018-10-11	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use ACCEPT_INSECURE_CERTS env var and fix step Simplify saml signin Fix rubo cop offence Add missing # frozen_string_literal: true
* \| \|	Add new sort option "most_stars" to "Group > Children" pages	Rene Hennig	2018-10-11	1	-1/+1
\| \| \|
* \| \|	Merge branch 'ml-qa-add-members' into 'master'	Rémy Coutable	2018-10-11	3	-4/+4
\|\ \ \ \| \|/ / \|/\| \| \| \| \| \| \| \|	QA: Add test of adding a member to a project See merge request gitlab-org/gitlab-ce!21753
\| * \|	Add test to add a new project member	Mark Lapierre	2018-10-10	3	-4/+4
\| \|/ \| \| \| \| \| \|	Adds a new QA test and the required page objects and related changes
* \|	Retry registration 3 times before failing	Mark Lapierre	2018-10-10	1	-6/+6
\|/ \| \| \| \| \| \| \| \|	Registration intermittently fails without an obvious cause. The action to click the button seems to move focus to the right button but nothing happens. This change attempts to retry the action under the assumption that Capybara or Chrome is misbehaving. It also updates the selectors for the sign up page.
*	Merge branch 'zj-circuit-breaker-removal' into 'master'	Douwe Maan	2018-10-10	4	-45/+2
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Remove Git circuit breaker Closes #45405 See merge request gitlab-org/gitlab-ce!22212
\| *	Remove Git circuit breaker	Zeger-Jan van de Weg	2018-10-10	4	-45/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Was introduced in the time that GitLab still used NFS, which is not required anymore in most cases. By removing this, the API it calls will return empty responses. This interface has to be removed in the next major release, expected to be 12.0.
* \|	Merge branch '7631-remove-security-report-summary-from-pipelines-view' into ↵	Fatih Acet	2018-10-10	1	-2/+0
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Backport of CE changes from https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/7844 See merge request gitlab-org/gitlab-ce!22221
\| * \|	Remove security report summary from pipelines view	Lukas Eipert	2018-10-09	1	-2/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This removes the Vue component, corresponding tests and haml/bundle entry points for the Security Report summary in the pipelines view
* \| \|	Merge branch 'ml-qa-add-file-templates' into 'master'	Sean McGivern	2018-10-10	3	-8/+8
\|\ \ \ \| \|_\|/ \|/\| \| \| \| \| \| \| \|	Add test of adding file templates via Web IDE and Files view See merge request gitlab-org/gitlab-ce!21914
\| * \|	Add tests of adding file templates	Mark Lapierre	2018-10-09	3	-8/+8
\| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds tests that adds new files via file templates via the Files view and the Web IDE. Includes changes to page objects and associated code Fetches template content from the API rather than hardcoding strings that will need to be updated if the templates change. Some of the content is stored as flat files but we can't use them because they're not included in the docker images gitlab-qa uses.