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:
authorYorick Peterse <yorickpeterse@gmail.com>2015-10-15 11:42:48 +0300
committerYorick Peterse <yorickpeterse@gmail.com>2015-10-15 13:05:01 +0300
commitbed29940efc0c76dd966b26acb5dfb00d61e601e (patch)
treef54ad5b5953b2289bfb5566b3efe469505c3cbdb
parente5925d073ea09072790856da1569865d5c45e408 (diff)
Fixed Rubocop styling issues
-rw-r--r--app/models/note.rb2
-rw-r--r--config/initializers/rack_lineprof.rb8
2 files changed, 5 insertions, 5 deletions
diff --git a/app/models/note.rb b/app/models/note.rb
index dc110f4dc35..ebbdd2f33a1 100644
--- a/app/models/note.rb
+++ b/app/models/note.rb
@@ -62,7 +62,7 @@ class Note < ActiveRecord::Base
scope :with_associations, -> do
includes(:author, :noteable, :updated_by,
- project: [:project_members, {group: [:group_members]}])
+ project: [:project_members, { group: [:group_members] }])
end
serialize :st_diff
diff --git a/config/initializers/rack_lineprof.rb b/config/initializers/rack_lineprof.rb
index 80d232c3d36..f0c006d811b 100644
--- a/config/initializers/rack_lineprof.rb
+++ b/config/initializers/rack_lineprof.rb
@@ -9,10 +9,10 @@ if Rails.env.development? and RUBY_ENGINE == 'ruby' and ENV['ENABLE_LINEPROF']
class Sample < Rack::Lineprof::Sample.superclass
def format(*)
formatted = if level == CONTEXT
- sprintf " | % 3i %s", line, code
- else
- sprintf "% 8.1fms %5i | % 3i %s", ms, calls, line, code
- end
+ sprintf " | % 3i %s", line, code
+ else
+ sprintf "% 8.1fms %5i | % 3i %s", ms, calls, line, code
+ end
case level
when CRITICAL