Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce

2015-04-12 12:54:48 +03:00 · 2015-04-12 12:54:48 +03:00 · 73269a0a3a
parent f244914402 52db4e8a98
commit 73269a0a3a
3 changed files with 3 additions and 2 deletions
--- a/1
+++ b/1
@ -69,6 +69,7 @@ v 7.10.0 (unreleased)
  - Fix final line in EmailsOnPush email diff being rendered as error.
  - Authometic setup GitLab CI project for forks if origin project has GitLab CI enabled
  - Prevent duplicate Buildkite service creation.
+  - Fix git over ssh errors 'fatal: protocol error: bad line length character' 

 v 7.9.3
  - Contains no changes
--- a/2
+++ b/2
@ -1 +1 @@
-2.6.0
+2.6.1
--- a/app/views/dashboard/projects/starred.html.haml
+++ b/app/views/dashboard/projects/starred.html.haml
@ -19,5 +19,5 @@
      %i.fa.fa-angle-left

 - else
-  %h3 You dont have starred projects yet
+  %h3 You don't have starred projects yet
  %p.slead Visit project page and press on star icon and it will appear on this page.
 @ -1 +1 @@
 .6.0
 .6.1