Discussions (a.k.a. Grouped Comments)
Created by: riyad
This revamps the merge request comments section to group related comments (on commits and diffs) and shows a little context. There is also a lot of tidying up, fixing subtle deficiencies, inconsistencies and a few bugs.
- group comments based on commit, commit diff line, merge request diff line
- show context of embedded discussions
- make discussions collapsible
- fix icons and text for diff line links/buttons/form to be more consistent
- truncate diff context only to the relevant parts
- continuous loading only for the wall
- update styling for note actions
- allow previews and attachments everywhere
- improve attachments
- simplifying and cleaning CSS and JS
This is based on code, ideas and discussions from #1733. @kouno thanks again. :)
Merge request reports
Activity
Created by: riyad
Preliminary screen shots:
an embedded discussion
embedded discussions say where they actually come from and when they have been updated. also you can hide them if you want
a collapsed discussion
changed mr tabs
icons and text changed
diff line form and links
everything is consistently called "comment", also the reply icon is now on the button
comment actions
comment actions are greyed out and appear only if you hover over the comment. if you hover over the action, it will glow with color (e.g. blue). the delete icon "glows" red, when you hover over it
By Administrator on 2012-10-31T00:37:26 (imported from GitLab project)
By Administrator on 2012-10-31T00:37:26 (imported from GitLab)
Created by: riyad
Update:
- huge code refactoring
- discussions and diff notes now share many partials and almost all JS
- diff notes look a lot nicer
- you can now have many reply forms open
- no paging for ordinary commits any more ("infinite scroll" only supported for the wall)
Known Issues:
- styling for the note forms in discussion/diff lines is off sometimes
- note form on the wall is broken
By Administrator on 2012-11-21T00:16:33 (imported from GitLab project)
By Administrator on 2012-11-21T00:16:33 (imported from GitLab)
Created by: SaitoWu
@Riyad Awesome!
By Administrator on 2012-11-22T09:34:15 (imported from GitLab project)
By Administrator on 2012-11-22T09:34:15 (imported from GitLab)
Created by: riyad
Update: Generalized a lot of form handling code. There is a lot less difference between main and discussion note forms.
- preview everywhere
- form options (e.g. notifications, attachment) everywhere
- form errors (when necessary) everywhere
- lots of CSS cleanup
By Administrator on 2012-12-03T21:48:52 (imported from GitLab project)
By Administrator on 2012-12-03T21:48:52 (imported from GitLab)
Created by: ascii-soup
We're really looking forward to this PR as it will remove a number of the issues we have with GitLab when reviewing MRs. Is this still on track for 4.1?
By Administrator on 2013-01-14T15:03:08 (imported from GitLab project)
By Administrator on 2013-01-14T15:03:08 (imported from GitLab)
Created by: riyad
@randx My spinach tests are failing when they require a proper Ajax response. The (functionally) same tests worked when I wrote them as rspec request specs. Any idea what I need to fix to make them work?
By Administrator on 2013-01-14T23:57:27 (imported from GitLab project)
By Administrator on 2013-01-14T23:57:27 (imported from GitLab)
Created by: riyad
Rebases have become to cumbersome ... from now on there are merges with the current
masterbranch.- Merged master
- Fixed to work with recent changes in the Note model (i.e. the
commit_idstuff) - Rewrote my Rspec request specs as Spinach features (still missing some)
By Administrator on 2013-01-15T00:00:49 (imported from GitLab project)
By Administrator on 2013-01-15T00:00:49 (imported from GitLab)
Created by: dzaporozhets
I made few fixes and improvements and will merge it.
Next time we should avoid such huge Pull Requests.
@Riyad instead
project.add_access(@user, :read, :write)we now useproject.tead << [@user, :developer]also @Riyad thank you for such huge work
By Administrator on 2013-01-15T09:56:31 (imported from GitLab project)
By Administrator on 2013-01-15T09:56:31 (imported from GitLab)
Created by: dzaporozhets
@Riyad np. still 8 specs left to fix but its nothing. Guess it's a last big feature for 4.1
By Administrator on 2013-01-15T16:13:09 (imported from GitLab project)
By Administrator on 2013-01-15T16:13:09 (imported from GitLab)
