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
path: root/app
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-03-25 04:28:10 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-03-25 04:28:10 +0300
commit6ec8ff069ceaa7bb914cbbd97ac248d926ef7e4e (patch)
treece712ef1a4bfa347f0728654eb97c2d2f7146f86 /app
parentb9372c999707558b695fa401b4f660a3d38fce86 (diff)
Enable more rubocop style checks
Diffstat (limited to 'app')
-rw-r--r--app/helpers/gitlab_markdown_helper.rb2
-rw-r--r--app/mailers/notify.rb2
-rw-r--r--app/models/project_services/asana_service.rb2
3 files changed, 3 insertions, 3 deletions
diff --git a/app/helpers/gitlab_markdown_helper.rb b/app/helpers/gitlab_markdown_helper.rb
index f8e104b0827..985def4ad66 100644
--- a/app/helpers/gitlab_markdown_helper.rb
+++ b/app/helpers/gitlab_markdown_helper.rb
@@ -29,7 +29,7 @@ module GitlabMarkdownHelper
end
def markdown(text, options={})
- unless (@markdown and options == @options)
+ unless @markdown && options == @options
@options = options
gitlab_renderer = Redcarpet::Render::GitlabHTML.new(self,
user_color_scheme_class,
diff --git a/app/mailers/notify.rb b/app/mailers/notify.rb
index ee27879cf40..8fcdd3bc853 100644
--- a/app/mailers/notify.rb
+++ b/app/mailers/notify.rb
@@ -148,7 +148,7 @@ class Notify < ActionMailer::Base
headers['References'] = message_id(model)
headers['X-GitLab-Project'] = "#{@project.name} | " if @project
- if (headers[:subject])
+ if headers[:subject]
headers[:subject].prepend('Re: ')
end
diff --git a/app/models/project_services/asana_service.rb b/app/models/project_services/asana_service.rb
index d52214cdd69..e6e16058d41 100644
--- a/app/models/project_services/asana_service.rb
+++ b/app/models/project_services/asana_service.rb
@@ -82,7 +82,7 @@ automatically inspected. Leave blank to include all branches.'
branch_restriction = restrict_to_branch.to_s
# check the branch restriction is poplulated and branch is not included
- if branch_restriction.length > 0 && branch_restriction.index(branch) == nil
+ if branch_restriction.length > 0 && branch_restriction.index(branch).nil?
return
end