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

7 files changed, 2 insertions, 2 deletions

diff --git a/app/views/shared/_promo.html.haml b/app/views/shared/_promo.html.haml
index c97f8ba0f0e..7dec48e6585 100644
--- 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"
diff --git a/bin/bundle b/bin/bundle
index 66e9889e8b4..66e9889e8b4 100644..100755
--- a/bin/bundle
+++ b/bin/bundle
diff --git a/bin/rails b/bin/rails
index 7feb6a30e69..7feb6a30e69 100644..100755
--- a/bin/rails
+++ b/bin/rails
diff --git a/bin/rake b/bin/rake
index 8017a0271d2..8017a0271d2 100644..100755
--- a/bin/rake
+++ b/bin/rake
diff --git a/bin/rspec b/bin/rspec
index 41e37089ac2..41e37089ac2 100644..100755
--- a/bin/rspec
+++ b/bin/rspec
diff --git a/bin/spinach b/bin/spinach
index a080e286cfe..a080e286cfe 100644..100755
--- a/bin/spinach
+++ b/bin/spinach
diff --git a/bin/spring b/bin/spring
index 253ec37c345..253ec37c345 100644..100755
--- a/bin/spring
+++ b/bin/spring