diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/configuration.rb | 1 | ||||
| -rw-r--r-- | lib/tasks/themes.rake | 12 | ||||
| -rw-r--r-- | lib/tasks/translation.rake | 12 |
3 files changed, 13 insertions, 12 deletions
diff --git a/lib/configuration.rb b/lib/configuration.rb index 88890856b..03c4ac616 100644 --- a/lib/configuration.rb +++ b/lib/configuration.rb @@ -28,6 +28,7 @@ module AlaveteliConfiguration :DEFAULT_LOCALE => '', :DISABLE_EMERGENCY_USER => false, :DOMAIN => 'localhost:3000', + :DONATION_URL => '', :EXCEPTION_NOTIFICATIONS_FROM => '', :EXCEPTION_NOTIFICATIONS_TO => '', :FORCE_REGISTRATION_ON_NEW_REQUEST => false, diff --git a/lib/tasks/themes.rake b/lib/tasks/themes.rake index cbd3d123e..a8d16f108 100644 --- a/lib/tasks/themes.rake +++ b/lib/tasks/themes.rake @@ -9,15 +9,17 @@ namespace :themes do File.join(plugin_dir, theme_name) end + def checkout(commitish) + puts "Checking out #{commitish}" if verbose + system "git checkout #{commitish}" + end + def checkout_tag(version) - checkout_command = "git checkout #{usage_tag(version)}" - success = system(checkout_command) - puts "Using tag #{usage_tag(version)}" if verbose && success - success + checkout usage_tag(version) end def checkout_remote_branch(branch) - system("git checkout origin/#{branch}") + checkout "origin/#{branch}" end def usage_tag(version) diff --git a/lib/tasks/translation.rake b/lib/tasks/translation.rake index 351faef2c..6458d9268 100644 --- a/lib/tasks/translation.rake +++ b/lib/tasks/translation.rake @@ -142,13 +142,11 @@ namespace :translation do output_file) # track mailer - xapian_object = InfoRequest.full_search([InfoRequestEvent], - track_thing.track_query, - 'described_at', - true, - nil, - 100, - 1) + xapian_object = ActsAsXapian::Search.new([InfoRequestEvent], track_thing.track_query, + :sort_by_prefix => 'described_at', + :sort_by_ascending => true, + :collapse_by_prefix => nil, + :limit => 100) event_digest_email = TrackMailer.event_digest(info_request.user, [[track_thing, xapian_object.results, |