diff options
author | Lin Jen-Shin <godfat@godfat.org> | 2019-02-26 16:02:28 +0000 |
---|---|---|
committer | Lin Jen-Shin <godfat@godfat.org> | 2019-02-26 16:02:28 +0000 |
commit | 13c723f1dd99a6488df0efc89f46cdae1e57126d (patch) | |
tree | 55d0bb4af6cd99695cc8a5f03d011d027475f7c4 /app/models/project.rb | |
parent | f26cd63b0f7e9acc29a72d81ad2ed327ac93b816 (diff) | |
parent | f49aeacdd0b20cc270423409efaf82b26ced4836 (diff) | |
download | gitlab-ce-13c723f1dd99a6488df0efc89f46cdae1e57126d.tar.gz |
Merge branch 'ce-revert-d5ce84fd' into 'master'
Revert "Merge branch 'revert-82d7b5a0-ce' into 'master'"
Closes #57857 and #50747
See merge request gitlab-org/gitlab-ce!25559
Diffstat (limited to 'app/models/project.rb')
-rw-r--r-- | app/models/project.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/models/project.rb b/app/models/project.rb index 7f78eceec1e..b016a65f0bb 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -249,10 +249,10 @@ class Project < ActiveRecord::Base has_many :container_repositories, dependent: :destroy # rubocop:disable Cop/ActiveRecordDependent has_many :commit_statuses - # The relation :all_pipelines is intented to be used when we want to get the + # The relation :all_pipelines is intended to be used when we want to get the # whole list of pipelines associated to the project has_many :all_pipelines, class_name: 'Ci::Pipeline', inverse_of: :project - # The relation :ci_pipelines is intented to be used when we want to get only + # The relation :ci_pipelines is intended to be used when we want to get only # those pipeline which are directly related to CI. There are # other pipelines, like webide ones, that we won't retrieve # if we use this relation. @@ -1216,7 +1216,7 @@ class Project < ActiveRecord::Base "#{web_url}.git" end - # Is overriden in EE + # Is overridden in EE def lfs_http_url_to_repo(_) http_url_to_repo end |