home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-13 22:59:19 +10:00
Code Issues Packages Projects Releases Wiki Activity
30,223 Commits 48 Branches 340 Tags
ac7cea308467709413f7a67b9e95fd0a0e2dcafe
Commit Graph
78 Commits
Author SHA1 Message Date
Yorick PeterseandRobert Speicher 7919366944 Merge branch 'refactor-rendering-redacting' into 'master' 
Support for rendering/redacting multiple documents

See merge request !4828
 2016-06-24 11:28:39 -04:00
Jacob SchatzandRobert Speicher 762c8a986b Merge branch 'note-emoji-system-note' into 'master' 
Hides award emoji & access level on system notes

## What does this MR do?

Hides award emoji & access level on system notes as they aren't applicable to them notes.

## Screenshots (if relevant)

![Screen_Shot_2016-06-13_at_16.14.03](/uploads/c105c37d0f140dea7480b56242c14ed9/Screen_Shot_2016-06-13_at_16.14.03.png)

See merge request !4629
 2016-06-21 11:52:25 -04:00
Connor Shea bdc995bf00 Shows award emoji for comments to all users who are logged in. 2016-06-08 17:09:48 -06:00
Jacob Schatz 37afdb076f Merge branch 'edit-mobile' into 'master' 
Shows the edit comment button on mobile

## What does this MR do?

Shows the edit comment button on mobile.

## What are the relevant issue numbers?

Closes #17214 

## Screenshots (if relevant)

![Screen_Shot_2016-06-01_at_12.33.13](/uploads/d46b800c175a53821ea8e8af49c07641/Screen_Shot_2016-06-01_at_12.33.13.png)

See merge request !4402
 2016-06-06 19:05:51 +00:00
Fatih AcetandZ.J. van de Weg f1d74ccc8c Some design related tweaks. 2016-06-06 11:10:10 +02:00
Fatih AcetandZ.J. van de Weg f261be0949 Award emoji implementation for notes. 2016-06-06 11:07:22 +02:00
Fatih AcetandZ.J. van de Weg eaff5afc9b Show emoji menu in notes. 2016-06-06 11:03:39 +02:00
Phil Hughes 855ff6423b Shows the edit comment button on mobile 
Closes #17214
 2016-06-02 09:10:29 +01:00
Yorick Peterse 25c08d11bb Added author to various Markdown calls in views 
This ensures all these calls have an author set, allowing the use of
"all" mentions where possible.
 2016-05-26 17:14:06 +02:00
Douwe Maan 99d3e21f19 Extract LegacyDiffNote out of Note 2016-05-13 17:31:43 -05:00
Phil Hughes 04c992f3cf Removed commented text from system notes 2016-04-20 14:48:53 +01:00
Jacob Schatz f2d94c5d86 Scroll to the last comment I made and edit it. 2016-04-15 16:05:37 -04:00
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 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 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
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
Alfredo Sumaran c4b9b2cfcf Wrap icon with edited time 2016-02-29 11:01:28 -05: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 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
Jason Lee 3ae1dee475 Avoid render edit_form when visitor can't edit them. 
Reverted #9820, github/task_list need a form, textarea for update.
 2015-11-17 23:21:03 +08:00
Robert Speicher c8e53d4467 Revert "Merge pull request #9820 from huacnlee/avoid-render-form-in-notes-list" 
This reverts commit 63144cd062, reversing
changes made to 8ab5df9d87.
 2015-11-16 13:08:08 -05:00
Dmitriy Zaporozhets 329a5555e5 Merge branch 'fix-avatar-not-showing' of https://gitlab.com/stanhu/gitlab-ce 2015-11-12 13:25:22 +01:00
Jason Lee 1974087114 Avoid render edit_form in each notes. 
Use RJS to render edit note feature.

Before:

```
Rendered projects/notes/_note.html.haml (27.9ms)
Rendered projects/_zen.html.haml (0.3ms)
Rendered projects/notes/_hints.html.haml (0.7ms)
Rendered projects/_md_preview.html.haml (3.9ms)
Rendered projects/notes/_edit_form.html.haml (6.9ms)
Rendered projects/notes/_note.html.haml (17.7ms)
Rendered projects/_zen.html.haml (0.3ms)
Rendered projects/notes/_hints.html.haml (0.6ms)
Rendered projects/_md_preview.html.haml (3.4ms)
Rendered projects/notes/_edit_form.html.haml (7.0ms)
```

After:

```
Rendered projects/notes/_note.html.haml (13.8ms)
Rendered projects/notes/_note.html.haml (7.1ms)
Rendered projects/notes/_note.html.haml (9.5ms)
Rendered projects/notes/_note.html.haml (8.5ms)
```

This change reduce at least 6ms * N ('N' - number of notes).
 2015-11-12 13:16:35 +08:00
Stan Hu 9738097722 Fix avatars not showing in Atom feeds and project issues when Gravatar disabled 
Fix for https://github.com/gitlabhq/gitlabhq/pull/9783
 2015-11-10 10:52:18 -08:00
Douwe Maan de0acf3cf7 Merge branch 'master' into reference-pipeline-and-caching 2015-10-21 11:36:41 +02:00
Yorick Peterse f3980e230f Don't use link_to/image_tag where not needed 
In these particular instances we can just use HAML tags directly. This
can shave off some time spent loading issue pages, though this depends
on the amount of comments being displayed.

When viewing https://gitlab.com/gitlab-org/gitlab-ce/issues/2164 locally
these changes reduce loading time by about 400 ms in total.
 2015-10-15 12:05:01 +02:00
Yorick Peterse 39fcd445fa Use note.author for issue comment avatars 
This removes the need for running a query to find the User object again
based on the supplied Email address.
 2015-10-15 12:05:01 +02:00
Douwe Maan 925dc5925b Cache rendered contents of issues, MRs and notes 2015-10-14 21:29:35 +02:00
Valery Sizov 97e6c9b42c Wrong access level badge on MR comments 2015-10-02 15:11:17 +03:00
Robert Speicher 9ade9a6451 Don't render the edit_form view for system notes 2015-09-30 16:58:34 -04:00
Dmitriy Zaporozhets 4bea030c88 Style system notes 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-08 10:12:14 +02:00
Douwe Maan 36bd6c8494 Show who last edited a comment if it wasn't the original author 2015-07-30 14:45:54 +02:00
Hannes Rosenögger bf3b318ec5 revert caching of note text 2015-07-21 13:59:14 +02:00
Stan Hu 875d8e7f31 Fix bug where notes were being rendered with wrong color preferences due to caching 
Closes #2008
 2015-07-18 07:32:18 -07:00
Dmitriy Zaporozhets 4d80360bed Cache markdown of comments 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-30 15:54:20 +02:00
Douwe Maan 74770137f6 Always show note action icons. 2015-05-14 12:18:19 +02:00
Douwe Maan b0af379a22 Show user roles by comments. 2015-05-12 12:16:34 +02:00
Robert Speicher 725ff58bc8 Don't add js-task-list-container to things the user can't edit 2015-05-06 13:00:13 -04:00
Robert Speicher 5c7b91e29b Single quotes/icon helper in views 2015-05-06 13:00:11 -04:00
Robert Speicher 922497560e Update task list behavior for Notes 2015-05-06 12:58:27 -04:00
Sven Strickroth 57c2a9f03d Explicitly set image alt to prevent graphical glitches 
Rails image_tag sets the alt-attribute to the filename which causes graphical glitches if the file could not be loaded.

Fixes https://github.com/gitlabhq/gitlabhq/issues/6036.

Signed-off-by: Sven Strickroth <email@cs-ware.de>
 2015-04-13 21:07:42 +02:00
Douwe Maan 1651c0bc44 Link note avatar to user. 2015-03-24 18:16:40 +01:00
Douwe Maan 0283fff591 Merge branch 'master' into extend_markdown_upload 
# Conflicts:
#	app/views/projects/issues/_form.html.haml
#	app/views/projects/merge_requests/_form.html.haml
#	app/views/projects/merge_requests/_new_submit.html.haml
#	app/views/projects/milestones/_form.html.haml
#	app/views/projects/notes/_form.html.haml
#	app/views/projects/wikis/_form.html.haml
#	config/routes.rb
#	spec/controllers/projects_controller_spec.rb
 2015-02-24 14:54:39 +01:00
Douwe Maan 4ef6ffaad3 Split up AttachmentUploader. 2015-02-20 15:19:50 +01: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