Riyad Preukschas
|
3022786948
|
Merge commit 'master' into discussions
Conflicts:
app/assets/stylesheets/sections/notes.scss
app/contexts/notes/load_context.rb
app/models/project.rb
app/observers/note_observer.rb
app/roles/votes.rb
app/views/commit/show.html.haml
app/views/merge_requests/_show.html.haml
app/views/merge_requests/diffs.js.haml
app/views/merge_requests/show.js.haml
app/views/notes/_note.html.haml
features/steps/project/project_merge_requests.rb
spec/models/note_spec.rb
|
2013-01-15 00:52:25 +01:00 |
|
Dmitriy Zaporozhets
|
c6298678f5
|
use ui-box as for all
|
2013-01-04 23:35:31 +02:00 |
|
|
Dmitriy Zaporozhets
|
14d0ef8f37
|
Show images preview in notes. Show line additions/deletions for commit
|
2013-01-04 22:13:32 +02:00 |
|
|
Riyad Preukschas
|
494ae87840
|
Refactor discussion reply
|
2012-12-03 22:51:56 +01:00 |
|
|
Riyad Preukschas
|
06ea122840
|
Refactor diff notes creation
|
2012-12-03 22:51:56 +01:00 |
|
|
Riyad Preukschas
|
3bc507e5c5
|
Rename diff note partials
|
2012-12-03 22:51:56 +01:00 |
|
|
Riyad Preukschas
|
6ddf4567f4
|
Don't escape Html in patches
Fixes #2036
|
2012-11-22 12:45:39 +01:00 |
|
Koen Punt
|
1de0ea28b9
|
added bg for transparent images
added width and height below images in diff
|
2012-11-21 18:27:21 +01:00 |
|
Dmitriy Zaporozhets
|
404040d7ae
|
Fix invalid template path for huge commit
|
2012-10-30 13:35:57 +02:00 |
|
Robert Speicher
|
99d391332f
|
Add a "patch" MIME type, and render it like a normal view in Commit#show
|
2012-09-26 16:32:23 -04:00 |
|
|
Robert Speicher
|
b389247c02
|
Use Commit#show instead of Commits#show to view a single commit
Commits#show (plural) is going to be for showing commit history on a
specific path.
|
2012-09-26 16:32:21 -04:00 |
|