Use project with namespace in email subject
This commit is contained in:
parent
30d6370719
commit
e5ff5c2869
|
@ -154,6 +154,6 @@ class Notify < ActionMailer::Base
|
|||
# >> subject('Lorem ipsum', 'Dolor sit amet')
|
||||
# => "GitLab | Lorem ipsum | Dolor sit amet"
|
||||
def subject(*extra)
|
||||
"GitLab | " << extra.join(' | ') << (@project ? " | #{@project.name}" : "")
|
||||
"GitLab | " << extra.join(' | ') << (@project ? " | #{@project.name_with_namespace}" : "")
|
||||
end
|
||||
end
|
||||
|
|
|
@ -17,14 +17,14 @@ module Gitlab
|
|||
@commits = collect_commits
|
||||
@days = index_commits
|
||||
end
|
||||
|
||||
|
||||
def to_json(*args)
|
||||
{
|
||||
days: @days.compact.map { |d| [d.day, d.strftime("%b")] },
|
||||
commits: @commits.map(&:to_graph_hash)
|
||||
}.to_json(*args)
|
||||
end
|
||||
|
||||
|
||||
protected
|
||||
|
||||
# Get commits from repository
|
||||
|
|
|
@ -118,10 +118,10 @@ namespace :gitlab do
|
|||
task :create => :environment do
|
||||
backup_path_repo = File.join(Gitlab.config.backup.path, "repositories")
|
||||
FileUtils.mkdir_p(backup_path_repo) until Dir.exists?(backup_path_repo)
|
||||
puts "Dumping repositories ..."
|
||||
puts "Dumping repositories ...".blue
|
||||
|
||||
Project.find_each(:batch_size => 1000) do |project|
|
||||
print "#{project.path_with_namespace} ... "
|
||||
print " * #{project.path_with_namespace} ... "
|
||||
|
||||
if project.empty_repo?
|
||||
puts "[SKIPPED]".cyan
|
||||
|
@ -174,9 +174,9 @@ namespace :gitlab do
|
|||
backup_path_db = File.join(Gitlab.config.backup.path, "db")
|
||||
FileUtils.mkdir_p(backup_path_db) unless Dir.exists?(backup_path_db)
|
||||
|
||||
puts "Dumping database tables ... "
|
||||
puts "Dumping database tables ... ".blue
|
||||
ActiveRecord::Base.connection.tables.each do |tbl|
|
||||
print "#{tbl.yellow} ... "
|
||||
print " * #{tbl.yellow} ... "
|
||||
count = 1
|
||||
File.open(File.join(backup_path_db, tbl + ".yml"), "w+") do |file|
|
||||
ActiveRecord::Base.connection.select_all("SELECT * FROM `#{tbl}`").each do |line|
|
||||
|
|
Loading…
Reference in a new issue