Douwe Maan b181d3124e Merge branch 'master' into issue-discussions-refactor ... # Conflicts: # app/models/issue.rb		2017-08-30 10:14:56 +02:00
..
discussion_comments_shared_example.rb	…
issuable_slash_commands_shared_examples.rb	…
reportable_note_shared_examples.rb	Merge branch 'master' into issue-discussions-refactor	2017-08-30 10:14:56 +02:00
resolving_discussions_in_issues_shared_examples.rb	…
rss_shared_examples.rb	…