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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Feature/use foundation rails helper rc #30

Merged
merged 2 commits into from Jan 14, 2017
Merged

Feature/use foundation rails helper rc #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4a98a56
Add ruby-version file
josepjaume Jan 14, 2017
6f9ce53
Update decidim
josepjaume Jan 14, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions .ruby-version
View file
Open in desktop
@@ -0,0 +1 @@
2.4.0
2 changes: 0 additions & 2 deletions Gemfile
View file
Open in desktop
Expand Up @@ -8,8 +8,6 @@ gem "decidim_hospitalet-surveys", path: "engines/decidim_hospitalet-surveys"
gem 'puma', '~> 3.0'
gem 'uglifier', '>= 1.3.0'

gem "foundation_rails_helper", git: "https://github.com/sgruhier/foundation_rails_helper.git", tag: "df0bd8e"

group :development, :test do
gem "decidim-dev", git: "https://github.com/AjuntamentdeBarcelona/decidim.git"
gem 'byebug', platform: :mri
Expand Down
19 changes: 6 additions & 13 deletions Gemfile.lock
View file
Open in desktop
Expand Up @@ -112,18 +112,6 @@ GIT
sassc-rails (~> 1.3.0)
turbolinks (~> 5.0.0, >= 5.0.0.1)

GIT
remote: https://github.com/sgruhier/foundation_rails_helper.git
revision: df0bd8eca1b43b8bfdcb163f9e1e3b3b9ab0595e
tag: df0bd8e
specs:
foundation_rails_helper (2.0.0)
actionpack (>= 4.1)
activemodel (>= 4.1)
activesupport (>= 4.1)
railties (>= 4.1)
tzinfo (~> 1.2, >= 1.2.2)

PATH
remote: engines/decidim_hospitalet-surveys
specs:
Expand Down Expand Up @@ -281,6 +269,12 @@ GEM
railties (>= 3.1.0)
sass (>= 3.3.0, < 3.5)
sprockets-es6 (>= 0.9.0)
foundation_rails_helper (2.0.0)
actionpack (>= 4.1)
activemodel (>= 4.1)
activesupport (>= 4.1)
railties (>= 4.1)
tzinfo (~> 1.2, >= 1.2.2)
globalid (0.3.7)
activesupport (>= 4.1.0)
graphiql-rails (1.4.1)
Expand Down Expand Up @@ -534,7 +528,6 @@ DEPENDENCIES
decidim_hospitalet-surveys!
faker (~> 1.7.2)
fog-aws
foundation_rails_helper!
listen (~> 3.1.0)
puma (~> 3.0)
rails_12factor
Expand Down