Merge pull request #890 from avakarev/clean-up-helpers
Clean up helpers
This commit is contained in:
commit
7e0726b1da
|
@ -1,2 +0,0 @@
|
||||||
module Admin::ProjectsHelper
|
|
||||||
end
|
|
|
@ -1,2 +0,0 @@
|
||||||
module Admin::UsersHelper
|
|
||||||
end
|
|
|
@ -8,10 +8,6 @@ module ApplicationHelper
|
||||||
"#{gravatar_host}/avatar/#{Digest::MD5.hexdigest(user_email.downcase)}?s=#{size}&d=identicon"
|
"#{gravatar_host}/avatar/#{Digest::MD5.hexdigest(user_email.downcase)}?s=#{size}&d=identicon"
|
||||||
end
|
end
|
||||||
|
|
||||||
def fixed_mode?
|
|
||||||
true
|
|
||||||
end
|
|
||||||
|
|
||||||
def request_protocol
|
def request_protocol
|
||||||
request.ssl? ? "https" : "http"
|
request.ssl? ? "https" : "http"
|
||||||
end
|
end
|
||||||
|
@ -20,32 +16,6 @@ module ApplicationHelper
|
||||||
"#{request_protocol}://#{GIT_HOST["host"]}/"
|
"#{request_protocol}://#{GIT_HOST["host"]}/"
|
||||||
end
|
end
|
||||||
|
|
||||||
def body_class(default_class = nil)
|
|
||||||
main = content_for(:body_class).blank? ?
|
|
||||||
default_class :
|
|
||||||
content_for(:body_class)
|
|
||||||
|
|
||||||
[main, "collapsed"].join(" ")
|
|
||||||
end
|
|
||||||
|
|
||||||
def commit_name(project, commit)
|
|
||||||
if project.commit.id == commit.id
|
|
||||||
"master"
|
|
||||||
else
|
|
||||||
commit.id
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
def admin_namespace?
|
|
||||||
controller.class.name.split("::").first=="Admin"
|
|
||||||
end
|
|
||||||
|
|
||||||
def projects_namespace?
|
|
||||||
!current_page?(root_url) &&
|
|
||||||
controller.controller_name != "keys" &&
|
|
||||||
!admin_namespace?
|
|
||||||
end
|
|
||||||
|
|
||||||
def last_commit(project)
|
def last_commit(project)
|
||||||
if project.repo_exists?
|
if project.repo_exists?
|
||||||
time_ago_in_words(project.commit.committed_date) + " ago"
|
time_ago_in_words(project.commit.committed_date) + " ago"
|
||||||
|
@ -62,7 +32,7 @@ module ApplicationHelper
|
||||||
[ "Tag", @project.tags ]
|
[ "Tag", @project.tags ]
|
||||||
]
|
]
|
||||||
|
|
||||||
# If reference is commit id -
|
# If reference is commit id -
|
||||||
# we should add it to branch/tag selectbox
|
# we should add it to branch/tag selectbox
|
||||||
if(@ref && !options.flatten.include?(@ref) &&
|
if(@ref && !options.flatten.include?(@ref) &&
|
||||||
@ref =~ /^[0-9a-zA-Z]{6,52}$/)
|
@ref =~ /^[0-9a-zA-Z]{6,52}$/)
|
||||||
|
@ -114,10 +84,6 @@ module ApplicationHelper
|
||||||
Devise.omniauth_providers.include?(:ldap)
|
Devise.omniauth_providers.include?(:ldap)
|
||||||
end
|
end
|
||||||
|
|
||||||
def layout
|
|
||||||
controller.send :_layout
|
|
||||||
end
|
|
||||||
|
|
||||||
def app_theme
|
def app_theme
|
||||||
if current_user && current_user.theme_id == 1
|
if current_user && current_user.theme_id == 1
|
||||||
"ui_basic"
|
"ui_basic"
|
||||||
|
@ -126,7 +92,4 @@ module ApplicationHelper
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
def string_to_utf8 str
|
|
||||||
Gitlab::Encode.utf8 str
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|
|
@ -1,19 +1,4 @@
|
||||||
module CommitsHelper
|
module CommitsHelper
|
||||||
def old_line_number(line, i)
|
|
||||||
|
|
||||||
end
|
|
||||||
|
|
||||||
def new_line_number(line, i)
|
|
||||||
|
|
||||||
end
|
|
||||||
|
|
||||||
def more_commits_link
|
|
||||||
offset = params[:offset] || 0
|
|
||||||
limit = params[:limit] || 100
|
|
||||||
link_to "More", project_commits_path(@project, :offset => offset.to_i + limit.to_i, :limit => limit),
|
|
||||||
:remote => true, :class => "lite_button vm", :style => "text-align:center; width:930px; ", :id => "more-commits-link"
|
|
||||||
end
|
|
||||||
|
|
||||||
def commit_msg_with_link_to_issues(project, message)
|
def commit_msg_with_link_to_issues(project, message)
|
||||||
return '' unless message
|
return '' unless message
|
||||||
out = ''
|
out = ''
|
||||||
|
|
|
@ -1,36 +0,0 @@
|
||||||
module DashboardHelper
|
|
||||||
def dashboard_feed_path(project, object)
|
|
||||||
case object.class.name.to_s
|
|
||||||
when "Issue" then project_issue_path(project, project.issues.find(object.id))
|
|
||||||
when "Commit" then project_commit_path(project, project.repo.commits(object.id).first)
|
|
||||||
when "MergeRequest" then project_merge_request_path(project, object.id)
|
|
||||||
when "Note"
|
|
||||||
then
|
|
||||||
note = object
|
|
||||||
case note.noteable_type
|
|
||||||
when "Issue" then project_issue_path(project, note.noteable_id)
|
|
||||||
when "Snippet" then project_snippet_path(project, note.noteable_id)
|
|
||||||
when "Commit" then project_commit_path(project, :id => note.noteable_id)
|
|
||||||
when "MergeRequest" then project_merge_request_path(project, note.noteable_id)
|
|
||||||
else wall_project_path(project)
|
|
||||||
end
|
|
||||||
else wall_project_path(project)
|
|
||||||
end
|
|
||||||
rescue
|
|
||||||
"#"
|
|
||||||
end
|
|
||||||
|
|
||||||
def dashboard_feed_title(object)
|
|
||||||
klass = object.class.to_s.split("::").last
|
|
||||||
|
|
||||||
title = case klass
|
|
||||||
when "Note" then markdown(object.note)
|
|
||||||
when "Issue" then object.title
|
|
||||||
when "Commit" then object.safe_message
|
|
||||||
when "MergeRequest" then object.title
|
|
||||||
else return "Project Wall"
|
|
||||||
end
|
|
||||||
|
|
||||||
truncate(sanitize(title, :tags => []), :length => 60)
|
|
||||||
end
|
|
||||||
end
|
|
|
@ -1,10 +1,4 @@
|
||||||
module IssuesHelper
|
module IssuesHelper
|
||||||
def sort_class
|
|
||||||
if can?(current_user, :admin_issue, @project) && (!params[:f] || params[:f] == "0")
|
|
||||||
"handle"
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
def project_issues_filter_path project, params = {}
|
def project_issues_filter_path project, params = {}
|
||||||
params[:f] ||= cookies['issue_filter']
|
params[:f] ||= cookies['issue_filter']
|
||||||
project_issues_path project, params
|
project_issues_path project, params
|
||||||
|
|
|
@ -1,2 +0,0 @@
|
||||||
module KeysHelper
|
|
||||||
end
|
|
|
@ -1,2 +0,0 @@
|
||||||
module ProfileHelper
|
|
||||||
end
|
|
|
@ -1,22 +0,0 @@
|
||||||
module ProjectsHelper
|
|
||||||
def view_mode_style(type)
|
|
||||||
cookies["project_view"] ||= "tile"
|
|
||||||
cookies["project_view"] == type ? nil : "display:none"
|
|
||||||
end
|
|
||||||
|
|
||||||
def load_note_parent(id, type, project)
|
|
||||||
case type
|
|
||||||
when "Issue" then @project.issues.find(id)
|
|
||||||
when "Commit" then @project.repo.commits(id).first
|
|
||||||
when "Snippet" then @project.snippets.find(id)
|
|
||||||
else
|
|
||||||
true
|
|
||||||
end
|
|
||||||
rescue
|
|
||||||
nil
|
|
||||||
end
|
|
||||||
|
|
||||||
def repository_tab_class
|
|
||||||
end
|
|
||||||
|
|
||||||
end
|
|
|
@ -1,2 +0,0 @@
|
||||||
module TeamMembersHelper
|
|
||||||
end
|
|
|
@ -1,2 +0,0 @@
|
||||||
module UserIssuesHelper
|
|
||||||
end
|
|
|
@ -1,3 +0,0 @@
|
||||||
module UserMergeRequestsHelper
|
|
||||||
end
|
|
||||||
|
|
|
@ -1,2 +0,0 @@
|
||||||
module WikisHelper
|
|
||||||
end
|
|
Loading…
Reference in a new issue