Merge branch 'master' into salmon
This commit is contained in:
Benjamin Neff
commit
03ad788c85
2 changed files with 25 additions and 23 deletions
6
Gemfile
6
Gemfile
|
|
@ -19,7 +19,7 @@ group :development do
|
||||||
# code style
|
# code style
|
||||||
gem "rubocop", "0.34.2"
|
gem "rubocop", "0.34.2"
|
||||||
gem "pronto", "0.4.3"
|
gem "pronto", "0.4.3"
|
||||||
gem "pronto-rubocop", "0.4.6", require: false
|
gem "pronto-rubocop", "0.4.7", require: false
|
||||||
|
|
||||||
# debugging
|
# debugging
|
||||||
gem "pry"
|
gem "pry"
|
||||||
|
|
@ -44,7 +44,7 @@ group :test do
|
||||||
gem "fixture_builder", "~> 0.4.1"
|
gem "fixture_builder", "~> 0.4.1"
|
||||||
gem "factory_girl_rails", "~> 4.5.0"
|
gem "factory_girl_rails", "~> 4.5.0"
|
||||||
gem "rspec-collection_matchers", "~> 1.1.2"
|
gem "rspec-collection_matchers", "~> 1.1.2"
|
||||||
gem "webmock", "~> 1.21.0"
|
gem "webmock", "~> 1.22.1"
|
||||||
end
|
end
|
||||||
|
|
||||||
group :development, :test do
|
group :development, :test do
|
||||||
|
|
@ -63,7 +63,7 @@ group :development, :test do
|
||||||
gem "uuid", "~> 2.3.8"
|
gem "uuid", "~> 2.3.8"
|
||||||
|
|
||||||
# test database
|
# test database
|
||||||
gem "sqlite3", "~> 1.3.10"
|
gem "sqlite3", "~> 1.3.11"
|
||||||
end
|
end
|
||||||
|
|
||||||
group :development, :production do
|
group :development, :production do
|
||||||
|
|
|
||||||
42
Gemfile.lock
42
Gemfile.lock
|
|
@ -73,7 +73,7 @@ GEM
|
||||||
factory_girl_rails (4.5.0)
|
factory_girl_rails (4.5.0)
|
||||||
factory_girl (~> 4.5.0)
|
factory_girl (~> 4.5.0)
|
||||||
railties (>= 3.0.0)
|
railties (>= 3.0.0)
|
||||||
faraday (0.9.1)
|
faraday (0.9.2)
|
||||||
multipart-post (>= 1.2, < 3)
|
multipart-post (>= 1.2, < 3)
|
||||||
faraday_middleware (0.10.0)
|
faraday_middleware (0.10.0)
|
||||||
faraday (>= 0.7.4, < 0.10)
|
faraday (>= 0.7.4, < 0.10)
|
||||||
|
|
@ -104,7 +104,8 @@ GEM
|
||||||
guard (~> 2.1)
|
guard (~> 2.1)
|
||||||
guard-compat (~> 1.1)
|
guard-compat (~> 1.1)
|
||||||
rspec (>= 2.99.0, < 4.0)
|
rspec (>= 2.99.0, < 4.0)
|
||||||
httparty (0.13.5)
|
hashdiff (0.2.2)
|
||||||
|
httparty (0.13.7)
|
||||||
json (~> 1.8)
|
json (~> 1.8)
|
||||||
multi_xml (>= 0.5.2)
|
multi_xml (>= 0.5.2)
|
||||||
i18n (0.7.0)
|
i18n (0.7.0)
|
||||||
|
|
@ -112,7 +113,7 @@ GEM
|
||||||
listen (3.0.3)
|
listen (3.0.3)
|
||||||
rb-fsevent (>= 0.9.3)
|
rb-fsevent (>= 0.9.3)
|
||||||
rb-inotify (>= 0.9)
|
rb-inotify (>= 0.9)
|
||||||
little-plugger (1.1.3)
|
little-plugger (1.1.4)
|
||||||
logging (2.0.0)
|
logging (2.0.0)
|
||||||
little-plugger (~> 1.1)
|
little-plugger (~> 1.1)
|
||||||
multi_json (~> 1.10)
|
multi_json (~> 1.10)
|
||||||
|
|
@ -128,21 +129,21 @@ GEM
|
||||||
method_source (0.8.2)
|
method_source (0.8.2)
|
||||||
mime-types (2.6.2)
|
mime-types (2.6.2)
|
||||||
mini_portile (0.6.2)
|
mini_portile (0.6.2)
|
||||||
minitest (5.8.0)
|
minitest (5.8.1)
|
||||||
multi_json (1.11.1)
|
multi_json (1.11.2)
|
||||||
multi_xml (0.5.5)
|
multi_xml (0.5.5)
|
||||||
multipart-post (2.0.0)
|
multipart-post (2.0.0)
|
||||||
nenv (0.2.0)
|
nenv (0.2.0)
|
||||||
nokogiri (1.6.6.2)
|
nokogiri (1.6.6.2)
|
||||||
mini_portile (~> 0.6.0)
|
mini_portile (~> 0.6.0)
|
||||||
notiffany (0.0.7)
|
notiffany (0.0.8)
|
||||||
nenv (~> 0.1)
|
nenv (~> 0.1)
|
||||||
shellany (~> 0.0)
|
shellany (~> 0.0)
|
||||||
nyan-cat-formatter (0.11)
|
nyan-cat-formatter (0.11)
|
||||||
rspec (>= 2.99, >= 2.14.2, < 4)
|
rspec (>= 2.99, >= 2.14.2, < 4)
|
||||||
octokit (4.1.0)
|
octokit (4.1.1)
|
||||||
sawyer (~> 0.6.0, >= 0.5.3)
|
sawyer (~> 0.6.0, >= 0.5.3)
|
||||||
parser (2.2.2.6)
|
parser (2.2.3.0)
|
||||||
ast (>= 1.1, < 3.0)
|
ast (>= 1.1, < 3.0)
|
||||||
powerpack (0.1.1)
|
powerpack (0.1.1)
|
||||||
pronto (0.4.3)
|
pronto (0.4.3)
|
||||||
|
|
@ -150,10 +151,10 @@ GEM
|
||||||
octokit (~> 4.1.0)
|
octokit (~> 4.1.0)
|
||||||
rugged (~> 0.23.0)
|
rugged (~> 0.23.0)
|
||||||
thor (~> 0.19.0)
|
thor (~> 0.19.0)
|
||||||
pronto-rubocop (0.4.6)
|
pronto-rubocop (0.4.7)
|
||||||
pronto (~> 0.4.0)
|
pronto (~> 0.4.0)
|
||||||
rubocop (~> 0.34.0)
|
rubocop (~> 0.34.0)
|
||||||
pry (0.10.1)
|
pry (0.10.3)
|
||||||
coderay (~> 1.1.0)
|
coderay (~> 1.1.0)
|
||||||
method_source (~> 0.8.1)
|
method_source (~> 0.8.1)
|
||||||
slop (~> 3.4)
|
slop (~> 3.4)
|
||||||
|
|
@ -191,7 +192,7 @@ GEM
|
||||||
thor (>= 0.18.1, < 2.0)
|
thor (>= 0.18.1, < 2.0)
|
||||||
rainbow (2.0.0)
|
rainbow (2.0.0)
|
||||||
rake (10.4.2)
|
rake (10.4.2)
|
||||||
rb-fsevent (0.9.5)
|
rb-fsevent (0.9.6)
|
||||||
rb-inotify (0.9.5)
|
rb-inotify (0.9.5)
|
||||||
ffi (>= 0.5.0)
|
ffi (>= 0.5.0)
|
||||||
rspec (3.3.0)
|
rspec (3.3.0)
|
||||||
|
|
@ -224,7 +225,7 @@ GEM
|
||||||
rainbow (>= 1.99.1, < 3.0)
|
rainbow (>= 1.99.1, < 3.0)
|
||||||
ruby-progressbar (~> 1.4)
|
ruby-progressbar (~> 1.4)
|
||||||
ruby-progressbar (1.7.5)
|
ruby-progressbar (1.7.5)
|
||||||
rugged (0.23.2)
|
rugged (0.23.3)
|
||||||
safe_yaml (1.0.4)
|
safe_yaml (1.0.4)
|
||||||
sawyer (0.6.0)
|
sawyer (0.6.0)
|
||||||
addressable (~> 2.3.5)
|
addressable (~> 2.3.5)
|
||||||
|
|
@ -244,13 +245,13 @@ GEM
|
||||||
spring-watcher-listen (2.0.0)
|
spring-watcher-listen (2.0.0)
|
||||||
listen (>= 2.7, < 4.0)
|
listen (>= 2.7, < 4.0)
|
||||||
spring (~> 1.2)
|
spring (~> 1.2)
|
||||||
sprockets (3.3.4)
|
sprockets (3.4.0)
|
||||||
rack (~> 1.0)
|
rack (> 1, < 3)
|
||||||
sprockets-rails (2.3.3)
|
sprockets-rails (2.3.3)
|
||||||
actionpack (>= 3.0)
|
actionpack (>= 3.0)
|
||||||
activesupport (>= 3.0)
|
activesupport (>= 3.0)
|
||||||
sprockets (>= 2.8, < 4.0)
|
sprockets (>= 2.8, < 4.0)
|
||||||
sqlite3 (1.3.10)
|
sqlite3 (1.3.11)
|
||||||
systemu (2.6.5)
|
systemu (2.6.5)
|
||||||
terminal-table (1.5.2)
|
terminal-table (1.5.2)
|
||||||
thor (0.19.1)
|
thor (0.19.1)
|
||||||
|
|
@ -261,10 +262,11 @@ GEM
|
||||||
thread_safe (~> 0.1)
|
thread_safe (~> 0.1)
|
||||||
uuid (2.3.8)
|
uuid (2.3.8)
|
||||||
macaddr (~> 1.0)
|
macaddr (~> 1.0)
|
||||||
valid (1.0.2)
|
valid (1.1.0)
|
||||||
webmock (1.21.0)
|
webmock (1.22.1)
|
||||||
addressable (>= 2.3.6)
|
addressable (>= 2.3.6)
|
||||||
crack (>= 0.3.2)
|
crack (>= 0.3.2)
|
||||||
|
hashdiff
|
||||||
yard (0.8.7.6)
|
yard (0.8.7.6)
|
||||||
|
|
||||||
PLATFORMS
|
PLATFORMS
|
||||||
|
|
@ -281,7 +283,7 @@ DEPENDENCIES
|
||||||
logging-rails (= 0.5.0)
|
logging-rails (= 0.5.0)
|
||||||
nyan-cat-formatter
|
nyan-cat-formatter
|
||||||
pronto (= 0.4.3)
|
pronto (= 0.4.3)
|
||||||
pronto-rubocop (= 0.4.6)
|
pronto-rubocop (= 0.4.7)
|
||||||
pry
|
pry
|
||||||
pry-byebug
|
pry-byebug
|
||||||
pry-debundle
|
pry-debundle
|
||||||
|
|
@ -293,9 +295,9 @@ DEPENDENCIES
|
||||||
spring
|
spring
|
||||||
spring-commands-rspec
|
spring-commands-rspec
|
||||||
spring-watcher-listen
|
spring-watcher-listen
|
||||||
sqlite3 (~> 1.3.10)
|
sqlite3 (~> 1.3.11)
|
||||||
uuid (~> 2.3.8)
|
uuid (~> 2.3.8)
|
||||||
webmock (~> 1.21.0)
|
webmock (~> 1.22.1)
|
||||||
yard
|
yard
|
||||||
|
|
||||||
BUNDLED WITH
|
BUNDLED WITH
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue