Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzesiek.bizon@gmail.com>2018-05-29 18:24:50 +0300
committerGrzegorz Bizon <grzesiek.bizon@gmail.com>2018-05-29 18:24:50 +0300
commita2f6aa96a9f44a0c1880871c2d5a7b8638d8b3cb (patch)
tree5c7d8a8befe6a362081f7e3f1cd468874f5bd792 /app/models/project.rb
parent162cc55e49e155d64ee862dfebefd97cec7d272c (diff)
parent58c50d40524e0b0c23d4c5d7782583e3742047ba (diff)
Merge branch 'master' into backstage/gb/use-persisted-stages-to-improve-pipelines-table
* master: (583 commits)
Diffstat (limited to 'app/models/project.rb')
-rw-r--r--app/models/project.rb11
1 files changed, 9 insertions, 2 deletions
diff --git a/app/models/project.rb b/app/models/project.rb
index e0f6c856f00..e4c18e4d494 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -895,6 +895,13 @@ class Project < ActiveRecord::Base
Gitlab::Routing.url_helpers.project_url(self)
end
+ def readme_url
+ readme = repository.readme
+ if readme
+ Gitlab::Routing.url_helpers.project_blob_url(self, File.join(default_branch, readme.path))
+ end
+ end
+
def new_issuable_address(author, address_type)
return unless Gitlab::IncomingEmail.supports_issue_creation? && author
@@ -1431,8 +1438,8 @@ class Project < ActiveRecord::Base
self.runners_token && ActiveSupport::SecurityUtils.variable_size_secure_compare(token, self.runners_token)
end
- def open_issues_count
- Projects::OpenIssuesCountService.new(self).count
+ def open_issues_count(current_user = nil)
+ Projects::OpenIssuesCountService.new(self, current_user).count
end
def open_merge_requests_count