home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-21 10:36:04 +10:00
Code Issues Packages Projects Releases Wiki Activity
30,219 Commits 48 Branches 340 Tags
b2dc9176018729efc1969035b30017c2ed81a708
Commit Graph
32 Commits
Author SHA1 Message Date
Douwe Maan 876dc7bacb Rename diff_with_notes partial. 2016-05-13 17:31:59 -05:00
Douwe Maan 7848d54f5b Clean up LegacyDiffNote somewhat 2016-05-13 17:31:58 -05:00
Douwe Maan 99d3e21f19 Extract LegacyDiffNote out of Note 2016-05-13 17:31:43 -05:00
Jacob Schatz 4d5d619457 Merge branch 'discussion-notes' into 'master' 
Discussion notes update

- At the moment discussion notes are rendered in a list but arent actually a list item and that can cause overflow issues
- Moved the dates to be in the header like other notes
- Fixed overlapping issue on mobile

See merge request !3720
 2016-04-18 13:03:24 +00:00
Annabel Dunstone 80d8f8b876 Syntax & style updates 2016-04-14 12:33:29 -05:00
Annabel Dunstone 82d0221b63 Add line type conditional to diff line helper 2016-04-14 09:10:40 -05:00
Annabel Dunstone d176f873e1 Add content attributes to discussion diffs; change styling of add-note icon to prevent white spaces in paste 2016-04-14 09:10:40 -05:00
Phil Hughes e490a54105 Discussion notes update 
At the moment discussion notes are rendered in a list but arent actually a list item and that can cause overflow issues
Moved the dates to be in the header like other notes
Fixed overlapping issue on mobile
 2016-04-14 14:50:48 +01:00
Phil Hughes 0c3cef02b3 Standardised the discussion headers 2016-03-31 12:58:20 +01:00
Phil Hughes e0960e2877 Changed some CSS to make it more concise & less overriding 2016-03-31 12:57:32 +01:00
Phil Hughes 9c1ce00ade Moved project access into note actions 
Created a class for note action buttons
 2016-03-31 12:57:32 +01:00
Stan Hu cc56d97d21 Fix commit comment alignment 
Closes #14780
 2016-03-30 20:13:31 -07:00
Stan Hu 191b9e3f05 Gracefully handle notes on deleted commits in merge requests 
Closes #3250
 2016-03-28 07:43:42 -07:00
Douwe Maan 40d2daed89 Highlight note code and edit preview 2016-01-25 11:42:47 +01:00
Dmitriy Zaporozhets 56b527093d Merge branch 'fix-comment-on-diff-ajax-loading' 2016-01-22 10:20:19 -08:00
Douwe Maan 21facf5353 Use consistent markup and styling for highlighting across blobs, diffs, blame and snippets 2016-01-21 14:23:53 +01:00
Rémy Coutable 12da27090f Address some JS coding-style and HTML semantic issues 
- Replace 'rel' attributes with 'data' or 'id' attributes
- Style jQuery methods chaining according to Jacob's guidelines
- Rename a method
 2016-01-20 22:39:32 +01:00
Douwe Maan 701513dcc7 Move parallel diff logic to separate class 2016-01-20 14:53:20 +01:00
Rubén Dávila 80a4c808b1 Make diff_line_content helper return a safe String. #3945 2016-01-12 11:02:16 -05:00
Gert Goet 7d2259b36f Diff colors on MR Discussion like on Changes-tab 
Fixes #2216
 2015-08-06 21:39:22 +02:00
Robert Speicher 8c8cd8be43 Update time_ago_with_tooltip helper 
Minor refactoring, add specs, changes arguments to use keywords.
 2015-06-17 16:37:10 -04:00
Douwe Maan 74770137f6 Always show note action icons. 2015-05-14 12:18:19 +02:00
Dmitriy Zaporozhets 0d50a65b32 Fix diff header in discussion blocks 2015-03-24 16:27:40 -07:00
Vinnie Okada 76aad9b76e Upgrade to Rails 4.1.9 
Make the following changes to deal with new behavior in Rails 4.1.2:

* Use nested resources to avoid slashes in arguments to path helpers.
 2015-02-14 11:09:23 -07:00
Jeroen van Baarsen 39bfe0aa1d Also show colors in the sidebar of comment 
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
 2015-02-03 18:45:39 +01:00
Evgeniy Sokovikov 732e6c3dbb same rendering for note diff as for usual diff 2014-10-15 13:03:27 +04:00
Sullivan SENECHAL 5d8be4438a Upgrade to Font Awesome v4.2 2014-10-03 12:19:24 +02:00
Dmitriy Zaporozhets 218219abbd Refactoring inside refactoring. We need to go deeper 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-08 21:54:52 +03:00
Dmitriy Zaporozhets 531f16beb0 Use new diff parsing logic 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-08 16:27:12 +03:00
Dmitriy Zaporozhets a7dcf690fb Fix discussion style for timeline 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-26 11:30:14 +03:00
Dmitriy Zaporozhets 674cbe1534 Fix diff comments toggle button 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-25 11:40:33 +03:00
Dmitriy Zaporozhets e93f6b030a Improve discussions 
* check for outdated discussions by comparing diff
* improve discussion UI

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-24 22:19:35 +03:00