Browse Source

Merge pull request #9 from ahacopahacop/master

hack night
denney-disable-on-select
Jason Denney 12 years ago
parent
commit
f95191b3e4
  1. 2
      .rvmrc
  2. 2
      Gemfile
  3. 2
      Gemfile.lock

2
.rvmrc

@ -4,7 +4,7 @@
# development environment upon cd'ing into the directory # development environment upon cd'ing into the directory
# First we specify our desired <ruby>[@<gemset>], the @gemset name is optional. # First we specify our desired <ruby>[@<gemset>], the @gemset name is optional.
environment_id="ruby-1.9.3-p0@velocipede" environment_id="ruby-1.9.3-p374@velocipede"
# #
# Uncomment following line if you want options to be set only for given project. # Uncomment following line if you want options to be set only for given project.

2
Gemfile

@ -13,7 +13,7 @@ gem 'jquery-rails', '~> 2.0'
gem 'decent_exposure', '~> 1.0.1' gem 'decent_exposure', '~> 1.0.1'
gem 'will_paginate', '~> 3.0.3' gem 'will_paginate', '~> 3.0.3'
gem 'bootstrap-will_paginate', '~> 0.0.6' gem 'bootstrap-will_paginate', '~> 0.0.6'
gem 'acts_as_loggable', :git => 'git@github.com:spacemunkay/acts_as_loggable.git' gem 'acts_as_loggable', :git => 'https://github.com/spacemunkay/acts_as_loggable.git'
# Gems used only for assets and not required # Gems used only for assets and not required
# in production environments by default. # in production environments by default.

2
Gemfile.lock

@ -1,5 +1,5 @@
GIT GIT
remote: git@github.com:spacemunkay/acts_as_loggable.git remote: https://github.com/spacemunkay/acts_as_loggable.git
revision: fd2c276abad00567a294a1a841dce9861e240c82 revision: fd2c276abad00567a294a1a841dce9861e240c82
specs: specs:
acts_as_loggable (0.0.6) acts_as_loggable (0.0.6)

Loading…
Cancel
Save