From 1da6eeb19abd4640eccef90e4daf4ef34c177560 Mon Sep 17 00:00:00 2001 From: philipp Date: Tue, 7 May 2013 11:28:30 +1000 Subject: [PATCH] Updated gems, changed some bootstrap-files. --- Gemfile.lock | 54 +++++++++--------- app/views/news/index.html.erb | 0 app/views/static/faq.html.erb | 0 beautifier.rb | 0 .../images/ui-bg_flat_0_aaaaaa_40x100.png | Bin .../images/ui-bg_glass_55_fbf9ee_1x400.png | Bin .../images/ui-bg_glass_65_ffffff_1x400.png | Bin .../images/ui-bg_glass_75_dadada_1x400.png | Bin .../images/ui-bg_glass_75_e6e6e6_1x400.png | Bin .../images/ui-bg_glass_75_ffffff_1x400.png | Bin .../ui-bg_highlight-soft_75_cccccc_1x100.png | Bin .../ui-bg_inset-soft_95_fef1ec_1x100.png | Bin .../images/ui-icons_222222_256x240.png | Bin .../images/ui-icons_2e83ff_256x240.png | Bin .../images/ui-icons_454545_256x240.png | Bin .../images/ui-icons_888888_256x240.png | Bin .../images/ui-icons_cd0a0a_256x240.png | Bin script/rails | 0 serverscript | 0 testdata/deCODEme_scan.csv | 0 turnoffserver | 0 21 files changed, 26 insertions(+), 28 deletions(-) mode change 100755 => 100644 app/views/news/index.html.erb mode change 100755 => 100644 app/views/static/faq.html.erb mode change 100755 => 100644 beautifier.rb mode change 100755 => 100644 public/stylesheets/images/ui-bg_flat_0_aaaaaa_40x100.png mode change 100755 => 100644 public/stylesheets/images/ui-bg_glass_55_fbf9ee_1x400.png mode change 100755 => 100644 public/stylesheets/images/ui-bg_glass_65_ffffff_1x400.png mode change 100755 => 100644 public/stylesheets/images/ui-bg_glass_75_dadada_1x400.png mode change 100755 => 100644 public/stylesheets/images/ui-bg_glass_75_e6e6e6_1x400.png mode change 100755 => 100644 public/stylesheets/images/ui-bg_glass_75_ffffff_1x400.png mode change 100755 => 100644 public/stylesheets/images/ui-bg_highlight-soft_75_cccccc_1x100.png mode change 100755 => 100644 public/stylesheets/images/ui-bg_inset-soft_95_fef1ec_1x100.png mode change 100755 => 100644 public/stylesheets/images/ui-icons_222222_256x240.png mode change 100755 => 100644 public/stylesheets/images/ui-icons_2e83ff_256x240.png mode change 100755 => 100644 public/stylesheets/images/ui-icons_454545_256x240.png mode change 100755 => 100644 public/stylesheets/images/ui-icons_888888_256x240.png mode change 100755 => 100644 public/stylesheets/images/ui-icons_cd0a0a_256x240.png mode change 100755 => 100644 script/rails mode change 100755 => 100644 serverscript mode change 100755 => 100644 testdata/deCODEme_scan.csv mode change 100755 => 100644 turnoffserver diff --git a/Gemfile.lock b/Gemfile.lock index 5a7da1c..90f0f5c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -14,9 +14,9 @@ GIT GIT remote: git://github.com/ryanb/nested_form.git - revision: 731b5b0b83d5eff051ccae65d2eb8c79960bc725 + revision: a25eebe8205e4e63899873b716535def6c1f5a9d specs: - nested_form (0.3.1) + nested_form (0.3.2) GIT remote: git://github.com/tsujigiri/mendeley.git @@ -75,14 +75,13 @@ GEM bartt-ssl_requirement (1.4.2) bcrypt-ruby (3.0.1) builder (3.0.4) - capistrano (2.14.2) + capistrano (2.15.4) highline net-scp (>= 1.0.0) net-sftp (>= 2.0.0) net-ssh (>= 2.0.14) net-ssh-gateway (>= 1.1.0) - celluloid (0.12.4) - facter (>= 1.6.12) + celluloid (0.13.0) timers (>= 1.0.0) climate_control (0.0.3) activesupport (>= 3.0) @@ -98,13 +97,12 @@ GEM debugger-ruby_core_source (1.2.0) dynamic_form (1.1.4) erubis (2.7.0) - facter (1.6.18) factory_girl (4.2.0) activesupport (>= 3.0.0) fitgem (0.6.1) oauth - highline (1.6.16) - hike (1.2.1) + highline (1.6.18) + hike (1.2.2) i18n (0.6.1) journey (1.0.4) jquery-rails (2.2.1) @@ -119,19 +117,19 @@ GEM activesupport rest-client (>= 1.3.0) metaclass (0.0.1) - mime-types (1.22) + mime-types (1.23) minitest (4.3.3) mocha (0.13.3) metaclass (~> 0.0.1) - multi_json (1.7.2) + multi_json (1.7.3) net-scp (1.1.0) net-ssh (>= 2.6.5) net-sftp (2.1.1) net-ssh (>= 2.6.5) - net-ssh (2.6.6) + net-ssh (2.6.7) net-ssh-gateway (1.2.0) net-ssh (>= 2.6.5) - newrelic_rpm (3.6.0.78) + newrelic_rpm (3.6.1.88) nokogiri (1.5.9) oauth (0.4.7) paperclip (3.4.1) @@ -140,7 +138,7 @@ GEM activesupport (>= 3.0.0) cocaine (~> 0.5.0) mime-types - pg (0.15.0) + pg (0.15.1) polyglot (0.3.3) pr_geohash (1.0.0) rack (1.4.5) @@ -173,26 +171,26 @@ GEM rdoc (3.12.2) json (~> 1.4) recaptcha (0.3.5) - redis (3.0.3) - redis-namespace (1.2.1) + redis (3.0.4) + redis-namespace (1.3.0) redis (~> 3.0.0) rest-client (1.6.7) mime-types (>= 1.16) rsolr (1.0.9) builder (>= 2.1.2) rubyzip (0.9.5) - rvm-capistrano (1.2.7) + rvm-capistrano (1.3.0) capistrano (>= 2.0.0) sanitize (2.0.3) nokogiri (>= 1.4.4, < 1.6) - shoulda-context (1.1.0) - sidekiq (2.9.0) - celluloid (~> 0.12.0) - connection_pool (~> 1.0) - multi_json (~> 1) - redis (~> 3) + shoulda-context (1.1.1) + sidekiq (2.11.2) + celluloid (>= 0.13.0) + connection_pool (>= 1.0.0) + multi_json + redis (>= 3.0) redis-namespace - sidekiq-limit_fetch (1.4) + sidekiq-limit_fetch (1.5) sidekiq (>= 2.6.5, < 3) simplecov (0.7.1) multi_json (~> 1.0) @@ -202,9 +200,9 @@ GEM rack (~> 1.4) rack-protection (~> 1.3) tilt (~> 1.3, >= 1.3.3) - slim (1.3.6) - temple (~> 0.5.5) - tilt (~> 1.3.3) + slim (1.0.1) + temple (~> 0.3.0) + tilt (~> 1.2) sprockets (2.2.2) hike (~> 1.2) multi_json (~> 1.0) @@ -217,9 +215,9 @@ GEM nokogiri sunspot (= 2.0.0) sunspot_solr (2.0.0) - temple (0.5.5) + temple (0.3.5) thor (0.18.1) - tilt (1.3.6) + tilt (1.4.0) timers (1.1.0) treetop (1.4.12) polyglot diff --git a/app/views/news/index.html.erb b/app/views/news/index.html.erb old mode 100755 new mode 100644 diff --git a/app/views/static/faq.html.erb b/app/views/static/faq.html.erb old mode 100755 new mode 100644 diff --git a/beautifier.rb b/beautifier.rb old mode 100755 new mode 100644 diff --git a/public/stylesheets/images/ui-bg_flat_0_aaaaaa_40x100.png b/public/stylesheets/images/ui-bg_flat_0_aaaaaa_40x100.png old mode 100755 new mode 100644 diff --git a/public/stylesheets/images/ui-bg_glass_55_fbf9ee_1x400.png b/public/stylesheets/images/ui-bg_glass_55_fbf9ee_1x400.png old mode 100755 new mode 100644 diff --git a/public/stylesheets/images/ui-bg_glass_65_ffffff_1x400.png b/public/stylesheets/images/ui-bg_glass_65_ffffff_1x400.png old mode 100755 new mode 100644 diff --git a/public/stylesheets/images/ui-bg_glass_75_dadada_1x400.png b/public/stylesheets/images/ui-bg_glass_75_dadada_1x400.png old mode 100755 new mode 100644 diff --git a/public/stylesheets/images/ui-bg_glass_75_e6e6e6_1x400.png b/public/stylesheets/images/ui-bg_glass_75_e6e6e6_1x400.png old mode 100755 new mode 100644 diff --git a/public/stylesheets/images/ui-bg_glass_75_ffffff_1x400.png b/public/stylesheets/images/ui-bg_glass_75_ffffff_1x400.png old mode 100755 new mode 100644 diff --git a/public/stylesheets/images/ui-bg_highlight-soft_75_cccccc_1x100.png b/public/stylesheets/images/ui-bg_highlight-soft_75_cccccc_1x100.png old mode 100755 new mode 100644 diff --git a/public/stylesheets/images/ui-bg_inset-soft_95_fef1ec_1x100.png b/public/stylesheets/images/ui-bg_inset-soft_95_fef1ec_1x100.png old mode 100755 new mode 100644 diff --git a/public/stylesheets/images/ui-icons_222222_256x240.png b/public/stylesheets/images/ui-icons_222222_256x240.png old mode 100755 new mode 100644 diff --git a/public/stylesheets/images/ui-icons_2e83ff_256x240.png b/public/stylesheets/images/ui-icons_2e83ff_256x240.png old mode 100755 new mode 100644 diff --git a/public/stylesheets/images/ui-icons_454545_256x240.png b/public/stylesheets/images/ui-icons_454545_256x240.png old mode 100755 new mode 100644 diff --git a/public/stylesheets/images/ui-icons_888888_256x240.png b/public/stylesheets/images/ui-icons_888888_256x240.png old mode 100755 new mode 100644 diff --git a/public/stylesheets/images/ui-icons_cd0a0a_256x240.png b/public/stylesheets/images/ui-icons_cd0a0a_256x240.png old mode 100755 new mode 100644 diff --git a/script/rails b/script/rails old mode 100755 new mode 100644 diff --git a/serverscript b/serverscript old mode 100755 new mode 100644 diff --git a/testdata/deCODEme_scan.csv b/testdata/deCODEme_scan.csv old mode 100755 new mode 100644 diff --git a/turnoffserver b/turnoffserver old mode 100755 new mode 100644