Dmitriy Zaporozhets
|
a699ebdbcc
|
handle attahcment with send_file
|
2013-02-11 21:31:19 +02:00 |
|
Dmitriy Zaporozhets
|
130f60d55b
|
a bit of restyling. Replace some images with icons. Simplify note form
|
2013-01-31 11:22:06 +02:00 |
|
Dmitriy Zaporozhets
|
e2fb18a3ec
|
replace right with pull-right
|
2013-01-30 16:40:43 +02:00 |
|
Dmitriy Zaporozhets
|
2e9c0e2b47
|
switch to use link_to_member to prevent 500 if user is a project owner but does not have membership and leave comment
|
2013-01-17 22:35:45 +02:00 |
|
Dmitriy Zaporozhets
|
f598cc7897
|
change logic on line_code
|
2013-01-15 11:12:17 +02:00 |
|
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
|
14d0ef8f37
|
Show images preview in notes. Show line additions/deletions for commit
|
2013-01-04 22:13:32 +02:00 |
|
Riyad Preukschas
|
e29687552e
|
Fix link titles
|
2013-01-02 21:07:02 +01:00 |
|
Riyad Preukschas
|
fbd345ea20
|
Make attachments more obvious
|
2012-12-03 22:51:56 +01:00 |
|
Riyad Preukschas
|
ae067ee322
|
Fix vote counting
|
2012-12-03 22:51:56 +01:00 |
|
Riyad Preukschas
|
5c2f6d7f05
|
Update notes views to support discussions
|
2012-12-03 22:51:55 +01:00 |
|
Riyad Preukschas
|
b1461de993
|
Make Note methods saner
|
2012-10-13 16:23:12 +02:00 |
|
Riyad Preukschas
|
81ee69381d
|
Add links to the note source if the note is mixed in
|
2012-10-10 12:14:48 +02:00 |
|
Riyad Preukschas
|
fb0279f311
|
Fix vote counting to only count main target notes (not mixed in ones)
|
2012-10-10 12:09:45 +02:00 |
|
Dmitriy Zaporozhets
|
64e76a87aa
|
Notes votes: use icons instead of borders. Removed unnecessary padding
|
2012-09-18 09:17:55 +03:00 |
|
Riyad Preukschas
|
b8113334a8
|
Highlight voting notes for issues and merge requests
|
2012-09-15 11:54:46 +02:00 |
|
Riyad Preukschas
|
4fc66ead4f
|
Rename 'notes/show' partial to 'notes/note'
|
2012-09-14 21:41:57 +02:00 |
|