home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-11 21:56:19 +10:00
Code Issues Packages Projects Releases Wiki Activity
26,661 Commits 48 Branches 340 Tags
31e28ebcebc054eaeef2eddba64ff2ff7ca3104f
Commit Graph
180 Commits
Author SHA1 Message Date
Jacob Schatz c52c192249 Merge branch 'member-access-note-row' into 'master' 
Fixed issue with member access not being visible on notes

This happened because the `note-actions`, which houses the access, was wrapped in a `can_edit` if statement

![Screen_Shot_2016-04-08_at_16.02.47](/uploads/40bffe9bb53c015f30ffa93bb018552b/Screen_Shot_2016-04-08_at_16.02.47.png)

Fixes #15049

See merge request !3618
 2016-04-12 17:21:12 +00:00
Phil Hughes 6dacf0fd6d Fixed issue with member access not being visible on notes 
Fixes #15049
 2016-04-08 16:02:13 +01:00
Annabel Dunstone e65bccfcc3 Remove comment count & icon from side by side view 2016-04-07 15:33:18 -07:00
Annabel Dunstone 04e798a515 Remove comment count & icon 2016-04-07 15:33:18 -07:00
Annabel Dunstone de63de18d7 Update diff colors and icons 2016-04-07 15:33:18 -07:00
Phil Hughes 4d463c3b0f Fixed delete comment button color 2016-04-06 09:54:49 +01:00
Phil Hughes 4d9d06ec50 Removed emoji button from notes form 2016-04-05 09:12:26 +01:00
Phil Hughes 3b4c4dd7b3 Logged out box 2016-04-04 10:48:49 +01:00
Phil Hughes 0581df2971 Discussion form 2016-04-04 10:48:49 +01:00
Phil Hughes f0d2f370cc Removed css code that isnt used 2016-04-04 10:48:49 +01:00
Phil Hughes af3284d98b Focus style for comment form 2016-04-04 10:48:49 +01:00
Phil Hughes 38e32780a8 Hides current user icon on mobile 2016-04-04 10:48:49 +01:00
Phil Hughes 3c2b0e7572 Added toolbar to comment form 2016-04-04 10:48:49 +01:00
Phil Hughes 0331fa3f3d Restyling on elements in comment form 2016-04-04 10:48:49 +01:00
Phil Hughes b7f0b22b9f Started refactoring of note form 2016-04-04 10:48:49 +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
Phil Hughes 7dde8b2cf0 Fix spacing below edit note form 
Also changed to allow the CSS to decide what should be hidden when editting
 2016-03-18 17:23:54 +00:00
Robert Speicher dc396d0fa4 Merge branch 'edited-text' into 'master' 
Edited timeago text on comments

Unified the 'edited text' to be the same in descriptions and comments

Closes #5538 

See merge request !3063
 2016-03-17 20:35:06 +00:00
Jacob Schatz d343c7a159 Merge branch 'comment-discard-button' into 'master' 
Added discard button to comment form

Also changed the labels on the buttons to better match the action they are completing.

Closes #8057

See merge request !3085
 2016-03-11 13:07:43 +00:00
Phil Hughes 3c6fdc7a0a Fixed quick submit on note edit 
Also removed the cloning of forms for note edits. Instead it just hides/shows the form seeing as it is already there

Closes #14094
 2016-03-10 11:02:22 +00:00
Phil Hughes 3d99ffc862 Edited timeago text on comments 
Unified the 'edited text' to be the same in descriptions and comments

Closes #5538
 2016-03-10 08:39:47 +00:00
Phil Hughes da6e38a889 Fixed tests for comment forms 2016-03-04 10:44:04 +00:00
Phil Hughes e033b9a7f1 Added discard button to comment form 
Also changed the labels on the buttons to better match the action they are completing.

Closes #8057
 2016-03-04 08:42:22 +00:00
Robert Speicher 76ed2afcfc Change js-quick-submit behavior to expect the class on the form 
Now it will work on any field inside that form, and it's easier to scope
new behavior, which is what we're adding next!
 2016-03-02 15:11:15 -05:00
Alfredo Sumaran c4b9b2cfcf Wrap icon with edited time 2016-02-29 11:01:28 -05: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
Dmitriy Zaporozhets 1667d2134c Merge branch 'show-message-to-signed-out-users-to-sign-in-if-they-want-to-comment' into 'master' 
Adds disabled comment field and disabled avatar.

Fixes #3540

![Screen_Shot_2016-01-20_at_12.13.29_AM](/uploads/673fb783e9aeae441df9c40bfe29ac1b/Screen_Shot_2016-01-20_at_12.13.29_AM.png)


See merge request !2508
 2016-01-20 22:27:40 +00: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
Jacob Schatz 3278c5b073 Adds disabled comment field and disabled avatar. 2016-01-20 00:15:55 -05:00
Rubén Dávila c8db25c37c Merge branch 'master' into issue_3945 2016-01-14 17:28:44 -05:00
Rémy Coutable 33ea09bdf9 Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into fix/private-references 2016-01-13 19:46:38 +01:00
Rémy Coutable 5efbfa14d4 Move complex view condition to a model method 
This is moved to a model method rather than an helper method because the
API will need it too.
 2016-01-13 16:37:17 +01:00
Rémy Coutable 9d7f88c122 Show referenced MRs & Issues only when the current viewer can access them 2016-01-13 11:59:10 +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
Drew Blessing 7a22b6b0de Improve button styles 2016-01-08 14:43:59 -06:00
Andriy Dyadyura 5e0b989fca new button sizes 2015-12-23 15:46:13 +01:00
Grzegorz BizonandGrzegorz Bizon 6fb120d1b0 Assign notes object to a variable 2015-12-15 14:19:35 +01:00
Douwe Maan d611a38798 Merge branch 'master' into reference-pipeline-and-caching 2015-12-07 14:48:53 +01:00
Douwe Maan 9bad736fb3 Remove unnecesary wrapper elements 2015-12-02 14:41:56 +01:00
Douwe Maan 2955ca613b Merge branch 'master' into reference-pipeline-and-caching 2015-12-02 11:20:51 +01:00
Douwe Maan f5a630111f Merge branch 'master' into reference-pipeline-and-caching 2015-11-19 15:46:04 +01:00
Valery Sizov fd2c0fe446 award emoji 2015-11-19 01:25:27 +02:00
Robert Speicher b7b49dab92 Merge branch 'param-view' into 'master' 
See merge request !1816
 2015-11-17 11:43:47 -05:00