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

Dependencies updated #1

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Dependencies updated #1

Show file tree
Hide file tree
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
3 changes: 2 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
config/config.yml
config/config.yml
.ruby-version
5 changes: 1 addition & 4 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,5 @@ gem 'sinatra-activerecord'
gem 'async_sinatra'
gem 'money'
gem 'possibly', '~> 0.2.0'
gem 'paypal-sdk-permissions',
:git => 'git://github.com/paypal/permissions-sdk-ruby.git',
:branch => 'master',
:ref => 'c0240bee9f94fe6338d67b4f754e1a11ce81619a'
gem 'paypal-sdk-permissions', '~> 1.96.4'
gem 'paypal-sdk-merchant', '~> 1.116.0'
53 changes: 23 additions & 30 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,50 +1,40 @@
GIT
remote: git://github.com/paypal/permissions-sdk-ruby.git
revision: c0240bee9f94fe6338d67b4f754e1a11ce81619a
ref: c0240bee9f94fe6338d67b4f754e1a11ce81619a
branch: master
specs:
paypal-sdk-permissions (1.96.3)
paypal-sdk-core (~> 0.3.0)

GEM
remote: https://rubygems.org/
specs:
activemodel (4.2.0)
activesupport (= 4.2.0)
builder (~> 3.1)
activerecord (4.2.0)
activemodel (= 4.2.0)
activesupport (= 4.2.0)
arel (~> 6.0)
activesupport (4.2.0)
activemodel (5.1.5)
activesupport (= 5.1.5)
activerecord (5.1.5)
activemodel (= 5.1.5)
activesupport (= 5.1.5)
arel (~> 8.0)
activesupport (5.1.5)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (~> 0.7)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
arel (6.0.0)
arel (8.0.0)
async_sinatra (1.1.0)
rack (>= 1.4.1)
sinatra (>= 1.3.2)
builder (3.2.2)
concurrent-ruby (1.0.5)
daemons (1.1.9)
eventmachine (1.0.7)
i18n (0.7.0)
json (1.8.2)
minitest (5.5.1)
minitest (5.11.3)
money (6.5.1)
i18n (>= 0.6.4, <= 0.7.0)
multi_json (1.11.0)
multi_json (1.13.1)
mysql2 (0.3.16)
paypal-sdk-core (0.3.1)
paypal-sdk-core (0.3.4)
multi_json (~> 1.0)
xml-simple
paypal-sdk-merchant (1.116.0)
paypal-sdk-core (~> 0.3.0)
paypal-sdk-permissions (1.96.4)
paypal-sdk-core (~> 0.3.0)
possibly (0.2.0)
rack (1.6.0)
rack-protection (1.5.3)
rack (1.6.9)
rack-protection (1.5.5)
rack
sinatra (1.4.5)
rack (~> 1.4)
Expand All @@ -57,9 +47,9 @@ GEM
daemons (~> 1.0, >= 1.0.9)
eventmachine (~> 1.0)
rack (~> 1.0)
thread_safe (0.3.4)
thread_safe (0.3.6)
tilt (1.4.1)
tzinfo (1.2.2)
tzinfo (1.2.5)
thread_safe (~> 0.1)
xml-simple (1.1.5)

Expand All @@ -71,8 +61,11 @@ DEPENDENCIES
money
mysql2
paypal-sdk-merchant (~> 1.116.0)
paypal-sdk-permissions!
paypal-sdk-permissions (~> 1.96.4)
possibly (~> 0.2.0)
sinatra (~> 1.4.5)
sinatra-activerecord
thin

BUNDLED WITH
1.15.4