aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.travis.yml1
-rw-r--r--app/views/user/wall.html.erb2
2 files changed, 2 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml
index d6ed72cf6..4fa23e6cb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,6 +8,7 @@ rvm:
- 1.9.3
- 2.0.0
before_install:
+ - gem update --system 2.1.11
- gem install rake --version=0.9.2.2
- git submodule update --init --recursive
- psql -c "create database foi_test template template0 encoding 'SQL_ASCII';" -U postgres
diff --git a/app/views/user/wall.html.erb b/app/views/user/wall.html.erb
index a5e08639e..6699c55fa 100644
--- a/app/views/user/wall.html.erb
+++ b/app/views/user/wall.html.erb
@@ -14,6 +14,6 @@
<%= render :partial => 'request/wall_listing', :locals => { :event => result, :info_request => result.info_request } %>
<% end %>
<% else %>
- <p><%= _("There are nothing to display yet.") %></p>
+ <p><%= _("There is nothing to display yet.") %></p>
<% end %>
</div>