diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-04-12 12:54:48 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-04-12 12:54:48 +0300 |
| commit | 73269a0a3a7fb37f6ebdbe6cd32b6985db038836 (patch) | |
| tree | afdc3320551caca08c74ea8fb0377b81f2c499b2 | |
| parent | f244914402aa6b1882671824a1a98d801cd5c45c (diff) | |
| parent | 52db4e8a986c52598fefaa69a458bf8672ce4a9b (diff) | |
| download | gitlab-ce-73269a0a3a7fb37f6ebdbe6cd32b6985db038836.tar.gz | |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | GITLAB_SHELL_VERSION | 2 | ||||
| -rw-r--r-- | app/views/dashboard/projects/starred.html.haml | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG index 727c9c962d9..09ee558112b 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -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 diff --git a/GITLAB_SHELL_VERSION b/GITLAB_SHELL_VERSION index e70b4523ae7..6a6a3d8e35c 100644 --- a/GITLAB_SHELL_VERSION +++ b/GITLAB_SHELL_VERSION @@ -1 +1 @@ -2.6.0 +2.6.1 diff --git a/app/views/dashboard/projects/starred.html.haml b/app/views/dashboard/projects/starred.html.haml index 670f5ac7af7..f4ad2b294b3 100644 --- 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. |