ad55f0d6f9
Merge branch 'master' into comment-updated-by
2015-08-07 15:05:17 +02:00
7d2259b36f
Diff colors on MR Discussion like on Changes-tab
...
Fixes #2216
2015-08-06 21:39:22 +02:00
36bd6c8494
Show who last edited a comment if it wasn't the original author
2015-07-30 14:45:54 +02:00
7679a7ea55
Render Note field hints consistently for "new" and "edit" forms
...
- The "Edit" form didn't have Markdown hints.
- The "New" form had a paperclip icon for attachments, the "edit" form
didn't.
Closes #2010
Closes internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2525
2015-07-26 16:55:43 -04:00
bf3b318ec5
revert caching of note text
2015-07-21 13:59:14 +02:00
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
fdbaffdc08
Merge branch 'comment-box-changes' of gitlab.com:gitlab-org/gitlab-ce
2015-07-10 13:13:02 +02:00
360ee25ddb
Fixed the issues
2015-07-09 13:38:33 -07:00
c611b6f623
Comment box/Placeholder text redo
2015-07-01 15:49:31 -07:00
4d80360bed
Cache markdown of comments
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-30 15:54:20 +02:00
342d553709
Rename abilities to correspond contoller/model action names
...
write_ was renamed to create_
modify_ was renamed to update_
So now in update action we have next code
def create
can?(current_user, :create_issue, @issue)
end
def update
can?(current_user, :update_issue, @issue)
end
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-26 15:55:56 +02:00
8c8cd8be43
Update time_ago_with_tooltip helper
...
Minor refactoring, add specs, changes arguments to use keywords.
2015-06-17 16:37:10 -04:00
a7932fe2fd
Support commenting on a diff in side-by-side view
...
Closes https://github.com/gitlabhq/gitlabhq/issues/9283
2015-06-16 06:11:59 -07:00
4ae67fcaef
Show warning when a comment will add 10 or more people to the discussion.
2015-06-05 12:07:13 +02:00
74770137f6
Always show note action icons.
2015-05-14 12:18:19 +02:00
b0af379a22
Show user roles by comments.
2015-05-12 12:16:34 +02:00
725ff58bc8
Don't add js-task-list-container to things the user can't edit
2015-05-06 13:00:13 -04:00
5c7b91e29b
Single quotes/icon helper in views
2015-05-06 13:00:11 -04:00
922497560e
Update task list behavior for Notes
2015-05-06 12:58:27 -04:00
d4fec49abc
Fix merge request comments on files with multiple commits
...
Having a merge request with a comments on a line which is then changed
in a later commit prevented new comments from properly showing up in the
merge request show page.
* `Note#set_diff` do not use stored the diff when creating a new note
in merge requests (we can not be sure the diff did not changed since
the last comment on that line)
* Do not rely just on `outdated?` of the first note when displaying
comments of a MR in the discussion tab, but partition the
active/outdated notes and display them all
* In the inline changes tab just select the active notes, so an
outdated note does not prevent an active one from being rendered
* Just show active comments in the side-by-side changes tab
2015-04-15 18:23:57 +02:00
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
dfd256f29e
Support configurable attachment size via Application Settings
...
Fix bug where error messages from Dropzone would not be displayed on the issues page
Closes #1258
2015-04-02 00:04:08 -07:00
2993e2801a
Merge branch 'note-avatar-link' into 'master'
...
Link note avatar to user.
See merge request !446
2015-03-24 23:40:19 +00:00
0d50a65b32
Fix diff header in discussion blocks
2015-03-24 16:27:40 -07:00
1651c0bc44
Link note avatar to user.
2015-03-24 18:16:40 +01:00
b8c9257fb1
Fix bug where editing a comment with "+1" or "-1" would cause a server error
...
Closes #1151
2015-03-02 15:26:00 -08:00
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
218283b368
Merge branch 'extend_markdown_upload' into generic-uploads
...
# Conflicts:
# app/controllers/files_controller.rb
# app/controllers/projects/uploads_controller.rb
# app/uploaders/attachment_uploader.rb
2015-02-20 15:37:37 +01:00
4ef6ffaad3
Split up AttachmentUploader.
2015-02-20 15:19:50 +01:00
9e9ce95d62
Merge branch 'master' into rails-4.1.9
...
Conflicts:
app/views/dashboard/_project.html.haml
app/views/events/event/_common.html.haml
app/views/explore/projects/_project.html.haml
app/views/groups/_projects.html.haml
app/views/projects/_home_panel.html.haml
app/views/projects/_issues_nav.html.haml
app/views/projects/issues/_discussion.html.haml
app/views/projects/issues/_issues.html.haml
app/views/projects/issues/show.html.haml
app/views/projects/merge_requests/_discussion.html.haml
app/views/projects/merge_requests/_show.html.haml
app/views/projects/milestones/index.html.haml
app/views/projects/notes/_edit_form.html.haml
app/views/shared/_issuable_filter.html.haml
2015-02-19 20:53:05 -07:00
ab401a6132
Remove note attachment file selector.
2015-02-17 22:23:31 +01:00
d2ebdf664b
Refactor.
2015-02-17 22:23:31 +01:00
9bf8480b4a
Generalize the image upload in markdown
...
This commit generalizes the image upload via drag and drop so it supports all files.
It also adds access control for these files.
2015-02-17 22:20:44 +01:00
080449f8af
Make sure Markdown previews always use the same styling as the eventual destination.
2015-02-17 17:58:08 +01:00
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
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
505a492cd8
Only count the user's last vote
2015-01-19 21:18:36 +00:00
cad685e70b
Refactor zen mode. Make it works in diffs
2015-01-15 00:15:12 -08:00
4babc50eb7
Huge set of fixes for comments logic
2015-01-14 22:42:58 -08:00
8be0c60e40
Remove extra css class markdown-area which prevented attachments upload.
2014-12-22 16:44:14 +01:00
a9761ac1b8
Differentiate system notes
2014-12-20 16:20:29 -06:00
742e6eeed2
Merge branch 'upstream-master' into markdown-preview
...
Conflicts:
spec/routing/project_routing_spec.rb
2014-12-07 20:25:58 -07:00
4cbe72d767
UI improvements mostly for mobile screens
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-12-02 11:31:57 +02:00
f53e0fff47
Show username in comment header for easier mention
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-12-01 17:40:45 +02:00
6cac4e6271
Fix attachment misaligned in comment
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-11-07 12:51:18 +02:00
5700842ba8
Add Markdown preview to more forms
...
Enable Markdown previews when creating and editing issues, merge
requests, and milestones, and when editing notes.
2014-10-15 23:52:33 -05:00
732e6c3dbb
same rendering for note diff as for usual diff
2014-10-15 13:03:27 +04:00
5d8be4438a
Upgrade to Font Awesome v4.2
2014-10-03 12:19:24 +02:00
dae670bd69
Search for 'div-dropzone' correctly
2014-10-01 17:30:40 +02:00
adaec60a50
Factor zen mode.
2014-09-20 15:32:46 +02:00
Douwe Maan
Gert Goet
Robert Speicher
Hannes Rosenögger
Stan Hu
Dmitriy Zaporozhets
Darby
Dominik Sander
Sven Strickroth
Vinnie Okada
Jeroen van Baarsen
Michael Clarke
Marin Jankovski
Drew Blessing
Evgeniy Sokovikov
Sullivan SENECHAL
Robert Schilling
Ciro Santilli