diff options
| author | Luke Bennett <lbennett@gitlab.com> | 2018-11-07 19:44:21 +0300 |
|---|---|---|
| committer | Luke Bennett <lbennett@gitlab.com> | 2019-02-13 03:15:57 +0300 |
| commit | 534a61179e2d0d7f9f376af1d01ed536e27f5b6d (patch) | |
| tree | a06cb82e175bd87c6e42edd83f606666022edf4e /app/helpers/namespaces_helper.rb | |
| parent | bc881b8455c0059acfd8c1dc5dd3bf6c329ae53c (diff) | |
Improve the GitHub and Gitea import feature table interface
These are backend changes.
Use Vue for the import feature UI for "githubish"
providers (GitHub and Gitea).
Add "Go to project" button after a successful import.
Use CI-style status icons and improve spacing of the
table and its component.
Adds ETag polling to the github and gitea import
jobs endpoint.
Diffstat (limited to 'app/helpers/namespaces_helper.rb')
| -rw-r--r-- | app/helpers/namespaces_helper.rb | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/app/helpers/namespaces_helper.rb b/app/helpers/namespaces_helper.rb index 6c65e573307..ea3bcfc791a 100644 --- a/app/helpers/namespaces_helper.rb +++ b/app/helpers/namespaces_helper.rb @@ -5,11 +5,8 @@ module NamespacesHelper params.dig(:project, :namespace_id) || params[:namespace_id] end - # rubocop: disable CodeReuse/ActiveRecord def namespaces_options(selected = :current_user, display_path: false, groups: nil, extra_group: nil, groups_only: false) - groups ||= current_user.manageable_groups - .eager_load(:route) - .order('routes.path') + groups ||= current_user.manageable_groups_with_routes users = [current_user.namespace] selected_id = selected @@ -43,7 +40,6 @@ module NamespacesHelper grouped_options_for_select(options, selected_id) end - # rubocop: enable CodeReuse/ActiveRecord def namespace_icon(namespace, size = 40) if namespace.is_a?(Group) |