Skip to content

Commit

Permalink
update gemfile and question form for the new rapidfire gem version
Browse files Browse the repository at this point in the history
  • Loading branch information
akshaysasidrn committed Oct 18, 2017
1 parent 4cf8cc5 commit 0dde6e9
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 19 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ gem 'jquery-rails'
# gem 'turbolinks'

gem 'haml-rails'
gem 'rapidfire', '~> 3.0'
gem 'rapidfire'
gem 'simple_form'
gem 'bootstrap-sass', '~> 3.3.5.1'
gem 'bootswatch-rails'
Expand Down
37 changes: 19 additions & 18 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ GEM
minitest (~> 5.1)
tzinfo (~> 1.1)
arel (7.1.4)
autoprefixer-rails (7.1.4)
autoprefixer-rails (7.1.5)
execjs
bcrypt (3.1.11)
bootstrap-sass (3.3.5.1)
Expand All @@ -66,7 +66,7 @@ GEM
ffi (1.9.18)
globalid (0.4.0)
activesupport (>= 4.2.0)
haml (5.0.3)
haml (5.0.4)
temple (>= 0.8.0)
tilt
haml-rails (1.0.0)
Expand All @@ -80,29 +80,30 @@ GEM
haml (>= 4.0, < 6)
nokogiri (>= 1.6.0)
ruby_parser (~> 3.5)
i18n (0.8.6)
i18n (0.9.0)
concurrent-ruby (~> 1.0)
jquery-rails (4.3.1)
rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
kaminari (1.0.1)
kaminari (1.1.0)
activesupport (>= 4.1.0)
kaminari-actionview (= 1.0.1)
kaminari-activerecord (= 1.0.1)
kaminari-core (= 1.0.1)
kaminari-actionview (1.0.1)
kaminari-actionview (= 1.1.0)
kaminari-activerecord (= 1.1.0)
kaminari-core (= 1.1.0)
kaminari-actionview (1.1.0)
actionview
kaminari-core (= 1.0.1)
kaminari-activerecord (1.0.1)
kaminari-core (= 1.1.0)
kaminari-activerecord (1.1.0)
activerecord
kaminari-core (= 1.0.1)
kaminari-core (1.0.1)
kaminari-core (= 1.1.0)
kaminari-core (1.1.0)
loofah (2.1.1)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
mail (2.6.6)
mime-types (>= 1.16, < 4)
method_source (0.8.2)
method_source (0.9.0)
mime-types (3.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2016.0521)
Expand All @@ -112,9 +113,9 @@ GEM
nokogiri (1.8.1)
mini_portile2 (~> 2.3.0)
pg (0.21.0)
pry (0.11.0)
pry (0.11.1)
coderay (~> 1.1.0)
method_source (~> 0.8.1)
method_source (~> 0.9.0)
pry-remote (0.1.8)
pry (~> 0.9)
slop (~> 3.0)
Expand Down Expand Up @@ -150,15 +151,15 @@ GEM
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (12.1.0)
rapidfire (3.0.0)
rapidfire (3.1.0)
active_model_serializers (~> 0.8.1)
rails (>= 3.2.13)
rb-fsevent (0.10.2)
rb-inotify (0.9.10)
ffi (>= 0.5.0, < 2)
ruby_parser (3.10.1)
sexp_processor (~> 4.9)
sass (3.5.1)
sass (3.5.2)
sass-listen (~> 4.0.0)
sass-listen (4.0.0)
rb-fsevent (~> 0.9, >= 0.9.4)
Expand Down Expand Up @@ -211,7 +212,7 @@ DEPENDENCIES
pry-remote (~> 0.1.7)
rails (~> 5.0, >= 5.0.0.1)
rails_12factor
rapidfire (~> 3.0)
rapidfire
sass-rails (~> 5.0)
simple_form
spring
Expand Down
9 changes: 9 additions & 0 deletions app/views/rapidfire/questions/_form.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,15 @@
<%= f.label :answer_options %>
<%= f.text_area :answer_options, rows: 5 %>
<%= f.label :position %>
<%= f.text_field :position %>
<%= f.label :placeholder %>
<%= f.text_field :placeholder %>
<%= f.label :default_text %>
<%= f.text_field :default_text %>

<h4>Other options</h4>
<hr/>

Expand Down

0 comments on commit 0dde6e9

Please sign in to comment.