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

5 files changed, 9 insertions, 4 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 671b41b26e2..88678b087c5 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -45,6 +45,9 @@ v 7.11.0 (unreleased)
   - Add footnotes support to Markdown (Guillaume Delbergue)
   - Add current_sign_in_at to UserFull REST api.
 
+v 7.10.2
+  - Fix CI links on MR page
+
 v 7.10.0
   - Ignore submodules that are defined in .gitmodules but are checked in as directories.
   - Allow projects to be imported from Google Code.
diff --git a/app/mailers/devise_mailer.rb b/app/mailers/devise_mailer.rb
index 5395fe16414..b616add283a 100644
--- a/app/mailers/devise_mailer.rb
+++ b/app/mailers/devise_mailer.rb
@@ -1,4 +1,4 @@
 class DeviseMailer < Devise::Mailer
-  default from: "GitLab <#{Gitlab.config.gitlab.email_from}>"
+  default from: "#{Gitlab.config.gitlab.email_display_name} <#{Gitlab.config.gitlab.email_from}>"
   default reply_to: Gitlab.config.gitlab.email_reply_to
 end
diff --git a/app/models/project_services/gitlab_ci_service.rb b/app/models/project_services/gitlab_ci_service.rb
index f95bd79dfd6..949a4d7111b 100644
--- a/app/models/project_services/gitlab_ci_service.rb
+++ b/app/models/project_services/gitlab_ci_service.rb
@@ -44,7 +44,7 @@ class GitlabCiService < CiService
   end
 
   def commit_status_path(sha, ref)
-    project_url + "/refs/#{ref}/commits/#{sha}/status.json?token=#{token}"
+    URI::encode(project_url + "/refs/#{ref}/commits/#{sha}/status.json?token=#{token}")
   end
 
   def get_ci_build(sha, ref)
@@ -91,7 +91,7 @@ class GitlabCiService < CiService
   end
 
   def build_page(sha, ref)
-    project_url + "/refs/#{ref}/commits/#{sha}"
+    URI::encode(project_url + "/refs/#{ref}/commits/#{sha}")
   end
 
   def builds_path
diff --git a/app/views/admin/application_settings/_form.html.haml b/app/views/admin/application_settings/_form.html.haml
index f6eb00ea0bd..b9d7e8b4586 100644
--- a/app/views/admin/application_settings/_form.html.haml
+++ b/app/views/admin/application_settings/_form.html.haml
@@ -76,7 +76,7 @@
       = f.label :restricted_signup_domains, 'Restricted domains for sign-ups', class: 'control-label col-sm-2'
       .col-sm-10
         = f.text_area :restricted_signup_domains_raw, placeholder: 'domain.com', class: 'form-control'
-        .help-block Ex: domain.com, *.domain.com. Wildcards allowed. Use separate lines for multiple entries.
+        .help-block Only users with e-mail addresses that match these domain(s) will be able to sign-up. Wildcards allowed. Use separate lines for multiple entries. Ex: domain.com, *.domain.com
 
   .form-actions
     = f.submit 'Save', class: 'btn btn-primary'
diff --git a/spec/models/project_services/gitlab_ci_service_spec.rb b/spec/models/project_services/gitlab_ci_service_spec.rb
index afacd4afaf4..e5bf9125313 100644
--- a/spec/models/project_services/gitlab_ci_service_spec.rb
+++ b/spec/models/project_services/gitlab_ci_service_spec.rb
@@ -41,10 +41,12 @@ describe GitlabCiService do
 
     describe :commit_status_path do
       it { expect(@service.commit_status_path("2ab7834c", 'master')).to eq("http://ci.gitlab.org/projects/2/refs/master/commits/2ab7834c/status.json?token=verySecret")}
+      it { expect(@service.commit_status_path("issue#2", 'master')).to eq("http://ci.gitlab.org/projects/2/refs/master/commits/issue%232/status.json?token=verySecret")}
     end
 
     describe :build_page do
       it { expect(@service.build_page("2ab7834c", 'master')).to eq("http://ci.gitlab.org/projects/2/refs/master/commits/2ab7834c")}
+      it { expect(@service.build_page("issue#2", 'master')).to eq("http://ci.gitlab.org/projects/2/refs/master/commits/issue%232")}
     end
   end