summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormicael.bergeron <micael.bergeron@solutionstlm.com>2017-08-15 12:18:02 -0400
committermicael.bergeron <micael.bergeron@solutionstlm.com>2017-09-06 09:00:57 -0400
commit4130552b421f1b83e60f03715000efe56461fc6b (patch)
tree1ba1990c5e603aea423fe75446c14e56816d6597
parent643ed0f6a95055c7972781fa7c81e8b7a13ed78a (diff)
downloadgitlab-ce-4130552b421f1b83e60f03715000efe56461fc6b.tar.gz
remove lint
-rw-r--r--app/assets/stylesheets/pages/notes.scss2
-rw-r--r--app/views/projects/notes/_actions.html.haml2
-rw-r--r--spec/models/concerns/issuable_spec.rb4
3 files changed, 4 insertions, 4 deletions
diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss
index e24f768e1d2..e437bad4912 100644
--- a/app/assets/stylesheets/pages/notes.scss
+++ b/app/assets/stylesheets/pages/notes.scss
@@ -633,7 +633,7 @@ ul.notes {
}
&.note-role-special {
- text-shadow: 0 0 15px white;
+ text-shadow: 0 0 15px $gl-text-color-inverted;
}
}
diff --git a/app/views/projects/notes/_actions.html.haml b/app/views/projects/notes/_actions.html.haml
index 22c81f76930..999a1b850e1 100644
--- a/app/views/projects/notes/_actions.html.haml
+++ b/app/views/projects/notes/_actions.html.haml
@@ -1,5 +1,5 @@
- if note.has_special_role?(Note::SpecialRole::FIRST_TIME_CONTRIBUTOR)
- %span.note-role.note-role-special.has-tooltip{ title: _("This user hasn't yet contributed code to this project. Handle with care.")}
+ %span.note-role.note-role-special.has-tooltip{ title: _("This user hasn't yet contributed code to this project. Handle with care.") }
= issuable_first_contribution_icon
- if access = note_max_access_for_user(note)
%span.note-role.note-role-access= Gitlab::Access.human_access(access)
diff --git a/spec/models/concerns/issuable_spec.rb b/spec/models/concerns/issuable_spec.rb
index dc959c58ba1..098d33e46c5 100644
--- a/spec/models/concerns/issuable_spec.rb
+++ b/spec/models/concerns/issuable_spec.rb
@@ -483,8 +483,8 @@ describe Issuable do
describe '#first_contribution?' do
let(:group) { create(:group) }
- let(:project) { create(:empty_project, namespace: group) }
- let(:other_project) { create(:empty_project) }
+ let(:project) { create(:project, namespace: group) }
+ let(:other_project) { create(:project) }
let(:owner) { create(:owner) }
let(:master) { create(:user) }
let(:reporter) { create(:user) }