diff options
author | DavisLWebb <davislwebb@ymail.com> | 2014-03-04 16:27:11 -0500 |
---|---|---|
committer | DavisLWebb <davislwebb@ymail.com> | 2014-03-04 16:27:11 -0500 |
commit | 2eb8e1c090071abf3108828efc831f12128e17df (patch) | |
tree | a1410e2cc118db1b410808b7f339e4c5f52bd43c /Gemfile | |
parent | fb76b4db64583def6db3aac43e31c25d3bd489df (diff) | |
parent | aca85cf084702c29014a17eafb090421061fae8b (diff) |
Merge branch 'master' of http://github.com/LukeShu/leaguer
Conflicts:
app/assets/stylesheets/scaffolds.css.scss
app/views/games/index.html.erb
db/migrate/20140304043618_create_servers.rb
db/migrate/20140304043622_create_matches.rb
db/migrate/20140304043631_create_games.rb
Diffstat (limited to 'Gemfile')
-rw-r--r-- | Gemfile | 21 |
1 files changed, 10 insertions, 11 deletions
@@ -1,24 +1,23 @@ +#!/usr/bin/ruby -h # not executable, but as a hint to text editors + source 'https://rubygems.org' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' gem 'rails', '4.0.2' - # bcrypt is used for password digesting gem 'bcrypt-ruby', '3.1.2' group :development, :test do - -# Use sqlite3 as the database for Active Record + # Use sqlite3 as the database for Active Record gem 'sqlite3' - gem 'rspec-rails', '2.13.1' -end - -group :test do - gem 'selenium-webdriver', '2.35.1' - gem 'capybara', '2.1.0' end +# group :test do +# gem 'rspec-rails', '2.13.1' +# gem 'selenium-webdriver', '2.35.1' +# gem 'capybara', '2.1.0' +# end # Use SCSS for stylesheets gem 'sass-rails', '~> 4.0.0' @@ -43,8 +42,8 @@ gem 'turbolinks' gem 'jbuilder', '~> 1.2' group :doc do - # bundle exec rake doc:rails generates the API under doc/api. - gem 'sdoc', require: false + # bundle exec rake doc:rails generates the API under doc/api. + gem 'sdoc', require: false end |