Skip to content

Commit

Permalink
Added gem 'impressionist'
Browse files Browse the repository at this point in the history
Conflicts:

	Gemfile
	Gemfile.lock
  • Loading branch information
RajRoR committed Mar 2, 2013
1 parent dd9a87f commit a9b0faf
Show file tree
Hide file tree
Showing 2 changed files with 35 additions and 8 deletions.
3 changes: 3 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ gem "unicorn"
gem "surveyor", "~> 1.1.0"

gem "rspec-rails", :groups => [ :development, :test ]
gem "impressionist"

group :development do
gem "rails-erd"
Expand All @@ -45,6 +46,8 @@ group :development do
gem "brakeman", "~> 1.6.2"
gem "pry-rails"
gem "launchy"
gem "letters"
gem "debugger"
end

group :production do
Expand Down
40 changes: 32 additions & 8 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ GEM
addressable (2.3.3)
ansi (1.4.3)
arel (3.0.2)
awesome_print (1.1.0)
bcrypt-ruby (3.0.1)
bourne (1.1.2)
mocha (= 0.10.5)
Expand Down Expand Up @@ -75,8 +76,17 @@ GEM
coffee-script-source
execjs
coffee-script-source (1.5.0)
colorize (0.5.8)
columnize (0.3.6)
crack (0.3.2)
database_cleaner (0.9.1)
debugger (1.3.1)
columnize (>= 0.3.1)
debugger-linecache (~> 1.1.1)
debugger-ruby_core_source (~> 1.1.8)
debugger-linecache (1.1.2)
debugger-ruby_core_source (>= 1.1.1)
debugger-ruby_core_source (1.1.8)
devise (2.1.2)
bcrypt-ruby (~> 3.0)
orm_adapter (~> 0.1)
Expand Down Expand Up @@ -123,21 +133,31 @@ GEM
highline (1.6.15)
hike (1.2.1)
hominid (3.0.5)
httpauth (0.2.0)
i18n (0.6.4)
i18n_routing (0.6.2)
httpauth (0.1)
httpclient (2.3.0.1)
i18n (0.6.1)
i18n_routing (0.6.1)
i18n (> 0.3.5)
impressionist (1.1.1)
httpclient (~> 2.2)
nokogiri (~> 1.5)
journey (1.0.4)
jquery-rails (2.2.1)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
json (1.7.7)
json_pure (1.7.7)
jquery-rails (2.1.2)
railties (>= 3.1.0, < 5.0)
thor (~> 0.14)
json (1.7.5)
json_pure (1.7.5)
jwt (0.1.5)
multi_json (>= 1.0)
kgio (2.8.0)
launchy (2.2.0)
addressable (~> 2.3)
letters (0.3.1)
activesupport
awesome_print
colorize
debugger
xml-simple
libnotify (0.8.0)
ffi (>= 1.0.11)
libv8 (3.11.8.13)
Expand Down Expand Up @@ -327,6 +347,7 @@ GEM
webrobots (0.1.0)
websocket (1.0.7)
will_paginate (3.0.4)
xml-simple (1.1.2)
xpath (0.1.4)
nokogiri (~> 1.3)

Expand All @@ -339,6 +360,7 @@ DEPENDENCIES
capybara-mechanize
coffee-rails (~> 3.2.2)
database_cleaner
debugger
devise (= 2.1.2)
differ
email_spec
Expand All @@ -351,8 +373,10 @@ DEPENDENCIES
haml-rails
hominid
i18n_routing
impressionist
jquery-rails
launchy
letters
libnotify
newrelic_rpm (~> 3.5.7.59)
nokogiri
Expand Down

0 comments on commit a9b0faf

Please sign in to comment.