summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app/views/notes/_form.html.haml2
-rw-r--r--spec/factories.rb4
2 files changed, 3 insertions, 3 deletions
diff --git a/app/views/notes/_form.html.haml b/app/views/notes/_form.html.haml
index 38bb8a22cb5..d094119a9da 100644
--- a/app/views/notes/_form.html.haml
+++ b/app/views/notes/_form.html.haml
@@ -39,6 +39,6 @@
.js-notify-commit-author
= label_tag :notify_author do
- = check_box_tag :notify_author, 1 , !@note.for_commit?
+ = check_box_tag :notify_author, 1 , @note.for_commit?
Commit author
.clearfix
diff --git a/spec/factories.rb b/spec/factories.rb
index 9e16bc9e3a9..ca75e507077 100644
--- a/spec/factories.rb
+++ b/spec/factories.rb
@@ -73,8 +73,8 @@ FactoryGirl.define do
# pick 3 commits "at random" (from bcf03b5d~3 to bcf03b5d)
trait :with_diffs do
- target_branch "bcf03b5d~3"
- source_branch "bcf03b5d"
+ target_branch "master" # pretend bcf03b5d~3
+ source_branch "stable" # pretend bcf03b5d
st_commits do
[Commit.new(project.repo.commit('bcf03b5d')),
Commit.new(project.repo.commit('bcf03b5d~1')),