summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorMaxim Rydkin <maks.rydkin@gmail.com>2017-09-12 17:27:29 +0000
committerRobert Speicher <robert@gitlab.com>2017-09-12 17:27:29 +0000
commite723dc13be1e2e90fcf3ac9b97e8d159572f1d01 (patch)
tree1a48adaf037586903e58400b7a2778b550d66b56 /app
parent467dffa631e91e206f5835cc6d1fdb7bb3b112e0 (diff)
downloadgitlab-ce-e723dc13be1e2e90fcf3ac9b97e8d159572f1d01.tar.gz
Decrease Perceived Complexity threshold to 15
Diffstat (limited to 'app')
-rw-r--r--app/models/event.rb32
1 files changed, 20 insertions, 12 deletions
diff --git a/app/models/event.rb b/app/models/event.rb
index 8e9490b66f4..0b1f053a7e6 100644
--- a/app/models/event.rb
+++ b/app/models/event.rb
@@ -241,13 +241,7 @@ class Event < ActiveRecord::Base
def action_name
if push?
- if new_ref?
- "pushed new"
- elsif rm_ref?
- "deleted"
- else
- "pushed to"
- end
+ push_action_name
elsif closed?
"closed"
elsif merged?
@@ -263,11 +257,7 @@ class Event < ActiveRecord::Base
elsif commented?
"commented on"
elsif created_project?
- if project.external_import?
- "imported"
- else
- "created"
- end
+ created_project_action_name
else
"opened"
end
@@ -360,6 +350,24 @@ class Event < ActiveRecord::Base
private
+ def push_action_name
+ if new_ref?
+ "pushed new"
+ elsif rm_ref?
+ "deleted"
+ else
+ "pushed to"
+ end
+ end
+
+ def created_project_action_name
+ if project.external_import?
+ "imported"
+ else
+ "created"
+ end
+ end
+
def recent_update?
project.last_activity_at > RESET_PROJECT_ACTIVITY_INTERVAL.ago
end