'bundle update' everything unpinned, including font-awesome to 4.x

amomusik · Feb 19, 2014 · b180da8 · b180da8
1 parent a32395b
commit b180da8
Show file tree

Hide file tree

Showing 15 changed files with 142 additions and 128 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -14,7 +14,7 @@ GEM
       rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
       sprockets (~> 2.2.1)
-    active_hash (1.0.2)
+    active_hash (1.3.0)
       activesupport (>= 2.2.2)
     activemodel (3.2.14)
       activesupport (= 3.2.14)
@@ -31,49 +31,59 @@ GEM
       i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
     addressable (2.3.5)
-    arel (3.0.2)
-    awesome_print (1.1.0)
-    backbone-on-rails (1.0.0.1)
+    arel (3.0.3)
+    awesome_print (1.2.0)
+    backbone-on-rails (1.1.1.0)
+      actionmailer
+      actionpack
+      activemodel
+      activeresource
       eco
       ejs
       jquery-rails
-      rails (>= 3.1)
+      railties
     bcrypt-ruby (3.1.2)
     bootstrap-sass-rails (2.3.2.1)
       railties (>= 3.1.0)
       sass-rails (>= 3.1.0)
     builder (3.0.4)
-    bullet (4.6.0)
-      uniform_notifier
-    capybara (2.2.0)
+    bullet (4.8.0)
+      activesupport
+      uniform_notifier (>= 1.4.0)
+    capybara (2.2.1)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       xpath (~> 2.0)
-    capybara-screenshot (0.3.14)
+    capybara-screenshot (0.3.16)
       capybara (>= 1.0, < 3)
       launchy
-    chunky_png (1.2.8)
+    celluloid (0.15.2)
+      timers (~> 1.1.0)
+    celluloid-io (0.15.0)
+      celluloid (>= 0.15.0)
+      nio4r (>= 0.5.0)
+    chunky_png (1.3.0)
     cliver (0.3.2)
-    coderay (1.0.9)
+    coderay (1.1.0)
     coffee-rails (3.2.2)
       coffee-script (>= 2.2.0)
       railties (~> 3.2.0)
     coffee-script (2.2.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.6.3)
+    coffee-script-source (1.7.0)
     compass (0.12.2)
       chunky_png (~> 1.2)
       fssm (>= 0.2.7)
       sass (~> 3.1)
-    compass-rails (1.0.3)
-      compass (>= 0.12.2, < 0.14)
-    crack (0.4.1)
-      safe_yaml (~> 0.9.0)
+    compass-rails (1.1.3)
+      compass (>= 0.12.2)
+    crack (0.4.2)
+      safe_yaml (~> 1.0.0)
     daemons (1.1.9)
-    devise (3.0.3)
+    devise (3.0.4)
       bcrypt-ruby (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 3.2.6, < 5)
@@ -87,48 +97,49 @@ GEM
     ejs (1.1.1)
     erubis (2.7.0)
     eventmachine (1.0.3)
-    excon (0.25.3)
-    execjs (2.0.1)
-    factory_girl (4.2.0)
+    excon (0.31.0)
+    execjs (2.0.2)
+    factory_girl (4.4.0)
       activesupport (>= 3.0.0)
-    factory_girl_rails (4.2.1)
-      factory_girl (~> 4.2.0)
+    factory_girl_rails (4.4.0)
+      factory_girl (~> 4.4.0)
       railties (>= 3.0.0)
     faker (1.2.0)
       i18n (~> 0.5)
-    faraday (0.8.8)
-      multipart-post (~> 1.2.0)
+    faraday (0.9.0)
+      multipart-post (>= 1.2, < 3)
     ffi (1.9.3)
-    font-awesome-rails (3.2.1.3)
+    font-awesome-rails (4.0.3.1)
       railties (>= 3.2, < 5.0)
     formatador (0.2.4)
     fssm (0.2.10)
     geocoder (1.1.9)
-    gmaps4rails (2.1.1)
-    gravatar_image_tag (1.1.3)
-    guard (1.8.3)
+    gmaps4rails (2.1.2)
+    gravatar_image_tag (1.2.0)
+    guard (2.4.0)
       formatador (>= 0.2.4)
-      listen (~> 1.3)
-      lumberjack (>= 1.0.2)
-      pry (>= 0.9.10)
-      thor (>= 0.14.6)
-    guard-rspec (3.0.3)
-      guard (>= 1.8)
-      rspec (~> 2.13)
-    handlebars_assets (0.14.1)
+      listen (~> 2.1)
+      lumberjack (~> 1.0)
+      pry (>= 0.9.12)
+      thor (>= 0.18.1)
+    guard-rspec (4.2.6)
+      guard (~> 2.1)
+      rspec (>= 2.14, < 4.0)
+    handlebars_assets (0.15)
       execjs (>= 1.2.9)
+      multi_json
       sprockets (>= 2.0.3)
       tilt
     hashie (2.0.5)
-    heroku-api (0.3.15)
-      excon (~> 0.25.1)
-    heroku_san (4.3.1)
+    heroku-api (0.3.17)
+      excon (~> 0.27)
+      multi_json (~> 1.8.2)
+    heroku_san (4.3.2)
       heroku-api (>= 0.1.2)
       json
       rake
     hike (1.2.3)
-    httpauth (0.2.0)
-    i18n (0.6.5)
+    i18n (0.6.9)
     icalendar (1.5.0)
     jasmine (2.0.0)
       jasmine-core (~> 2.0.0)
@@ -137,22 +148,23 @@ GEM
       rake
     jasmine-core (2.0.0)
     journey (1.0.4)
-    jquery-datatables-rails (1.11.2)
+    jquery-datatables-rails (1.12.2)
       jquery-rails
-    jquery-rails (3.0.4)
+    jquery-rails (3.1.0)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
-    jquery-ui-rails (4.0.5)
+    jquery-ui-rails (4.1.2)
       railties (>= 3.1.0)
-    json (1.8.0)
-    jwt (0.1.8)
+    json (1.8.1)
+    jwt (0.1.11)
       multi_json (>= 1.5)
-    launchy (2.3.0)
+    launchy (2.4.2)
       addressable (~> 2.3)
-    listen (1.3.1)
+    listen (2.5.0)
+      celluloid (>= 0.15.2)
+      celluloid-io (>= 0.15.0)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
-      rb-kqueue (>= 0.2)
     lumberjack (1.0.4)
     mail (2.5.4)
       mime-types (~> 1.16)
@@ -161,36 +173,40 @@ GEM
     mime-types (1.25.1)
     mini_portile (0.5.2)
     multi_json (1.8.4)
-    multipart-post (1.2.0)
+    multi_xml (0.5.5)
+    multipart-post (2.0.0)
     nested_form (0.3.2)
-    nokogiri (1.6.0)
+    nio4r (1.0.0)
+    nokogiri (1.6.1)
       mini_portile (~> 0.5.0)
-    oauth2 (0.8.1)
-      faraday (~> 0.8)
-      httpauth (~> 0.1)
-      jwt (~> 0.1.4)
-      multi_json (~> 1.0)
+    oauth2 (0.9.3)
+      faraday (>= 0.8, < 0.10)
+      jwt (~> 0.1.8)
+      multi_json (~> 1.3)
+      multi_xml (~> 0.5)
       rack (~> 1.2)
-    omniauth (1.1.4)
+    omniauth (1.2.1)
       hashie (>= 1.2, < 3)
-      rack
+      rack (~> 1.0)
     omniauth-meetup (0.0.7)
       omniauth (~> 1.0)
       omniauth-oauth2 (~> 1.0)
-    omniauth-oauth2 (1.1.1)
-      oauth2 (~> 0.8.0)
-      omniauth (~> 1.0)
-    orm_adapter (0.4.0)
-    pg (0.17.0)
+    omniauth-oauth2 (1.1.2)
+      faraday (>= 0.8, < 0.10)
+      multi_json (~> 1.3)
+      oauth2 (~> 0.9.3)
+      omniauth (~> 1.2)
+    orm_adapter (0.5.0)
+    pg (0.17.1)
     phantomjs (1.9.2.1)
     poltergeist (1.5.0)
       capybara (~> 2.1)
       cliver (~> 0.3.1)
       multi_json (~> 1.0)
       websocket-driver (>= 0.2.0)
-    polyglot (0.3.3)
-    pry (0.9.12.2)
-      coderay (~> 1.0.5)
+    polyglot (0.3.4)
+    pry (0.9.12.6)
+      coderay (~> 1.0)
       method_source (~> 0.8)
       slop (~> 3.4)
     quiet_assets (1.0.2)
@@ -216,20 +232,18 @@ GEM
     rails_12factor (0.0.2)
       rails_serve_static_assets
       rails_stdout_logging
-    rails_serve_static_assets (0.0.1)
-    rails_stdout_logging (0.0.2)
+    rails_serve_static_assets (0.0.2)
+    rails_stdout_logging (0.0.3)
     railties (3.2.14)
       actionpack (= 3.2.14)
       activesupport (= 3.2.14)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
-    rake (10.1.0)
-    rb-fsevent (0.9.3)
-    rb-inotify (0.9.2)
-      ffi (>= 0.5.0)
-    rb-kqueue (0.2.0)
+    rake (10.1.1)
+    rb-fsevent (0.9.4)
+    rb-inotify (0.9.3)
       ffi (>= 0.5.0)
     rdoc (3.12.2)
       json (~> 1.4)
@@ -238,72 +252,73 @@ GEM
       rspec-expectations (~> 2.14.0)
       rspec-mocks (~> 2.14.0)
     rspec-core (2.14.7)
-    rspec-expectations (2.14.4)
+    rspec-expectations (2.14.5)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.4)
-    rspec-rails (2.14.0)
+    rspec-mocks (2.14.5)
+    rspec-rails (2.14.1)
       actionpack (>= 3.0)
+      activemodel (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
       rspec-core (~> 2.14.0)
       rspec-expectations (~> 2.14.0)
       rspec-mocks (~> 2.14.0)
-    safe_yaml (0.9.7)
-    sanitize (2.0.6)
+    safe_yaml (1.0.1)
+    sanitize (2.1.0)
       nokogiri (>= 1.4.4)
-    sass (3.2.10)
+    sass (3.2.14)
     sass-rails (3.2.6)
       railties (~> 3.2.0)
       sass (>= 3.1.10)
       tilt (~> 1.3)
     sass_rails_patch (0.0.2)
       sass-rails
-    select2-rails (3.4.9)
-      sass-rails
+    select2-rails (3.5.2)
       thor (~> 0.14)
-    sentry-raven (0.6.0)
+    sentry-raven (0.7.1)
       faraday (>= 0.7.6)
       hashie (>= 1.1.0)
       uuidtools
     sextant (0.2.4)
       rails (>= 3.2)
-    shoulda-matchers (2.4.0)
+    shoulda-matchers (2.5.0)
       activesupport (>= 3.0.0)
-    simple_form (2.1.0)
+    simple_form (2.1.1)
       actionpack (~> 3.0)
       activemodel (~> 3.0)
-    slop (3.4.6)
+    slop (3.4.7)
     sprockets (2.2.2)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
     sqlite3 (1.3.8)
     terminal-notifier-guard (1.5.3)
-    thin (1.5.1)
+    thin (1.6.1)
       daemons (>= 1.0.9)
-      eventmachine (>= 0.12.6)
+      eventmachine (>= 1.0.0)
       rack (>= 1.0.0)
     thor (0.18.1)
     tilt (1.4.1)
+    timers (1.1.0)
     treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
-    turbo-sprockets-rails3 (0.3.10)
+    turbo-sprockets-rails3 (0.3.11)
       railties (> 3.2.8, < 4.0.0)
-      sprockets (>= 2.0.0)
-    tzinfo (0.3.37)
-    uglifier (2.2.1)
+      sprockets (>= 2.2.0)
+    tzinfo (0.3.38)
+    uglifier (2.4.0)
       execjs (>= 0.3.0)
-      multi_json (~> 1.0, >= 1.0.2)
-    uniform_notifier (1.3.0)
+      json (>= 1.8.0)
+    uniform_notifier (1.4.0)
     uuidtools (2.1.4)
     warden (1.2.3)
       rack (>= 1.0)
-    webmock (1.13.0)
+    webmock (1.17.3)
       addressable (>= 2.2.7)
       crack (>= 0.3.2)
-    websocket-driver (0.3.1)
+    websocket-driver (0.3.2)
     xpath (2.0.0)
       nokogiri (~> 1.3)
 

diff --git a/app/assets/javascripts/dialogs/edit_section.js b/app/assets/javascripts/dialogs/edit_section.js
@@ -39,9 +39,6 @@ Bridgetroll.Views.EditSection = (function () {
 
     onSubmit: function () {
       this.model.save(this.formValues(), {wait: true}).success(_.bind(function () {
-        if (this.options.success) {
-          this.options.success();
-        }
         $(this.el).modal('hide');
       }, this));
     }

diff --git a/app/assets/stylesheets/_tables.css.scss b/app/assets/stylesheets/_tables.css.scss
@@ -14,7 +14,7 @@ table.checkins {
       margin: 0;
     }
 
-    .icon-check {
+    .fa-check-square-o {
       margin-left: 20px;
       margin-right: 5px;
     }