diff --git a/Gemfile.lock b/Gemfile.lock index adf9621aae9a68dc679a84d94624e7de3da56046..19d176ecbc76cbe5f748b749cb5dcc59e740eb19 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -65,7 +65,6 @@ PATH GEM remote: http://rubygems.org/ specs: - SystemTimer (1.2.1) abstract (1.0.0) actionmailer (3.0.3) actionpack (= 3.0.3) @@ -94,6 +93,7 @@ GEM activesupport (= 3.0.3) activesupport (3.0.3) addressable (2.2.2) + archive-tar-minitar (0.5.2) arel (2.0.9) aws (2.3.32) activesupport @@ -120,7 +120,6 @@ GEM selenium-webdriver (>= 0.0.3) carrierwave (0.5.2) activesupport (~> 3.0) - cgi_multipart_eof_fix (2.5.0) chalofa_ruby-progressbar (0.0.9.1) chef (0.9.12) bunny (>= 0.6.0) @@ -175,7 +174,6 @@ GEM faraday_middleware (0.3.2) faraday (~> 0.5.4) fastercsv (1.5.4) - fastthread (1.0.7) ffi (0.6.3) rake (>= 0.8.7) fixture_builder (0.2.0) @@ -194,7 +192,6 @@ GEM chalofa_ruby-progressbar (~> 0.0.9) rspec (~> 2.0) rspec-instafail (~> 0.1.4) - gem_plugin (0.2.3) gherkin (2.3.5) json (>= 1.4.6) haml (3.0.25) @@ -216,7 +213,8 @@ GEM launchy (0.4.0) configuration (>= 0.0.5) rake (>= 0.8.1) - linecache (0.43) + linecache19 (0.5.11) + ruby_core_source (>= 0.1.4) mail (2.2.15) activesupport (>= 2.3.6) i18n (>= 0.4.0) @@ -231,11 +229,6 @@ GEM mixlib-config (1.1.2) mixlib-log (1.2.0) moneta (0.6.0) - mongrel (1.1.5) - cgi_multipart_eof_fix (>= 2.4) - daemons (>= 1.0.3) - fastthread (>= 1.0.1) - gem_plugin (>= 0.2.3) multi_json (0.0.5) multi_xml (0.2.2) multipart-post (1.1.0) @@ -338,15 +331,20 @@ GEM activesupport (~> 3.0) railties (~> 3.0) rspec (~> 2.5.0) - ruby-debug (0.10.4) - columnize (>= 0.1) - ruby-debug-base (~> 0.10.4.0) - ruby-debug-base (0.10.4) - linecache (>= 0.3) + ruby-debug-base19 (0.11.24) + columnize (>= 0.3.1) + linecache19 (>= 0.5.11) + ruby_core_source (>= 0.1.4) + ruby-debug19 (0.11.6) + columnize (>= 0.3.1) + linecache19 (>= 0.5.11) + ruby-debug-base19 (>= 0.11.19) ruby-hmac (0.4.0) ruby-openid (2.1.8) ruby-openid-apps-discovery (1.2.0) ruby-openid (>= 2.1.7) + ruby_core_source (0.1.4) + archive-tar-minitar (>= 0.5.2) rubyntlm (0.1.1) rubyzip (0.9.4) selenium-client (1.2.18) @@ -392,7 +390,6 @@ PLATFORMS ruby DEPENDENCIES - SystemTimer (= 1.2.1) acts-as-taggable-on! addressable (= 2.2.2) aws (= 2.3.32) @@ -423,7 +420,6 @@ DEPENDENCIES json (= 1.4.6) launchy mini_magick (= 3.2) - mongrel mysql2 (= 0.2.6) nokogiri (= 1.4.3.1) omniauth (= 0.1.6) @@ -435,7 +431,7 @@ DEPENDENCIES rspec (>= 2.0.0) rspec-instafail (>= 0.1.7) rspec-rails (>= 2.0.0) - ruby-debug + ruby-debug19 selenium-webdriver (= 0.1.3) thin (= 1.2.8) twitter! diff --git a/app/views/notifier/new_request.html.haml b/app/views/notifier/new_request.html.haml index 91d386c0b228c223a9ed19bedb0566d94810d4e8..d3e636ee022983c45602809271000a243197640f 100644 --- a/app/views/notifier/new_request.html.haml +++ b/app/views/notifier/new_request.html.haml @@ -2,7 +2,7 @@ = t('notifier.hello', :name => @receiver.email) %p = "#{@sender.name} (#{@sender.diaspora_handle})" - = t('.just_sent_you') + = t('notifier.new_request.just_sent_you') = t('.try_it_out') %br = link_to t('.sign_in'), new_user_session_url