Permalink
Browse files

Merge branch 'master' of github.com:MBO/tolk

  • Loading branch information...
2 parents 02a26f7 + c6fb3ef commit 3ebf46cbeb191cd592799d853e2d832eb0331e01 @cover committed Feb 4, 2011
Showing with 2 additions and 4 deletions.
  1. +1 −1 Gemfile
  2. +0 −1 app/views/tolk/locales/index.html.erb
  3. +0 −1 lib/tolk/engine.rb
  4. +1 −1 tolk.gemspec
View
@@ -1 +1 @@
-gem 'will_paginate', :git => 'http://github.com/mislav/will_paginate.git', :branch => 'rails3'
+gem 'will_paginate', "~> 3.0.pre2"
@@ -21,7 +21,6 @@
<% end %>
<%= form_for(Tolk::Locale.new) do |f| %>
<div class="submit">
- <%= f.error_messages %>
<p>
<%= f.label "Add a new Locale", :for => 'select_tolk_locale_name' %>
<select id="select_tolk_locale_name" name="tolk_locale[name]">
View
@@ -2,6 +2,5 @@
module Tolk
class Engine < Rails::Engine
- engine_name :tolk
end
end
View
@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
s.homepage = 'http://www.rubyonrails.org'
s.platform = Gem::Platform::RUBY
- s.add_dependency('will_paginate', '3.0.pre')
+ s.add_dependency('will_paginate', '~> 3.0.pre2')
s.add_dependency('ya2yaml', '~> 0.26')
s.files = Dir['README', 'MIT-LICENSE', 'config/routes.rb', 'init.rb', 'lib/**/*', 'app/**/*', 'public/tolk/**/*']

0 comments on commit 3ebf46c

Please sign in to comment.