summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2016-06-02 11:27:36 +0000
committerRémy Coutable <remy@rymai.me>2016-06-02 11:27:36 +0000
commit8d23e8724265db7e0bf3f736a67737d86f6ede1c (patch)
tree662dae318d66a6b4fad048cad84dc44abf8ea96a
parentacfbeced52db321534c7b03a56a909e280d26914 (diff)
parentc102b03e768fab984958a6d7e48ffbe4ef946576 (diff)
downloadgitlab-ce-8d23e8724265db7e0bf3f736a67737d86f6ede1c.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--CHANGELOG1
-rw-r--r--app/helpers/button_helper.rb2
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index d1cde40c1c7..a0df8396662 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -33,6 +33,7 @@ v 8.8.3
- Fix import URL migration not rescuing with the correct Error
- In search results, only show notes on confidential issues that the user has access to
- Fix health check access token changing due to old application settings being used
+ - Fix wiki project clone address error (chujinjin)
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',