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 |
||
---|---|---|
.. | ||
api | ||
assets | ||
gitlab | ||
hooks | ||
redcarpet/render | ||
support | ||
tasks | ||
api.rb | ||
event_filter.rb | ||
extracts_path.rb | ||
file_size_validator.rb |