db2c15369c
Conflicts: app/assets/stylesheets/main.scss app/models/project.rb app/views/notes/_common_form.html.haml app/views/notes/_per_line_form.html.haml lib/gitlab/markdown.rb spec/models/note_spec.rb |
||
---|---|---|
.. | ||
account.rb | ||
authority.rb | ||
git_host.rb | ||
issue_commonality.rb | ||
namespaced_project.rb | ||
note_event.rb | ||
push_event.rb | ||
push_observer.rb | ||
repository.rb | ||
static_model.rb | ||
team.rb | ||
votes.rb |