Merge branch 'master' of github.com:gitlabhq/gitlabhq

2014-03-03 22:01:46 +02:00 · 2014-03-03 22:01:46 +02:00 · d0e73eeca1
commit d0e73eeca1
parent e6e0ad4e5e 775aa578e4
7 changed files with 2 additions and 2 deletions
--- a/app/views/shared/_promo.html.haml
+++ b/app/views/shared/_promo.html.haml
@ -1,4 +1,4 @@
 .gitlab-promo
-  = link_to "Homepage", "http://gitlab.org"
-  = link_to "Blog", "http://blog.gitlab.org"
+  = link_to "Homepage", "https://www.gitlab.com/"
+  = link_to "Blog", "https://www.gitlab.com/blog/"
  = link_to "@gitlabhq", "https://twitter.com/gitlabhq"
--- a/bin/bundle
+++ b/bin/bundle
--- a/bin/rails
+++ b/bin/rails
--- a/bin/rake
+++ b/bin/rake
--- a/bin/rspec
+++ b/bin/rspec
--- a/bin/spinach
+++ b/bin/spinach
--- a/bin/spring
+++ b/bin/spring