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

Upgrade2014 #71

Merged
merged 3 commits into from
Jun 29, 2014
+20 −19
Merged

Upgrade2014 #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d210885
Updated Gemfile + .lock
simen Jun 23, 2014
ecd678d
Upgraded to pebblebed 0.2.1
simen Jun 24, 2014
cbeb403
Gemfile: upgraded Unicorn.
Jun 24, 2014
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
4 changes: 2 additions & 2 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ gem 'omniauth-origo', '~> 1.0.0.rc3', :git => 'git://github.com/bengler/omniauth
gem 'omniauth-vanilla', :git => 'git://github.com/bengler/omniauth-vanilla.git'
gem 'omniauth-evernote'
gem 'omniauth-google-oauth2', '~> 0.1.10'
gem 'pebblebed', ">=0.1.0"
gem 'pebblebed', ">=0.2.0"
gem 'pebbles-uid'
gem 'pebbles-cors', :git => 'git://github.com/bengler/pebbles-cors.git'
gem 'pebbles-path', '>=0.0.3'
Expand Down Expand Up @@ -49,5 +49,5 @@ end

group :production do
gem 'airbrake', '~> 3.1.4', :require => false
gem 'unicorn', '~> 4.1.1'
gem 'unicorn'
end
35 changes: 18 additions & 17 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,17 +91,19 @@ GEM
airbrake (3.1.14)
builder
json
amq-protocol (1.9.2)
ar-tsvectors (1.0.0)
activerecord (>= 3.0)
arel (3.0.2)
backports (3.3.4)
builder (3.0.4)
bunny (0.8.0)
bunny (1.3.1)
amq-protocol (>= 1.9.2)
crack (0.4.1)
safe_yaml (~> 0.9.0)
curb (0.8.5)
dalli (2.1.0)
deepstruct (0.0.5)
deepstruct (0.0.7)
diff-lcs (1.2.4)
evernote-thrift (1.25.0)
faraday (0.8.8)
Expand All @@ -113,15 +115,15 @@ GEM
json (1.8.1)
jwt (0.1.8)
multi_json (>= 1.5)
kgio (2.8.1)
kgio (2.9.2)
memcache_mock (0.0.13)
mime-types (1.25)
mini_portile (0.5.2)
multi_json (1.8.4)
mini_portile (0.6.0)
multi_json (1.10.1)
multi_xml (0.5.5)
multipart-post (1.2.0)
nokogiri (1.6.1)
mini_portile (~> 0.5.0)
nokogiri (1.6.2.1)
mini_portile (= 0.6.0)
oauth (0.4.7)
oauth2 (0.9.2)
faraday (~> 0.8)
Expand All @@ -143,13 +145,12 @@ GEM
omniauth (~> 1.0)
omniauth-oauth2
pathbuilder (0.0.2)
pebblebed (0.1.3)
pebblebed (0.2.1)
activesupport
bunny (~> 0.8.0)
bunny (~> 1.3.1)
curb (>= 0.8.4)
deepstruct (>= 0.0.4)
futurevalue
i18n
nokogiri
pathbuilder
queryparams
Expand All @@ -166,7 +167,7 @@ GEM
rack (>= 0.9.1)
rack-test (0.6.2)
rack (>= 1.0)
raindrops (0.12.0)
raindrops (0.13.0)
rake (10.1.0)
rest-client (1.6.7)
mime-types (>= 1.16)
Expand Down Expand Up @@ -202,15 +203,15 @@ GEM
tilt (1.4.1)
timecop (0.3.5)
tzinfo (0.3.38)
unicorn (4.1.1)
kgio (~> 2.4)
unicorn (4.8.3)
kgio (~> 2.6)
rack
raindrops (~> 0.6)
raindrops (~> 0.7)
vcr (2.6.0)
webmock (1.8.11)
addressable (>= 2.2.7)
crack (>= 0.1.7)
yajl-ruby (1.2.0)
yajl-ruby (1.2.1)

PLATFORMS
ruby
Expand All @@ -234,7 +235,7 @@ DEPENDENCIES
omniauth-origo (~> 1.0.0.rc3)!
omniauth-twitter!
omniauth-vanilla!
pebblebed (>= 0.1.0)
pebblebed (>= 0.2.0)
pebbles-cors!
pebbles-path (>= 0.0.3)
pebbles-uid
Expand All @@ -254,7 +255,7 @@ DEPENDENCIES
sinatra-contrib
thor
timecop (~> 0.3.5)
unicorn (~> 4.1.1)
unicorn
vcr
webmock (~> 1.8.11)
yajl-ruby