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
|
5a214ee6f1
|
Remove unused methods
|
2013-01-05 13:11:15 +02:00 |
|
|
Dmitriy Zaporozhets
|
dccd8b6eaa
|
Continue refactoring. Use repostory and team
|
2013-01-04 08:43:25 +02:00 |
|
|
Dmitriy Zaporozhets
|
39ba934c0a
|
REpostiry, Team models
|
2013-01-03 21:09:18 +02:00 |
|
|
Riyad Preukschas
|
654f10102e
|
Remove paging from all notes except the wall
|
2012-12-03 22:51:56 +01:00 |
|
|
Riyad Preukschas
|
6c6f415cae
|
Fix appending diff line notes
|
2012-12-03 22:51:55 +01:00 |
|
|
Dmitriy Zaporozhets
|
a0aa0212a9
|
Removed feature: comments on wiki
|
2012-11-29 06:14:05 +03:00 |
|
|
Riyad Preukschas
|
3f72af9994
|
Make notes for merge requests include commit notes and add helpers
|
2012-10-10 12:06:30 +02:00 |
|
|
randx
|
9159be3a50
|
Fix MR diff comments. Fix wiki comments loading error
|
2012-09-15 09:49:21 +03:00 |
|
|
Riyad Preukschas
|
07eec9c66a
|
Update Notes JS for reversed notes
|
2012-09-14 21:41:57 +02:00 |
|
|
Riyad Preukschas
|
e802d00996
|
Completely redo loading of notes with JS
|
2012-09-14 21:41:56 +02:00 |
|
|
Riyad Preukschas
|
6ffec9a298
|
Update Note to load notes in the right order
|
2012-09-14 21:41:56 +02:00 |
|
Dmitriy Zaporozhets
|
5926bbac12
|
Backend Refactoring
|
2012-07-31 08:32:49 +03:00 |
|