diff --git a/.env.example b/.env.example index 19c9e0d2..85572af8 100644 --- a/.env.example +++ b/.env.example @@ -9,4 +9,4 @@ MAILGUN_DOMAIN=myawesomeapp.mailgun.org MAILGUN_PASSWORD=smtp_pass MAILGUN_USERNAME=postmaster@myawesomeapp.mailgun.org MAILGUN_API_KEY=key-mailgunapikey -SECRET_TOKEN=secrettoken +SECRET_TOKEN=secrettoken \ No newline at end of file diff --git a/Gemfile b/Gemfile index 92db9096..17e839b1 100644 --- a/Gemfile +++ b/Gemfile @@ -18,7 +18,7 @@ gem 'aws-sdk' gem 'active_model_serializers' # Front-end -gem 'bootstrap-sass', '2.1' +gem 'bootstrap-sass', '~> 3.0.2.0' gem 'jquery-rails' gem 'jquery-ui-rails' diff --git a/Gemfile.lock b/Gemfile.lock index 9df9df5c..a2c20006 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -50,7 +50,8 @@ GEM nokogiri (>= 1.4.4) uuidtools (~> 2.1) bcrypt-ruby (3.0.1) - bootstrap-sass (2.1.0.0) + bootstrap-sass (3.0.2.1) + sass (~> 3.2) builder (3.0.4) capybara (2.1.0) mime-types (>= 1.16) @@ -241,7 +242,7 @@ DEPENDENCIES active_model_serializers asset_sync aws-sdk - bootstrap-sass (= 2.1) + bootstrap-sass (~> 3.0.2.0) capybara ckeditor coffee-rails (~> 3.2.1) diff --git a/app/assets/javascripts/admin.js.coffee b/app/assets/javascripts/admin.js.coffee index f5d91297..45101ac1 100644 --- a/app/assets/javascripts/admin.js.coffee +++ b/app/assets/javascripts/admin.js.coffee @@ -99,7 +99,7 @@ Crowdhoster.admin = $('#reward-add').on 'click', (e) -> e.preventDefault() - $('#rewards ul').append('
| Reward | Number Claimed | Delete? |
|---|---|---|
$ | 0 |
| Reward | Number Claimed | Delete? |
|---|---|---|
$ | 0 |