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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch '44508-fix-fork-namespace-images' into 'master'	Rémy Coutable	2018-03-28	1	-1/+1
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "When forking any project, the images (avatar) of the groups (and subgroups) are not loaded." Closes #44508 See merge request gitlab-org/gitlab-ce!18048
\| *	Fix bug rendering group icons when forking	Mark Fletcher	2018-03-28	1	-1/+1
\| \| \| \| \| \| \| \|	- NamespacesHelper#namespace_icon should return a URL instead of an image_tag for groups
* \|	'Assigned Issues' and 'Assigned Merge Requests' as dashboard user choices	Elias Werberich	2018-03-27	1	-6/+8
\|/
*	Merge branch 'pages_force_https' into 'master'	Nick Thomas	2018-03-23	1	-0/+18
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	HTTPS only Pages Closes #28857 See merge request gitlab-org/gitlab-ce!16273
\| *	Add HTTPS-only pages	Rob Watson	2018-03-22	1	-0/+18
\| \| \| \| \| \| \| \|	Closes #28857
* \|	Show gitaly address instead of disk path	Jacob Vosmaer	2018-03-23	1	-1/+1
\| \|
* \|	Merge branch 'mark-legacy-git-access' into 'master'	Sean McGivern	2018-03-23	1	-1/+1
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Route path lookups through legacy_disk_path See merge request gitlab-org/gitlab-ce!17743
\| * \|	Route path lookups through legacy_disk_pathmark-legacy-git-access	Jacob Vosmaer	2018-03-21	1	-1/+1
\| \| \|
* \| \|	Add read-only banner to all pages	Toon Claes	2018-03-22	1	-0/+7
\| \|/ \|/\| \| \| \| \| \| \| \| \| \| \|	When the database is in a read-only state, display a banner on each page informing the user they cannot write to that GitLab instance. Closes gitlab-org/gitlab-ce#43937.
* \|	Merge branch 'master' into 'latest-security-to-master-21-03-18'	James Lopez	2018-03-22	1	-0/+7
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # Gemfile # Gemfile.lock
\| * \|	Issuable list: add tooltips to icons	Lukas Eipert	2018-03-21	1	-0/+7
\| \| \|
* \| \|	Merge branch 'fj-15329-services-callbacks-ssrf' into 'security-10-6'	Douwe Maan	2018-03-21	1	-1/+2
\|/ / \| \| \| \| \| \| \| \|	Server Side Request Forgery in Services and Web Hooks See merge request gitlab/gitlabhq!2337
* \|	fixed ide_edit_button not existingmake-ide-ce	Phil Hughes	2018-03-20	1	-0/+11
\| \|
* \|	remove un-used IDE helper module	Phil Hughes	2018-03-20	1	-14/+0
\| \|
* \|	Move IDE to CE	Phil Hughes	2018-03-20	1	-0/+14
\| \| \| \| \| \| \| \|	This also makes the IDE generally available
* \|	Merge branch 'issue_25542' into 'master'	Sean McGivern	2018-03-20	1	-23/+0
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve JIRA event descriptions Closes #25542 See merge request gitlab-org/gitlab-ce!17811
\| * \|	Improve JIRA event descriptionsissue_25542	Felipe Artur	2018-03-19	1	-23/+0
\| \| \|
* \| \|	Remove `www.` from `twitter_url` helperrs-twitter-helper	Robert Speicher	2018-03-19	1	-3/+3
\|/ / \| \| \| \| \| \| \| \| \| \|	Twitter redirects `www.twitter.com` to `twitter.com` Also removes unnecessary regex escapes, just 'cause.
* \|	Merge branch '43720-update-fe-webpack-docs' into 'master'	Jacob Schatz	2018-03-13	1	-5/+0
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Document webpack_bundle_tag replacement method" Closes #43720 and #42704 See merge request gitlab-org/gitlab-ce!17706
\| * \|	remove deprecated page_specific_javascript_bundle_tag	Mike Greiling	2018-03-12	1	-5/+0
\| \|/
* \|	Merge branch 'rd-fix-github-url-when-listing-repositories-at-importing' into ↵	Douwe Maan	2018-03-12	1	-5/+8
\|\ \ \| \|/ \|/\| \| \| \| \| \| \| \| \|	'master' Fix provider server URL used when listing repos to import See merge request gitlab-org/gitlab-ce!17692
\| *	Fix provider server URL used when listing repos to importrd-fix-github-url-when-listing-repositories-at-importing	Rubén Dávila	2018-03-12	1	-5/+8
\| \| \| \| \| \| \| \|	Also use Gitlab::Auth::OAuth::Provider.config_for to access OmniAuth config
* \|	Merge branch 'fix-duplicate-notes' into 'master'	Filipa Lacerda	2018-03-12	1	-1/+1
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed issue notes being duplicated Closes #44099 See merge request gitlab-org/gitlab-ce!17671
\| * \|	Fixed issue notes being duplicated	Phil Hughes	2018-03-09	1	-1/+1
\| \|/ \| \| \| \| \| \|	Closes #44099
* \|	Add helpers for labels dropdown	Kushal Pandya	2018-03-12	1	-0/+33
\|/
*	Merge branch 'master' into 'ce-3839-ci-cd-only-github-projects-fe'ce-3839-ci-cd-only-github-projects-fe	Douwe Maan	2018-03-07	2	-5/+29
\|\ \| \| \| \| \| \|	# Conflicts: # locale/gitlab.pot
\| *	Allow maintainers to edit directly in a fork	Bob Van Landuyt	2018-03-07	1	-5/+16
\| \|
\| *	Allow a user to select `allow maintainer to push`	Bob Van Landuyt	2018-03-07	1	-0/+13
\| \| \| \| \| \| \| \| \| \| \| \|	When a project is not private, and the source branch not protected the user can now select the option to allow maintainers to push to this branch
* \|	CE backport for creating CI/CD projects from GitHub	Rubén Dávila	2018-03-07	1	-0/+36
\|/
*	Merge branch 'master' into 'issue_38337'	Felipe Artur	2018-03-06	10	-44/+42
\|\ \| \| \| \| \| \| \| \|	# Conflicts: # app/models/group.rb # db/schema.rb
\| *	Merge branch '40187-project-branch-dashboard-with-active-stale-branches' ↵	Rémy Coutable	2018-03-06	1	-11/+0
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Add overview of branches and filtered views for active/stale branches Closes #40187 et #17293 See merge request gitlab-org/gitlab-ce!15402
\| \| *	Add overview of branches and a filter for active/stale branches	Takuya Noguchi	2018-03-06	1	-11/+0
\| \| \|
\| * \|	Merge branch 'ce-3839-ci-cd-only-projects-fe' into 'master'	Robert Speicher	2018-03-05	1	-0/+26
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Create CI/CD-only projects by URL -- CE backport See merge request gitlab-org/gitlab-ce!17342
\| \| * \|	CI/CD-only projects FE	Eric Eastwood	2018-03-05	1	-0/+26
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	See https://gitlab.com/gitlab-org/gitlab-ee/issues/3839 Conflicts: app/assets/javascripts/projects/project_new.js app/views/shared/_import_form.html.haml ee/app/controllers/ee/projects_controller.rb ee/spec/features/projects/new_project_spec.rb locale/gitlab.pot
\| * \| \|	Merge branch 'dz-use-less-deprecated-methods' into 'master'	Douwe Maan	2018-03-05	5	-14/+14
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reduce usage of deprecated *_with_namespace methods See merge request gitlab-org/gitlab-ce!17523
\| \| * \| \|	Replace deprecated name_with_namespace with full_name in app and spec	Dmitriy Zaporozhets	2018-03-05	4	-7/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| \| * \| \|	Replace deprecated path_with_namespace with full_path	Dmitriy Zaporozhets	2018-03-05	1	-7/+7
\| \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \|	Merge branch 'kp-label-select-vue' into 'master'	Phil Hughes	2018-03-05	1	-0/+1
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Port Labels Select dropdown to Vue See merge request gitlab-org/gitlab-ce!17411
\| \| * \| \|	Allow exposing methods to `gon_helper`	Kushal Pandya	2018-03-05	1	-0/+1
\| \| \|/ /
\| * \| \|	Merge branch '43334-reply-by-email-did-not-pick-up-unsubscribe-quick-action' ↵	Rémy Coutable	2018-03-05	1	-1/+1
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Resolve "Reply-by-email did not pick up /unsubscribe quick action" Closes #43334 See merge request gitlab-org/gitlab-ce!17482
\| \| * \| \|	Fix quick actions for users who cannot update issues and MRs43334-reply-by-email-did-not-pick-up-unsubscribe-quick-action	Sean McGivern	2018-03-02	1	-1/+1
\| \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	There are several quick actions now that don't need this access - /todo and /unsubscribe for instance - but when these were first added, there weren't. Quick actions are now responsible for checking their own permissions.
\| * \| \|	removed helper methods	Phil Hughes	2018-03-02	2	-18/+0
\| \|/ /
* \| \|	Address review comments	Felipe Artur	2018-03-05	2	-8/+6
\| \| \|
* \| \|	Bring one group board to CE	Felipe Artur	2018-03-03	3	-9/+25
\|/ /
* \|	Remove u2f webpack bundle	Mike Greiling	2018-03-01	1	-5/+0
\| \|
* \|	Merge branch 'feature/move_oauth_modules_to_auth_dir_structure' into 'master'	Douwe Maan	2018-03-01	3	-5/+5
\|\ \ \| \|/ \|/\| \| \| \| \|	Moved o_auth/saml/ldap modules under gitlab/auth See merge request gitlab-org/gitlab-ce!17359
\| *	Moved o_auth/saml/ldap modules under gitlab/auth	Horatiu Eugen Vlad	2018-02-28	3	-5/+5
\| \|
* \|	Render MR Notes with Vue with behind a cookie	Fatih Acet	2018-02-28	1	-0/+31
\| \|
* \|	Merge branch '43510-merge-requests-and-issues-don-t-show-for-all-subgroups' ↵	Grzegorz Bizon	2018-02-27	1	-4/+14
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Resolve "Merge requests and issues don't show for all subgroups" Closes #43510 See merge request gitlab-org/gitlab-ce!17312
\| * \|	Fix subgroup issue and MR pages empty states and counts43510-merge-requests-and-issues-don-t-show-for-all-subgroups	Sean McGivern	2018-02-27	1	-4/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Previously, these wouldn't count issues or MRs in subgroups - meaning that if _this_ group had no issues or MRs, we'd show the empty state, which was wrong.