Foodsoft/foodsoft
1
1
Fork 0
Code Issues 36 Pull requests 5 Projects 1 Releases Wiki Activity

x_11_file_import_via_plugin #65

Open
flip wants to merge 65 commits from x_11_file_import_via_plugin into develop
pull from: x_11_file_import_via_plugin
merge into: Foodsoft:develop
Conversation 0 Commits 65 Files changed 463 +4 -5
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 8b0e03ff60 - Show all commits

2
Gemfile
View file

@ -25,7 +25,7 @@ gem 'attribute_normalizer'
gem 'daemons' gem 'daemons'
gem 'doorkeeper' gem 'doorkeeper'
gem 'doorkeeper-i18n' gem 'doorkeeper-i18n'
gem 'haml' gem 'haml', '~> 5.0'
gem 'haml-rails' gem 'haml-rails'
gem 'ice_cube' gem 'ice_cube'
gem 'inherited_resources' gem 'inherited_resources'

7
Gemfile.lock
View file

@ -234,9 +234,8 @@ GEM
rails (>= 4.0.0) rails (>= 4.0.0)
globalid (1.0.1) globalid (1.0.1)
activesupport (>= 5.0) activesupport (>= 5.0)
haml (6.1.1) haml (5.2.2)
temple (>= 0.8.2) temple (>= 0.8.0)
thor
tilt tilt
haml-rails (2.1.0) haml-rails (2.1.0)
actionpack (>= 5.1) actionpack (>= 5.1)
@ -618,7 +617,7 @@ DEPENDENCIES
foodsoft_polls! foodsoft_polls!
foodsoft_wiki! foodsoft_wiki!
gaffe gaffe
haml haml (~> 5.0)
haml-rails haml-rails
hashie (~> 3.4.6) hashie (~> 3.4.6)
i18n-js (~> 3.0.0.rc8) i18n-js (~> 3.0.0.rc8)