mirror of
https://github.com/Growstuff/growstuff.git
synced 2026-05-18 21:56:55 -04:00
added 'development site' to header
This commit is contained in:
27
Gemfile.lock
27
Gemfile.lock
@@ -30,9 +30,9 @@ GEM
|
||||
multi_json (~> 1.0)
|
||||
arel (3.0.2)
|
||||
bcrypt-ruby (3.0.1)
|
||||
builder (3.0.0)
|
||||
cape (1.4.0)
|
||||
capistrano (2.13.3)
|
||||
builder (3.0.4)
|
||||
cape (1.5.0)
|
||||
capistrano (2.13.4)
|
||||
highline
|
||||
net-scp (>= 1.0.0)
|
||||
net-sftp (>= 2.0.0)
|
||||
@@ -47,7 +47,7 @@ GEM
|
||||
coffee-script (2.2.0)
|
||||
coffee-script-source
|
||||
execjs
|
||||
coffee-script-source (1.3.3)
|
||||
coffee-script-source (1.4.0)
|
||||
compass (0.12.2)
|
||||
chunky_png (~> 1.2)
|
||||
fssm (>= 0.2.7)
|
||||
@@ -72,11 +72,13 @@ GEM
|
||||
activesupport (>= 3.1, < 4.1)
|
||||
haml (~> 3.1)
|
||||
railties (>= 3.1, < 4.1)
|
||||
highline (1.6.14)
|
||||
highline (1.6.15)
|
||||
hike (1.2.1)
|
||||
i18n (0.6.1)
|
||||
journey (1.0.4)
|
||||
jquery-rails (2.1.1)
|
||||
jquery-rails (2.1.3)
|
||||
railties (>= 3.1.0, < 5.0)
|
||||
thor (~> 0.14)
|
||||
json (1.7.5)
|
||||
libv8 (3.3.10.4)
|
||||
mail (2.4.4)
|
||||
@@ -92,7 +94,7 @@ GEM
|
||||
net-ssh (>= 1.99.1)
|
||||
net-sftp (2.0.5)
|
||||
net-ssh (>= 2.0.9)
|
||||
net-ssh (2.5.2)
|
||||
net-ssh (2.6.1)
|
||||
net-ssh-gateway (1.1.0)
|
||||
net-ssh (>= 1.99.1)
|
||||
nokogiri (1.5.5)
|
||||
@@ -109,7 +111,7 @@ GEM
|
||||
rack (>= 0.4)
|
||||
rack-ssl (1.3.2)
|
||||
rack
|
||||
rack-test (0.6.1)
|
||||
rack-test (0.6.2)
|
||||
rack (>= 1.0)
|
||||
rails (3.2.8)
|
||||
actionmailer (= 3.2.8)
|
||||
@@ -135,13 +137,14 @@ GEM
|
||||
rspec-mocks (~> 2.11.0)
|
||||
rspec-core (2.11.1)
|
||||
rspec-expectations (2.11.3)
|
||||
rspec-mocks (2.11.2)
|
||||
rspec-rails (2.11.0)
|
||||
diff-lcs (~> 1.1.3)
|
||||
rspec-mocks (2.11.3)
|
||||
rspec-rails (2.11.4)
|
||||
actionpack (>= 3.0)
|
||||
activesupport (>= 3.0)
|
||||
railties (>= 3.0)
|
||||
rspec (~> 2.11.0)
|
||||
rvm-capistrano (1.2.6)
|
||||
rvm-capistrano (1.2.7)
|
||||
capistrano (>= 2.0.0)
|
||||
sass (3.2.1)
|
||||
sass-rails (3.2.5)
|
||||
@@ -160,7 +163,7 @@ GEM
|
||||
libv8 (~> 3.3.10)
|
||||
thor (0.16.0)
|
||||
tilt (1.3.3)
|
||||
treetop (1.4.10)
|
||||
treetop (1.4.11)
|
||||
polyglot
|
||||
polyglot (>= 0.3.1)
|
||||
tzinfo (0.3.33)
|
||||
|
||||
@@ -18,4 +18,6 @@
|
||||
.ten.columns
|
||||
%h1
|
||||
= link_to('Growstuff', root_path)
|
||||
%small
|
||||
development site
|
||||
|
||||
|
||||
@@ -11,6 +11,7 @@ describe 'layouts/application.html.haml', :type => "view" do
|
||||
|
||||
it 'shows the title' do
|
||||
rendered.should contain 'Growstuff'
|
||||
rendered.should contain 'development site'
|
||||
end
|
||||
|
||||
it 'should have signup/login links' do
|
||||
|
||||
Reference in New Issue
Block a user