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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Add Let's Encrypt clientacme-module	Vladimir Shushlin	2019-05-15	13	-4/+337
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Part of adding Let's Encrypt certificates for pages domains Add acme-client gem Client is being initialized by private key stored in secrets.yml Let's Encrypt account is being created lazily. If it's already created, Acme::Client just gets account_kid by calling new_account method Make Let's Encrypt client an instance Wrap order and challenge classes
*	Merge branch 'ce-jej/sso-enforcement-redirect' into 'master'	Rémy Coutable	2019-05-15	8	-22/+181
\|\ \| \| \| \| \| \| \| \|	Refactor RoutableActions to allow additional not_found checks See merge request gitlab-org/gitlab-ce!28243
\| *	Avoid passing not_found_or_authorized_proc around	James Edwards-Jones	2019-05-15	8	-22/+56
\| \| \| \| \| \| \| \| \| \|	Since this needs to be called on every find_routable!(Project, ... we can instead move it to a RoutableActions check.
\| *	Refactor RoutableActions to allow for additional checks	James Edwards-Jones	2019-05-15	1	-3/+9
\| \|
\| *	Added RoutableActions tests	James Edwards-Jones	2019-05-15	1	-0/+119
\| \|
* \|	Merge branch 'new-proj-member-scb' into 'master'	Phil Hughes	2019-05-15	3	-1/+26
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Resolve CE/EE diffs in new proj member import See merge request gitlab-org/gitlab-ce!28254
\| * \|	Resolve CE/EE diffs in new proj member importnew-proj-member-scb	Luke Bennett	2019-05-10	3	-1/+26
\| \| \| \| \| \| \| \| \| \| \| \|	Part of single codebase changes.
* \| \|	Merge branch 'proj-branches-index-scb' into 'master'	Phil Hughes	2019-05-15	1	-0/+3
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve CE/EE diffs in project branches See merge request gitlab-org/gitlab-ce!28261
\| * \| \|	Resolve CE/EE diffs in project branchesproj-branches-index-scb	Luke Bennett	2019-05-11	1	-0/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Part of single codebase changes.
* \| \| \|	Merge branch 'layouts-scb' into 'master'	Phil Hughes	2019-05-15	16	-4/+52
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve CE/EE diffs in app/views/layouts view Closes gitlab-ee#6647 See merge request gitlab-org/gitlab-ce!28197
\| * \| \| \|	Resolve CE/EE diffs in app/views/layouts viewlayouts-scb	Luke Bennett	2019-05-11	16	-4/+52
\| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \|	Part of single codebase changes.
* \| \| \|	Merge branch 'health-check-scb' into 'master'	Phil Hughes	2019-05-15	1	-1/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve CE/EE diffs in health check See merge request gitlab-org/gitlab-ce!28270
\| * \| \| \|	Resolve CE/EE diffs in health checkhealth-check-scb	Luke Bennett	2019-05-11	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Part of single codebase changes.
* \| \| \| \|	Merge branch '57239-remove-unused-h3-w3-classes' into 'master'	Phil Hughes	2019-05-15	1	-4/+0
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove unused h-3 and w-3 classes Closes #57239 See merge request gitlab-org/gitlab-ce!28297
\| * \| \| \| \|	Remove unused h-3 and w-3 classes57239-remove-unused-h3-w3-classes	Paul Slaughter	2019-05-13	1	-4/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	They were introduced in [this mr][1], with the intention of using the. Appaarently the usage was removed during review, but the new classes accidentally stayed around. [1]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/24724
* \| \| \| \| \|	Merge branch 'clone-panel-scb' into 'master'	Phil Hughes	2019-05-15	1	-0/+5
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve CE/EE diffs in _clone_panel See merge request gitlab-org/gitlab-ce!28309
\| * \| \| \| \| \|	Resolve CE/EE diffs in _clone_panelclone-panel-scb	Luke Bennett	2019-05-14	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Part of single codebase changes.
* \| \| \| \| \| \|	Merge branch 'zero-auth-proj-scb' into 'master'	Phil Hughes	2019-05-15	3	-5/+20
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve CE/EE diffs in zero_authorized_projects See merge request gitlab-org/gitlab-ce!28260
\| * \| \| \| \| \| \|	Resolve CE/EE diffs in zero_authorized_projectszero-auth-proj-scb	Luke Bennett	2019-05-11	3	-5/+20
\| \| \|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Part of single codebase changes.
* \| \| \| \| \| \|	Merge branch 'tabs-ldap-scb' into 'master'	Phil Hughes	2019-05-15	1	-0/+1
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve CE/EE diffs in devise ldap tabs See merge request gitlab-org/gitlab-ce!28252
\| * \| \| \| \| \| \|	Resolve CE/EE diffs in devise ldap tabstabs-ldap-scb	Luke Bennett	2019-05-10	1	-0/+1
\| \| \|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Part of single codebase changes.
* \| \| \| \| \| \|	Merge branch 'next-badge-link' into 'master'	Kushal Pandya	2019-05-15	2	-2/+19
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add link to next badge Closes #61503 See merge request gitlab-org/gitlab-ce!28162
\| * \| \| \| \| \| \|	Remove trailing whitespace for lintnext-badge-link	Marcel van Remmerden	2019-05-13	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Finish rebase process	Marcel van Remmerden	2019-05-13	1	-0/+16
\| \|\ \ \ \ \ \ \
\| \| * \| \| \| \| \| \|	Resolve merge conflict	Marcel van Remmerden	2019-05-07	1	-3/+4
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Change sizes from px to variables	Marcel van Remmerden	2019-05-07	1	-4/+4
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Refactor badge with link layout	Marcel van Remmerden	2019-05-07	2	-22/+18
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Adapt code to style guidelines	Marcel van Remmerden	2019-05-07	2	-9/+9
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Remove trailing whitespaces	Marcel van Remmerden	2019-05-07	1	-4/+3
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Remove whitespace	Marcel van Remmerden	2019-05-07	1	-2/+2
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Fix new lines	Marcel van Remmerden	2019-05-07	1	-1/+7
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Add badge link and adapt visual style to badges	Marcel van Remmerden	2019-05-07	2	-2/+18
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Add badge link and adapt visual style to badges	Marcel van Remmerden	2019-05-13	1	-3/+4
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'bvl-add-corrilation-id-to-all-exception' into 'master'	Douglas Barbosa Alexandre	2019-05-14	3	-10/+15
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add correlation id to all sentry errors Closes #61699 See merge request gitlab-org/gitlab-ce!28253
\| * \| \| \| \| \| \| \| \|	Add correlation id to all sentry errors	Bob Van Landuyt	2019-05-13	3	-10/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Before this, we were only adding the correlation id to the "acceptable exceptions" which we handle in code. But we need to add it to the default raven context so the information would be available for uncaught exceptions.
* \| \| \| \| \| \| \| \| \|	Merge branch 'patch-56' into 'master'	Evan Read	2019-05-14	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix typo See merge request gitlab-org/gitlab-ce!28276
\| * \| \| \| \| \| \| \| \| \|	Fix typo	Nicholas Bishop	2019-05-14	1	-1/+1
\|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge branch 'make-autocomplete-faster-with-lots-of-results' into 'master'53811-move-multiple-issue-boards-for-projects-to-core	Stan Hu	2019-05-14	10	-7/+23
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Optimise upload path calls See merge request gitlab-org/gitlab-ce!28264
\| * \| \| \| \| \| \| \| \| \|	Optimise upload path calls	Sean McGivern	2019-05-14	10	-7/+23
\| \| \|_\|_\|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	String#underscore isn't particularly slow, but it's possible for us to call it many times in a users autocomplete request, with mostly-static values ('User', 'Group', etc.). We can memoise this and save a surprising amount of time (around 10% of the total request time in some cases).
* \| \| \| \| \| \| \| \| \|	Merge branch 'fix-slow-preview-note-specs' into 'master'	Sean McGivern	2019-05-14	1	-6/+4
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix hiding of quick action prompt in specs See merge request gitlab-org/gitlab-ce!28285
\| * \| \| \| \| \| \| \| \|	Fix hiding of quick action prompt in specsfix-slow-preview-note-specs	Heinrich Lee Yu	2019-05-14	1	-6/+4
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'patch-58' into 'master'	Stan Hu	2019-05-14	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	delete feature flag when disabling Rugged See merge request gitlab-org/gitlab-ce!28289
\| * \| \| \| \| \| \| \| \| \|	delete feature flag when disabling Rugged	Ben Bodenmiller	2019-05-13	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'single-codebase-favicon-specs-ce' into 'master'	Rémy Coutable	2019-05-14	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	EE Backport to CE of EE!12404 See merge request gitlab-org/gitlab-ce!28292
\| * \| \| \| \| \| \| \| \| \| \|	EE backport to CE of favicon_spec.rbsingle-codebase-favicon-specs-ce move-ee-favicon-spec-changes-to-ee	lmcandrew	2019-05-13	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'fix-project-visibility-level-validation' into 'master'	Stan Hu	2019-05-14	3	-2/+18
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix project visibility level validation Closes #59379 See merge request gitlab-org/gitlab-ce!28305
\| * \| \| \| \| \| \| \| \| \| \| \|	Fix project visibility level validation	Peter Marko	2019-05-14	3	-2/+18
\| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch '55583-rename-method-conflicts' into 'master'	Jan Provaznik	2019-05-14	12	-46/+46
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rename methods that conflict in Rails 5.2 Closes #55583 See merge request gitlab-org/gitlab-ce!28281
\| * \| \| \| \| \| \| \| \| \| \| \|	Rename methods that conflict in Rails 5.255583-rename-method-conflicts	Heinrich Lee Yu	2019-05-12	12	-46/+46
\| \| \|_\|/ / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds suffix to enum methods and changes `in_groups` to `of_groups`
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'docs/mermaid-supported-by-docs-site' into 'master'	Achilleas Pipinellis	2019-05-14	2	-4/+9
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use real mermaid for mermaid result See merge request gitlab-org/gitlab-ce!28300