Skip to content

Commit

Permalink
Merge staging for release
Browse files Browse the repository at this point in the history
  • Loading branch information
jvendetti committed Apr 17, 2018
2 parents 69eb107 + 59ff69b commit dbf2fda
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 8 deletions.
12 changes: 6 additions & 6 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ GEM
airbrussh (1.3.0)
sshkit (>= 1.6.1, != 1.7.0)
arel (6.0.4)
autoprefixer-rails (8.2.0)
autoprefixer-rails (8.3.0)
execjs
bootstrap-sass (3.3.7)
autoprefixer-rails (>= 5.2.1)
Expand Down Expand Up @@ -94,10 +94,10 @@ GEM
execjs
coffee-script-source (1.12.2)
concurrent-ruby (1.0.5)
crass (1.0.3)
crass (1.0.4)
cube-ruby (0.0.3)
daemons (1.2.6)
dalli (2.7.7)
dalli (2.7.8)
domain_name (0.5.20170404)
unf (>= 0.0.5, < 1.0.0)
erubis (2.7.0)
Expand Down Expand Up @@ -157,7 +157,7 @@ GEM
newrelic_rpm (5.0.0.342)
nokogiri (1.8.2)
mini_portile2 (~> 2.3.0)
oj (3.5.0)
oj (3.5.1)
open_uri_redirections (0.2.1)
pry (0.11.3)
coderay (~> 1.1.0)
Expand Down Expand Up @@ -218,7 +218,7 @@ GEM
tilt (>= 1.1, < 3)
select2-rails (4.0.3)
thor (~> 0.14)
sexp_processor (4.10.1)
sexp_processor (4.11.0)
spawnling (2.1.6)
sprockets (3.7.1)
concurrent-ruby (~> 1.0)
Expand All @@ -240,7 +240,7 @@ GEM
tilt (2.0.8)
tzinfo (1.2.5)
thread_safe (~> 0.1)
uglifier (4.1.8)
uglifier (4.1.9)
execjs (>= 0.3.0, < 3)
unf (0.1.4)
unf_ext
Expand Down
2 changes: 1 addition & 1 deletion app/views/layouts/_footer.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
</div>

<div class='row col-sm-12'>
<p>Copyright &copy; 2005‑2017, The Board of Trustees of Leland Stanford Junior University. All rights reserved.</p>
<p>Copyright &copy; 2005‑2018, The Board of Trustees of Leland Stanford Junior University. All rights reserved.</p>
</div>

<div class='row col-sm-12'>
Expand Down
2 changes: 1 addition & 1 deletion app/views/projects/show.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
%p
%strong Home Page:
- if @project.homePage
= link_to @project.homePage, @project.homePage
= link_to @project.homePage, @project.homePage, rel: "nofollow"
%h2{:style => "padding-top: 1em;"} Ontologies Used
- if @ontologies_used.empty?
No ontologies are currently associated with this project
Expand Down
3 changes: 3 additions & 0 deletions public/robots.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,6 @@
# To ban all spiders from the entire site uncomment the next two lines:
# User-Agent: *
# Disallow: /

User-Agent: *
Disallow: /projects/

0 comments on commit dbf2fda

Please sign in to comment.