summaryrefslogtreecommitdiff
path: root/app/helpers
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-06-18 21:22:34 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-06-18 21:22:34 +0300
commit439f399bece8c2b01dc064b6c02f28fb4149595e (patch)
tree1862fa39f76a9c8941f5120ba7af5fc3d5f91124 /app/helpers
parent670aaaeb9db7902c8776cb7754ac8fd1e7a606a1 (diff)
downloadgitlab-ce-439f399bece8c2b01dc064b6c02f28fb4149595e.tar.gz
Remove all team resources except models. Move models to deprecated directory
Diffstat (limited to 'app/helpers')
-rw-r--r--app/helpers/application_helper.rb3
-rw-r--r--app/helpers/user_teams_helper.rb25
2 files changed, 1 insertions, 27 deletions
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index a73d574f22e..8ccb2380d62 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -92,7 +92,6 @@ module ApplicationHelper
def search_autocomplete_source
projects = current_user.authorized_projects.map { |p| { label: "project: #{simple_sanitize(p.name_with_namespace)}", url: project_path(p) } }
groups = current_user.authorized_groups.map { |group| { label: "group: #{simple_sanitize(group.name)}", url: group_path(group) } }
- teams = current_user.authorized_teams.map { |team| { label: "team: #{simple_sanitize(team.name)}", url: team_path(team) } }
default_nav = [
{ label: "My Profile", url: profile_path },
@@ -128,7 +127,7 @@ module ApplicationHelper
]
end
- [groups, teams, projects, default_nav, project_nav, help_nav].flatten.to_json
+ [groups, projects, default_nav, project_nav, help_nav].flatten.to_json
end
def emoji_autocomplete_source
diff --git a/app/helpers/user_teams_helper.rb b/app/helpers/user_teams_helper.rb
deleted file mode 100644
index 8603ee434a8..00000000000
--- a/app/helpers/user_teams_helper.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-module UserTeamsHelper
- def team_filter_path(entity, options={})
- exist_opts = {
- status: params[:status],
- project_id: params[:project_id],
- }
-
- options = exist_opts.merge(options)
-
- case entity
- when 'issue' then
- issues_team_path(@team, options)
- when 'merge_request'
- merge_requests_team_path(@team, options)
- end
- end
-
- def grouped_user_team_members(team)
- team.user_team_user_relationships.sort_by(&:permission).reverse.group_by(&:permission)
- end
-
- def remove_from_user_team_message(team, member)
- "You are going to remove #{member.name} from #{team.name}. Are you sure?"
- end
-end