diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-04-16 19:55:14 +0200 |
|---|---|---|
| committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-04-16 19:55:14 +0200 |
| commit | 065e0c0fe4e5e16b90c01736721e4c794b71dac9 (patch) | |
| tree | 1638aeeb23e60cd1d2c33a99b1d875ebb3620942 /app/models/commit.rb | |
| parent | 5117412e33821f8eaf50befd2e00e431bfc74738 (diff) | |
| parent | 05920a7964a039fd65d6b665c2ebd130d5ef949c (diff) | |
| download | gitlab-ce-065e0c0fe4e5e16b90c01736721e4c794b71dac9.tar.gz | |
Merge remote-tracking branch 'origin/master' into ci-commit-as-pipeline
# Conflicts:
# db/schema.rb
Diffstat (limited to 'app/models/commit.rb')
| -rw-r--r-- | app/models/commit.rb | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/app/models/commit.rb b/app/models/commit.rb index 9ffdcc59128..7090909006d 100644 --- a/app/models/commit.rb +++ b/app/models/commit.rb @@ -154,7 +154,7 @@ class Commit id: id, message: safe_message, timestamp: committed_date.xmlschema, - url: commit_url, + url: Gitlab::UrlBuilder.build(self), author: { name: author_name, email: author_email @@ -168,10 +168,6 @@ class Commit data end - def commit_url - project.present? ? "#{Gitlab.config.gitlab.url}/#{project.path_with_namespace}/commit/#{id}" : "" - end - # Discover issues should be closed when this commit is pushed to a project's # default branch. def closes_issues(current_user = self.committer) |