diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-12-31 18:22:44 +0200 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-12-31 18:22:44 +0200 |
commit | e5ff5c28694daee117f22ba3a8c21f38a5f14966 (patch) | |
tree | 9e5f3691a156eb6dc499e12351af55080556caf3 | |
parent | 30d6370719263da531d2405fb561d34e1340f49e (diff) | |
download | gitlab-ce-e5ff5c28694daee117f22ba3a8c21f38a5f14966.tar.gz |
Use project with namespace in email subject
-rw-r--r-- | app/mailers/notify.rb | 2 | ||||
-rw-r--r-- | lib/gitlab/graph/json_builder.rb | 4 | ||||
-rw-r--r-- | lib/tasks/gitlab/backup.rake | 8 |
3 files changed, 7 insertions, 7 deletions
diff --git a/app/mailers/notify.rb b/app/mailers/notify.rb index c2a97adbfa5..671483ce158 100644 --- a/app/mailers/notify.rb +++ b/app/mailers/notify.rb @@ -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 diff --git a/lib/gitlab/graph/json_builder.rb b/lib/gitlab/graph/json_builder.rb index 443704044c7..4a48b3b5675 100644 --- a/lib/gitlab/graph/json_builder.rb +++ b/lib/gitlab/graph/json_builder.rb @@ -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 diff --git a/lib/tasks/gitlab/backup.rake b/lib/tasks/gitlab/backup.rake index 82c8dd8ca11..677ecf21bdc 100644 --- a/lib/tasks/gitlab/backup.rake +++ b/lib/tasks/gitlab/backup.rake @@ -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| |