Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update gems #69

Merged
merged 1 commit into from
Oct 4, 2013
Merged

Update gems #69

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 26 additions & 24 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ GIT

GIT
remote: git://github.com/indirect/haml-rails.git
revision: 6b7a5dead27957aff853b6c82b81fc13543c1aeb
revision: 071306248a759dff10e652b7d8e492384fb56f5c
specs:
haml-rails (0.4)
actionpack (>= 3.1, < 4.1)
Expand Down Expand Up @@ -43,8 +43,8 @@ GEM
thread_safe (~> 0.1)
tzinfo (~> 0.3.37)
arel (4.0.0)
atomic (1.1.13)
bootstrap-sass (2.3.2.1)
atomic (1.1.14)
bootstrap-sass (2.3.2.2)
sass (~> 3.2)
bson (1.9.2)
bson_ext (1.9.2)
Expand All @@ -60,39 +60,38 @@ GEM
coffee-script-source
execjs
coffee-script-source (1.6.3)
colorize (0.5.8)
coveralls (0.6.7)
colorize
coveralls (0.7.0)
multi_json (~> 1.3)
rest-client
simplecov (>= 0.7)
term-ansicolor
thor
daemons (1.1.9)
database_cleaner (1.1.1)
diff-lcs (1.2.4)
erubis (2.7.0)
eventmachine (1.0.3)
execjs (2.0.0)
execjs (2.0.2)
factory_girl (4.2.0)
activesupport (>= 3.0.0)
factory_girl_rails (4.2.1)
factory_girl (~> 4.2.0)
railties (>= 3.0.0)
ffi (1.9.0)
formatador (0.2.4)
guard (1.8.2)
guard (1.8.3)
formatador (>= 0.2.4)
listen (>= 1.0.0)
listen (~> 1.3)
lumberjack (>= 1.0.2)
pry (>= 0.9.10)
thor (>= 0.14.6)
guard-jasmine (1.18.1)
guard-jasmine (1.18.3)
childprocess
guard (>= 1.1.0)
multi_json
thor
tilt
guard-rspec (3.0.2)
guard-rspec (3.1.0)
guard (>= 1.8)
rspec (~> 2.13)
haml (4.0.3)
Expand All @@ -103,7 +102,7 @@ GEM
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
json (1.8.0)
listen (1.3.0)
listen (1.3.1)
rb-fsevent (>= 0.9.3)
rb-inotify (>= 0.9)
rb-kqueue (>= 0.2)
Expand All @@ -112,13 +111,13 @@ GEM
mime-types (~> 1.16)
treetop (~> 1.4.8)
method_source (0.8.2)
mime-types (1.24)
mime-types (1.25)
mini_portile (0.5.1)
minitest (4.7.5)
multi_json (1.7.9)
multi_json (1.8.0)
nokogiri (1.6.0)
mini_portile (~> 0.5.0)
pg (0.16.0)
pg (0.17.0)
polyglot (0.3.3)
pry (0.9.12.2)
coderay (~> 1.0.5)
Expand Down Expand Up @@ -153,7 +152,7 @@ GEM
rb-fchange (0.0.6)
ffi
rb-fsevent (0.9.3)
rb-inotify (0.9.1)
rb-inotify (0.9.2)
ffi (>= 0.5.0)
rb-kqueue (0.2.0)
ffi (>= 0.5.0)
Expand All @@ -166,7 +165,7 @@ GEM
rspec-expectations (~> 2.14.0)
rspec-mocks (~> 2.14.0)
rspec-core (2.14.5)
rspec-expectations (2.14.2)
rspec-expectations (2.14.3)
diff-lcs (>= 1.1.3, < 2.0)
rspec-mocks (2.14.3)
rspec-rails (2.14.0)
Expand All @@ -176,7 +175,7 @@ GEM
rspec-core (~> 2.14.0)
rspec-expectations (~> 2.14.0)
rspec-mocks (~> 2.14.0)
sass (3.2.10)
sass (3.2.11)
sass-rails (4.0.0)
railties (>= 4.0.0.beta, < 5.0)
sass (>= 3.1.10)
Expand All @@ -201,23 +200,26 @@ GEM
symbolize (4.4.1)
activemodel (>= 3.2, < 5)
activesupport (>= 3.2, < 5)
thin (1.5.1)
term-ansicolor (1.2.2)
tins (~> 0.8)
thin (1.6.0)
daemons (>= 1.0.9)
eventmachine (>= 0.12.6)
rack (>= 1.0.0)
eventmachine (>= 1.0.0)
rack (>= 1.5.0)
thor (0.18.1)
thread_safe (0.1.2)
thread_safe (0.1.3)
atomic
tilt (1.4.1)
tins (0.11.0)
treetop (1.4.15)
polyglot
polyglot (>= 0.3.1)
turbolinks-js (0.6.1)
tzinfo (0.3.37)
uglifier (2.1.2)
uglifier (2.2.1)
execjs (>= 0.3.0)
multi_json (~> 1.0, >= 1.0.2)
yard (0.8.7)
yard (0.8.7.2)

PLATFORMS
ruby
Expand Down