Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

remove superfluous parentheses in '_navigation.html.erb'

  • Loading branch information...
commit 0fb11a0407187e1fdfd0a71e64af74e1e8124ebe 1 parent 1fa1ae1
@DanielKehoe DanielKehoe authored
Showing with 31 additions and 33 deletions.
  1. +26 −28 Gemfile.lock
  2. +5 −5 app/views/layouts/_navigation.html.erb
View
54 Gemfile.lock
@@ -28,7 +28,7 @@ GEM
activesupport (3.2.3)
i18n (~> 0.6)
multi_json (~> 1.0)
- addressable (2.2.7)
+ addressable (2.2.8)
arel (3.0.2)
bcrypt-ruby (3.0.1)
bootstrap-sass (2.0.2)
@@ -41,7 +41,7 @@ GEM
rack-test (>= 0.5.4)
selenium-webdriver (~> 2.0)
xpath (~> 0.1.4)
- childprocess (0.3.1)
+ childprocess (0.3.2)
ffi (~> 1.0.6)
coffee-rails (3.2.2)
coffee-script (>= 2.2.0)
@@ -50,20 +50,19 @@ GEM
coffee-script-source
execjs
coffee-script-source (1.3.1)
- cucumber (1.1.9)
+ cucumber (1.2.0)
builder (>= 2.1.2)
- diff-lcs (>= 1.1.2)
- gherkin (~> 2.9.0)
+ diff-lcs (>= 1.1.3)
+ gherkin (~> 2.10.0)
json (>= 1.4.6)
- term-ansicolor (>= 1.0.6)
cucumber-rails (1.3.0)
capybara (>= 1.1.2)
cucumber (>= 1.1.8)
nokogiri (>= 1.5.0)
database_cleaner (0.7.2)
- devise (2.1.0.rc)
+ devise (2.1.0.rc2)
bcrypt-ruby (~> 3.0)
- orm_adapter (~> 0.0.3)
+ orm_adapter (~> 0.0.7)
railties (~> 3.1)
warden (~> 1.1.1)
diff-lcs (1.1.3)
@@ -71,15 +70,15 @@ GEM
mail (~> 2.2)
rspec (~> 2.0)
erubis (2.7.0)
- execjs (1.3.0)
+ execjs (1.3.2)
multi_json (~> 1.0)
- factory_girl (3.1.1)
+ factory_girl (3.2.0)
activesupport (>= 3.0.0)
- factory_girl_rails (3.1.0)
- factory_girl (~> 3.1.0)
+ factory_girl_rails (3.2.0)
+ factory_girl (~> 3.2.0)
railties (>= 3.0.0)
ffi (1.0.11)
- gherkin (2.9.3)
+ gherkin (2.10.0)
json (>= 1.4.6)
hike (1.2.1)
i18n (0.6.0)
@@ -87,7 +86,7 @@ GEM
jquery-rails (2.0.2)
railties (>= 3.2.0, < 5.0)
thor (~> 0.14)
- json (1.6.6)
+ json (1.7.1)
launchy (2.1.0)
addressable (~> 2.2.6)
libwebsocket (0.1.3)
@@ -97,7 +96,7 @@ GEM
mime-types (~> 1.16)
treetop (~> 1.4.8)
mime-types (1.18)
- multi_json (1.3.2)
+ multi_json (1.3.4)
nokogiri (1.5.2)
orm_adapter (0.0.7)
polyglot (0.3.3)
@@ -127,21 +126,21 @@ GEM
rdoc (3.12)
json (~> 1.4)
rolify (3.1.0)
- rspec (2.9.0)
- rspec-core (~> 2.9.0)
- rspec-expectations (~> 2.9.0)
- rspec-mocks (~> 2.9.0)
- rspec-core (2.9.0)
- rspec-expectations (2.9.1)
+ rspec (2.10.0)
+ rspec-core (~> 2.10.0)
+ rspec-expectations (~> 2.10.0)
+ rspec-mocks (~> 2.10.0)
+ rspec-core (2.10.0)
+ rspec-expectations (2.10.0)
diff-lcs (~> 1.1.3)
- rspec-mocks (2.9.0)
- rspec-rails (2.9.0)
+ rspec-mocks (2.10.1)
+ rspec-rails (2.10.1)
actionpack (>= 3.0)
activesupport (>= 3.0)
railties (>= 3.0)
- rspec (~> 2.9.0)
- rubyzip (0.9.7)
- sass (3.1.15)
+ rspec (~> 2.10.0)
+ rubyzip (0.9.8)
+ sass (3.1.17)
sass-rails (3.2.5)
railties (~> 3.2.0)
sass (>= 3.1.10)
@@ -152,12 +151,11 @@ GEM
libwebsocket (~> 0.1.3)
multi_json (~> 1.0)
rubyzip
- sprockets (2.1.2)
+ sprockets (2.1.3)
hike (~> 1.2)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
sqlite3 (1.3.6)
- term-ansicolor (1.0.7)
thor (0.14.6)
tilt (1.3.3)
treetop (1.4.10)
View
10 app/views/layouts/_navigation.html.erb
@@ -2,25 +2,25 @@
<ul class="nav">
<% if user_signed_in? %>
<li>
- <%= link_to('Logout', destroy_user_session_path, :method=>'delete') %>
+ <%= link_to 'Logout', destroy_user_session_path, :method=>'delete' %>
</li>
<% else %>
<li>
- <%= link_to('Login', new_user_session_path) %>
+ <%= link_to 'Login', new_user_session_path%>
</li>
<% end %>
<% if user_signed_in? %>
<li>
- <%= link_to('Edit account', edit_user_registration_path) %>
+ <%= link_to 'Edit account', edit_user_registration_path %>
</li>
<% if current_user.has_role? :admin %>
<li>
- <%= link_to('Admin', users_path) %>
+ <%= link_to 'Admin', users_path %>
</li>
<% end %>
<% else %>
<li>
- <%= link_to('Sign up', new_user_registration_path) %>
+ <%= link_to 'Sign up', new_user_registration_path %>
</li>
<% end %>
</ul>
Please sign in to comment.
Something went wrong with that request. Please try again.