Commit graph

27 commits

Author SHA1 Message Date
Clement Ho
fcae43c604 Merge branch 'master' into bootstrap4 2018-05-16 12:46:52 -05:00
George Tsiolis
77a925f4a6 Reorder discussion timestamp information for issues 2018-05-04 10:42:42 +03:00
Clement Ho
46031d63cd [skip ci] Convert panel related class names to card 2018-04-10 12:11:34 -05:00
Simon Knox
8fa001e760 Resolve "Projects::MergeRequestsController#show is slow (implement skeleton loading)" 2018-03-13 12:01:36 +00:00
Andreas Brandl
be231d2165 Use more specific #avatar_icon_for_user.
Whenever we already deal with a User object, let's use the more specific
method avatar_icon_for_user.
2018-02-13 18:04:51 +01:00
Douwe Maan
e4eba908cd Allow commenting on individual commits inside an MR 2017-12-07 09:01:19 -05:00
Clement Ho
04b616a60e Force non diff resolved discussion to display when collapse toggled 2017-10-20 10:40:26 +00:00
Douwe Maan
ab91f76e8b Add system note with link to diff comparison when MR discussion becomes outdated 2017-05-23 16:27:30 -05:00
Douwe Maan
ff82acf343 Consistently use monospace font for commit SHAs and branch and tag names 2017-05-12 09:55:25 -05:00
Douwe Maan
f8fabfcc6f Allow commenting on older versions of the diff and comparisons between diff versions 2017-05-03 14:47:21 -05:00
Douwe Maan
1817f877e1 Some code tweaks 2017-04-08 14:58:08 -05:00
Douwe Maan
a8339fe1aa Fix views after rebase 2017-04-08 14:37:46 -05:00
Douwe Maan
50eae640db Fix specs and make tweaks 2017-04-08 14:37:46 -05:00
Douwe Maan
f47b737456 Change discussion headline to 'a now outdated portion of the diff' 2017-04-08 14:37:46 -05:00
Douwe Maan
d65d245e06 Add link to diff header too 2017-04-08 14:37:46 -05:00
Douwe Maan
b202b42cfe Link to outdated diff in older MR version from outdated diff discussion 2017-04-08 14:37:46 -05:00
Douwe Maan
bb8cc94668
Don't use original_discussion_id 2017-04-05 17:44:14 +01:00
Douwe Maan
08bbb9fce6
Add option to start a new discussion on an MR 2017-04-05 17:44:14 +01:00
Eric Eastwood
cf3c43980d Fix link togglers jumping to top
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/29414
2017-03-28 11:09:12 -05:00
Nur Rony
aeb1a13847
adds avatar for discussion note 2017-01-24 14:41:25 +06:00
Nur Rony
125cabd335 resolves updated and resolved status is not showin 2016-11-23 14:02:53 +06:00
Nur Rony
58f78d0571 makes system notes less intrusive to a conversation
adds dicussion icon and color change in system note links

adds discussion icons and sticky note icon for other system notes for now

fixes scss lint error

adds faded commit lists

hides first paragraph in commit list box

css tweak for commit list system notes

adds commit-list toggle functionality, css tweaks and css classnames more readable

small css fix in header. makes links bold in system note

renames class no-shade to hide-shade

adds entry for this merge request in changelog

removes commented line

removes the avatar-icon from discussion header

minor css tweaks to make the commit list alignment with header text

uses monospaced font to make the commit list lined up with all

removes icon from system note and align bullet list

resolves scss lint warings

adds helper function to extract system note message from first p tag

adds helper functions to check commit list count and haml cleanup

adds changelog entry under 8.14

adds changelog entry with changelog cli

removes helper and regex and makes commit list li count using JS

makes link in system note normal

brakeman build failure resolved

fixing rspec test based on new design for discussion

shows system note in lowercase

removes extra spaces from comments

adds code commenting for functions

adds semi-colon in some lines

fixes rspec given when merge build success

removes commented codes

rewrite changelog yml file

moves isMetaKey to common utils file

fixes some indentation issues

removes unnecessary variables and resolves some discussions

replaces jQuery parent function with siblings

fixes scss issues and variable spelling mistake

uses constant rather using hardcoded number for visible li count in long commit list

makes system note header all lowercase

uses color variables and adjust gradient a little

some minor changes for adding css classes

renames functions name for readability

changes changelog title

minor scss newline changes

makes system note less intrusive to a conversation
2016-11-17 14:41:08 +06:00
Douwe Maan
27471d01c2 Don’t depend on unique class. 2016-07-28 20:09:50 -06:00
Douwe Maan
6d9715d877 Show existing discussion when adding new comment on line with a hidden resolved discussion 2016-07-28 19:28:56 -06:00
Phil Hughes
2247d8a4fd Updates the text above discussions when resolving notes & discussions 2016-07-27 18:34:04 +01:00
Douwe Maan
b3180d3486 Add resolved and last updated status to collapsed discussions 2016-07-25 22:49:21 -06:00
Douwe Maan
79214be727 Add Discussion model to represent MR/diff discussion 2016-07-20 16:18:18 -06:00