diff options
author | Rémy Coutable <remy@rymai.me> | 2016-06-02 11:27:36 +0000 |
---|---|---|
committer | Yorick Peterse <yorickpeterse@gmail.com> | 2016-06-02 13:46:06 +0200 |
commit | e30c651bbdce9949b3b34c983394d2c95c7c7268 (patch) | |
tree | 0271e11b9ac16c46926131026753b1b00c2c5cc2 | |
parent | e601e683bcdee8eae00583aae713d69afc9eaa07 (diff) | |
download | gitlab-ce-e30c651bbdce9949b3b34c983394d2c95c7c7268.tar.gz |
Merge branch 'chujinjin/gitlab-ce-fix_wiki_project_clone_address_error' into 'master'
Fix wiki project clone address error
_Note: Originally opened at !4407 by @chujinjin._
---
fix wiki project clone address error in Wiki Git Access View, show as below:
![image](/uploads/5e3bf6d1418c42862a885319c31bc3cf/image.png)
Fixes #17643.
See merge request !4429
-rw-r--r-- | CHANGELOG | 1 | ||||
-rw-r--r-- | app/helpers/button_helper.rb | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG index 2e57bdb0788..0ed726f0696 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -14,6 +14,7 @@ v 8.8.3 - Pass the "Remember me" value to the 2FA token form. !4369 - Fix incorrect links on pipeline page when merge request created from fork. !4376 - Use downcased path to container repository as this is expected path by Docker. !4420 + - Fix wiki project clone address error (chujinjin). !4429 v 8.8.2 - Added remove due date button. !4209 diff --git a/app/helpers/button_helper.rb b/app/helpers/button_helper.rb index a9047ede8c5..f742922d926 100644 --- a/app/helpers/button_helper.rb +++ b/app/helpers/button_helper.rb @@ -30,7 +30,7 @@ module ButtonHelper content_tag :a, protocol, class: klass, - href: @project.http_url_to_repo, + href: project.http_url_to_repo, data: { html: true, placement: 'right', |