git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Gem lock update

Browse Source
This commit is contained in:
Min Zeya Phyo
2019-10-25 13:00:40 +06:30
parent c0cc166bed
commit bfc6973762
1 changed files with 17 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
Gemfile.lock
View File

@@ -62,7 +62,7 @@ GEM
builder (3.2.3) builder (3.2.3)
byebug (11.0.1) byebug (11.0.1)
cancancan (1.17.0) cancancan (1.17.0)
capistrano (3.10.1) capistrano (3.11.2)
airbrussh (>= 1.0.0) airbrussh (>= 1.0.0)
i18n i18n
rake (>= 10.0.0) rake (>= 10.0.0)
@@ -72,15 +72,11 @@ GEM
capistrano-rails (1.4.0) capistrano-rails (1.4.0)
capistrano (~> 3.1) capistrano (~> 3.1)
capistrano-bundler (~> 1.1) capistrano-bundler (~> 1.1)
<<<<<<< HEAD
capistrano3-puma (3.1.1) capistrano3-puma (3.1.1)
capistrano (~> 3.7) capistrano (~> 3.7)
capistrano-bundler capistrano-bundler
puma (~> 3.4) puma (~> 3.4)
carrierwave (1.2.1)
=======
carrierwave (1.3.1) carrierwave (1.3.1)
>>>>>>> b025cc2cfd2b10df84cc1cee458efa4eef108752
activemodel (>= 4.0.0) activemodel (>= 4.0.0)
activesupport (>= 4.0.0) activesupport (>= 4.0.0)
mime-types (>= 1.16) mime-types (>= 1.16)
@@ -107,8 +103,8 @@ GEM
factory_girl_rails (4.9.0) factory_girl_rails (4.9.0)
factory_girl (~> 4.9.0) factory_girl (~> 4.9.0)
railties (>= 3.0.0) railties (>= 3.0.0)
faker (2.5.0) faker (2.6.0)
i18n (~> 1.6.0) i18n (>= 1.6, < 1.8)
ffi (1.11.1) ffi (1.11.1)
filterrific (5.2.1) filterrific (5.2.1)
font-awesome-rails (4.7.0.5) font-awesome-rails (4.7.0.5)
@@ -148,7 +144,7 @@ GEM
listen (3.0.8) listen (3.0.8)
rb-fsevent (~> 0.9, >= 0.9.4) rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7) rb-inotify (~> 0.9, >= 0.9.7)
loofah (2.3.0) loofah (2.3.1)
crass (~> 1.0.2) crass (~> 1.0.2)
nokogiri (>= 1.5.9) nokogiri (>= 1.5.9)
mail (2.7.1) mail (2.7.1)
@@ -231,23 +227,23 @@ GEM
chunky_png (~> 1.0) chunky_png (~> 1.0)
rqrcode_core (~> 0.1.0) rqrcode_core (~> 0.1.0)
rqrcode_core (0.1.0) rqrcode_core (0.1.0)
rspec-core (3.8.2) rspec-core (3.9.0)
rspec-support (~> 3.8.0) rspec-support (~> 3.9.0)
rspec-expectations (3.8.5) rspec-expectations (3.9.0)
diff-lcs (>= 1.2.0, < 2.0) diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.8.0) rspec-support (~> 3.9.0)
rspec-mocks (3.8.2) rspec-mocks (3.9.0)
diff-lcs (>= 1.2.0, < 2.0) diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.9.0) rspec-support (~> 3.9.0)
rspec-rails (3.9.0) rspec-rails (3.9.0)
actionpack (>= 3.0) actionpack (>= 3.0)
activesupport (>= 3.0) activesupport (>= 3.0)
railties (>= 3.0) railties (>= 3.0)
rspec-core (~> 3.8.0) rspec-core (~> 3.9.0)
rspec-expectations (~> 3.8.0) rspec-expectations (~> 3.9.0)
rspec-mocks (~> 3.8.0) rspec-mocks (~> 3.9.0)
rspec-support (~> 3.8.0) rspec-support (~> 3.9.0)
rspec-support (3.8.3) rspec-support (3.9.0)
ruby-ole (1.2.12.2) ruby-ole (1.2.12.2)
rubyzip (1.0.0) rubyzip (1.0.0)
sass (3.7.4) sass (3.7.4)
@@ -273,10 +269,9 @@ GEM
simple_form (5.0.1) simple_form (5.0.1)
actionpack (>= 5.0) actionpack (>= 5.0)
activemodel (>= 5.0) activemodel (>= 5.0)
spreadsheet (1.2.4) spreadsheet (1.2.5)
ruby-ole (>= 1.0) ruby-ole (>= 1.0)
spring (2.0.2) spring (2.1.0)
activesupport (>= 4.2)
spring-watcher-listen (2.0.1) spring-watcher-listen (2.0.1)
listen (>= 2.7, < 4.0) listen (>= 2.7, < 4.0)
spring (>= 1.2, < 3.0) spring (>= 1.2, < 3.0)
@@ -380,7 +375,7 @@ DEPENDENCIES
whenever whenever
RUBY VERSION RUBY VERSION
ruby 2.3.1p112 ruby 2.4.1p111
BUNDLED WITH BUNDLED WITH
2.0.2 2.0.2