From aebae800dd83538d37d17c2ff62d14459803daa9 Mon Sep 17 00:00:00 2001 From: nwb Date: Tue, 22 Jul 2014 08:37:07 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AB=9E=E8=B5=9B=E9=A6=96=E9=A1=B5=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Gemfile | 2 +- Gemfile.lock | 37 ++++++++++++++++-------------- app/views/welcome/contest.html.erb | 2 +- 3 files changed, 22 insertions(+), 19 deletions(-) diff --git a/Gemfile b/Gemfile index fc889f707..57d85e464 100644 --- a/Gemfile +++ b/Gemfile @@ -1,4 +1,4 @@ -source 'https://ruby.taobao.org' +source 'http://ruby.taobao.org' unless RUBY_PLATFORM =~ /w32/ # unix-like only diff --git a/Gemfile.lock b/Gemfile.lock index 4159a32a0..34314d845 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -19,7 +19,7 @@ PATH rails GEM - remote: https://ruby.taobao.org/ + remote: http://ruby.taobao.org/ remote: https://rubygems.org/ specs: actionmailer (3.2.13) @@ -53,13 +53,12 @@ GEM rails (>= 3, < 5) arel (3.0.3) builder (3.0.0) - capybara (2.0.3) + capybara (2.4.1) mime-types (>= 1.16) nokogiri (>= 1.3.3) rack (>= 1.0.0) rack-test (>= 0.5.4) - selenium-webdriver (~> 2.0) - xpath (~> 1.0.0) + xpath (~> 2.0) celluloid (0.15.2) timers (~> 1.1.0) childprocess (0.5.3) @@ -90,7 +89,7 @@ GEM lumberjack (~> 1.0) pry (>= 0.9.12) thor (>= 0.18.1) - guard-rails (0.5.2) + guard-rails (0.5.3) guard (~> 2.0) guard-spork (1.5.1) childprocess (>= 0.2.3) @@ -122,14 +121,17 @@ GEM metaclass (0.0.4) method_source (0.8.2) mime-types (1.25.1) - mocha (0.13.3) + mini_portile (0.6.0) + mocha (1.1.0) metaclass (~> 0.0.1) multi_json (1.10.1) mysql2 (0.3.11) mysql2 (0.3.11-x86-mingw32) net-ldap (0.3.1) - nokogiri (1.5.11) - nokogiri (1.5.11-x86-mingw32) + nokogiri (1.6.3) + mini_portile (= 0.6.0) + nokogiri (1.6.3-x86-mingw32) + mini_portile (= 0.6.0) paperclip (3.5.4) activemodel (>= 3.0.0) activesupport (>= 3.0.0) @@ -233,7 +235,7 @@ GEM json (>= 1.8.0) websocket (1.0.7) win32console (1.3.2-x86-mingw32) - xpath (1.0.0) + xpath (2.0.0) nokogiri (~> 1.3) PLATFORMS @@ -246,22 +248,22 @@ DEPENDENCIES acts-as-taggable-on (= 2.4.1) better_errors! builder (= 3.0.0) - capybara (~> 2.0.0) + capybara (~> 2.4.1) coderay (~> 1.0.6) coffee-rails (~> 3.2.1) - factory_girl + factory_girl (~> 4.4.0) fastercsv (~> 1.5.0) - guard-rails - guard-spork + guard-rails (~> 0.5.3) + guard-spork (~> 1.5.1) guard-test (~> 1.0.0) htmlentities i18n (~> 0.6.0) jquery-rails (~> 2.0.2) kaminari - mocha (~> 0.13.3) + mocha (~> 1.1.0) mysql2 (= 0.3.11) net-ldap (~> 0.3.1) - nokogiri (< 1.6.0) + nokogiri (~> 1.6.3) paperclip (~> 3.5.4) pry pry-nav @@ -273,7 +275,8 @@ DEPENDENCIES ruby-openid (~> 2.1.4) sass-rails (~> 3.2.3) seems_rateable! - shoulda (> 3.3.2) - spork-testunit + selenium-webdriver (~> 2.42.0) + shoulda (~> 3.5.0) + spork-testunit (~> 0.0.8) therubyracer uglifier (>= 1.0.3) diff --git a/app/views/welcome/contest.html.erb b/app/views/welcome/contest.html.erb index 7769be8b3..bd8be87a3 100644 --- a/app/views/welcome/contest.html.erb +++ b/app/views/welcome/contest.html.erb @@ -169,7 +169,7 @@ <% end %> -
+
<%=contest.description.truncate(100, omission: '...')%>