Skip to content

Commit

Permalink
Update to rearview-1.2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
talbright committed Feb 28, 2014
1 parent 4f8c7cb commit eed1b54
Show file tree
Hide file tree
Showing 14 changed files with 37 additions and 24 deletions.
4 changes: 2 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ gem 'turbolinks'
# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
gem 'jbuilder', '~> 1.2'

gem 'rearview', :path => '~/workspaces/rearview-engine'
# gem 'rearview', '1.1.2'
#gem 'rearview', :path => '~/workspaces/rearview-engine'
gem 'rearview', '~> 1.2.0'
gem 'omniauth'
gem 'omniauth-google-oauth2'
gem 'rspec-rails'
Expand Down
55 changes: 34 additions & 21 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,18 +1,3 @@
PATH
remote: ~/workspaces/rearview-engine
specs:
rearview (1.1.2-java)
ancestry (~> 2.0.0)
broach (~> 0.3.0)
celluloid (~> 0.14.1)
devise (~> 3.2.2)
httparty (~> 0.12.0)
jbuilder (~> 1.5.2)
protected_attributes (~> 1.0.5)
rails (~> 4.0.2)
state_machine (~> 1.2.0)
statsd-ruby (~> 1.2.1)

GEM
remote: http://rubygems.org/
specs:
Expand Down Expand Up @@ -51,8 +36,11 @@ GEM
ancestry (2.0.0)
activerecord (>= 3.0.0)
arel (4.0.1)
atomic (1.1.14)
atomic (1.1.14-java)
bcrypt-ruby (3.1.2-java)
bcrypt (3.1.7-java)
bcrypt-ruby (3.1.5-java)
bcrypt (>= 3.1.3)
bouncy-castle-java (1.5.0147)
broach (0.3.0)
multi_json (~> 1.7)
Expand All @@ -68,7 +56,7 @@ GEM
coffee-script-source
execjs
coffee-script-source (1.6.3)
devise (3.2.2)
devise (3.2.3)
bcrypt-ruby (~> 3.0)
orm_adapter (~> 0.1)
railties (>= 3.2.6, < 5)
Expand All @@ -78,9 +66,12 @@ GEM
dotenv (0.9.0)
erubis (2.7.0)
execjs (2.0.2)
faraday (0.8.8)
multipart-post (~> 1.2.0)
faraday (0.9.0)
multipart-post (>= 1.2, < 3)
ffi (1.9.3-java)
foreman (0.63.0)
dotenv (>= 0.7)
thor (>= 0.13.6)
foreman (0.63.0-java)
dotenv (>= 0.7)
thor (>= 0.13.6)
Expand All @@ -102,6 +93,7 @@ GEM
thor (>= 0.14, < 2.0)
jruby-openssl (0.9.4)
bouncy-castle-java (>= 1.5.0147)
json (1.8.1)
json (1.8.1-java)
jwt (0.1.8)
multi_json (>= 1.5)
Expand All @@ -113,7 +105,7 @@ GEM
minitest (4.7.5)
multi_json (1.8.2)
multi_xml (0.5.5)
multipart-post (1.2.0)
multipart-post (2.0.0)
nap (0.6.0)
oauth2 (0.8.1)
faraday (~> 0.8)
Expand All @@ -134,11 +126,17 @@ GEM
polyglot (0.3.3)
protected_attributes (1.0.5)
activemodel (>= 4.0.1, < 5.0)
pry (0.9.12.4)
coderay (~> 1.0)
method_source (~> 0.8)
slop (~> 3.4)
pry (0.9.12.4-java)
coderay (~> 1.0)
method_source (~> 0.8)
slop (~> 3.4)
spoon (~> 0.0)
puma (2.7.1)
rack (>= 1.1, < 2.0)
puma (2.7.1-java)
rack (>= 1.1, < 2.0)
rack (1.5.2)
Expand All @@ -160,6 +158,19 @@ GEM
rake (10.1.1)
rdoc (3.12.2)
json (~> 1.4)
rearview (1.2.0-java)
ancestry (~> 2.0.0)
broach (~> 0.3.0)
celluloid (~> 0.14.1)
devise (~> 3.2.2)
faraday (~> 0.9.0)
httparty (~> 0.12.0)
jbuilder (~> 1.5.2)
protected_attributes (~> 1.0.5)
rails (~> 4.0.2)
state_machine (~> 1.2.0)
statsd-ruby (~> 1.2.1)
treetop (~> 1.4.15)
rspec-core (2.14.7)
rspec-expectations (2.14.4)
diff-lcs (>= 1.1.3, < 2.0)
Expand Down Expand Up @@ -197,6 +208,8 @@ GEM
therubyrhino_jar (>= 1.7.3)
therubyrhino_jar (1.7.4)
thor (0.18.1)
thread_safe (0.1.3)
atomic
thread_safe (0.1.3-java)
atomic
tilt (1.4.1)
Expand Down Expand Up @@ -230,7 +243,7 @@ DEPENDENCIES
pry
puma
rails (= 4.0.2)
rearview!
rearview (~> 1.2.0)
rspec-rails
sass-rails (~> 4.0.0)
sdoc
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Getting Started

### Get it

[Download](https://github.com/livingsocial/rearview/archive/v1.1.2.zip) the latest release.
[Download](https://github.com/livingsocial/rearview/archive/v1.2.0.zip) the latest release.

### Database Support

Expand Down
Binary file added vendor/cache/bcrypt-3.1.7-java.gem
Binary file not shown.
Binary file removed vendor/cache/bcrypt-ruby-3.1.2-java.gem
Binary file not shown.
Binary file added vendor/cache/bcrypt-ruby-3.1.5-java.gem
Binary file not shown.
Binary file removed vendor/cache/devise-3.2.2.gem
Binary file not shown.
Binary file added vendor/cache/devise-3.2.3.gem
Binary file not shown.
Binary file removed vendor/cache/faraday-0.8.8.gem
Binary file not shown.
Binary file added vendor/cache/faraday-0.9.0.gem
Binary file not shown.
Binary file removed vendor/cache/multipart-post-1.2.0.gem
Binary file not shown.
Binary file added vendor/cache/multipart-post-2.0.0.gem
Binary file not shown.
Binary file removed vendor/cache/rearview-1.1.2-java.gem
Binary file not shown.
Binary file added vendor/cache/rearview-1.2.0-java.gem
Binary file not shown.

0 comments on commit eed1b54

Please sign in to comment.