Skip to content

Commit

Permalink
build using rails_apps_composer 2.2.19
Browse files Browse the repository at this point in the history
  • Loading branch information
DanielKehoe committed Dec 8, 2012
1 parent a1513d9 commit 6454f46
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 17 deletions.
3 changes: 0 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,6 @@ db/*.sqlite3
/capybara*
/capybara-*.html
/gems
/spec/requests
/spec/routing
/spec/views
/specifications
rerun.txt
pickle-email-*.html
Expand Down
8 changes: 4 additions & 4 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ group :assets do
end
gem 'jquery-rails'
gem "rspec-rails", ">= 2.11.4", :group => [:development, :test]
gem "email_spec", ">= 1.2.1", :group => :test
gem "cucumber-rails", ">= 1.3.0", :group => :test, :require => false
gem "database_cleaner", ">= 0.9.1", :group => :test
gem "email_spec", ">= 1.4.0", :group => :test
gem "cucumber-rails", ">= 1.3.0", :group => :test, :require => false
gem "launchy", ">= 2.1.2", :group => :test
gem "capybara", ">= 1.1.2", :group => :test
gem "capybara", "1.1.4", :group => :test
gem "factory_girl_rails", ">= 4.1.0", :group => [:development, :test]
gem "bootstrap-sass", ">= 2.1.0.1"
gem "bootstrap-sass", ">= 2.1.1.0"
gem "devise", ">= 2.1.2"
gem "cancan", ">= 1.6.8"
gem "rolify", ">= 3.2.0"
Expand Down
18 changes: 9 additions & 9 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,13 @@ GEM
sass (~> 3.2)
builder (3.0.4)
cancan (1.6.8)
capybara (2.0.1)
capybara (1.1.4)
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
rack (>= 1.0.0)
rack-test (>= 0.5.4)
selenium-webdriver (~> 2.0)
xpath (~> 1.0.0)
xpath (~> 0.1.4)
childprocess (0.3.6)
ffi (~> 1.0, >= 1.0.6)
coffee-rails (3.2.2)
Expand Down Expand Up @@ -98,7 +98,7 @@ GEM
mime-types (~> 1.16)
treetop (~> 1.4.8)
mime-types (1.19)
multi_json (1.3.7)
multi_json (1.4.0)
nokogiri (1.5.5)
orm_adapter (0.4.0)
polyglot (0.3.3)
Expand Down Expand Up @@ -132,7 +132,7 @@ GEM
rest-client (1.6.7)
mime-types (>= 1.16)
rolify (3.2.0)
rspec-core (2.12.0)
rspec-core (2.12.1)
rspec-expectations (2.12.0)
diff-lcs (~> 1.1.3)
rspec-mocks (2.12.0)
Expand All @@ -149,7 +149,7 @@ GEM
railties (~> 3.2.0)
sass (>= 3.1.10)
tilt (~> 1.3)
selenium-webdriver (2.26.0)
selenium-webdriver (2.27.1)
childprocess (>= 0.2.5)
libwebsocket (~> 0.1.3)
multi_json (~> 1.0)
Expand Down Expand Up @@ -181,21 +181,21 @@ GEM
warden (1.2.1)
rack (>= 1.0)
websocket (1.0.4)
xpath (1.0.0)
xpath (0.1.4)
nokogiri (~> 1.3)

PLATFORMS
ruby

DEPENDENCIES
bootstrap-sass (>= 2.1.0.1)
bootstrap-sass (>= 2.1.1.0)
cancan (>= 1.6.8)
capybara (>= 1.1.2)
capybara (= 1.1.4)
coffee-rails (~> 3.2.1)
cucumber-rails (>= 1.3.0)
database_cleaner (>= 0.9.1)
devise (>= 2.1.2)
email_spec (>= 1.2.1)
email_spec (>= 1.4.0)
factory_girl_rails (>= 4.1.0)
jquery-rails
launchy (>= 2.1.2)
Expand Down
2 changes: 1 addition & 1 deletion app/helpers/application_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ def display_base_errors resource
html.html_safe
end

end
end

0 comments on commit 6454f46

Please sign in to comment.