summaryrefslogtreecommitdiff
path: root/app/controllers/projects/notes_controller.rb
Commit message (Collapse)AuthorAgeFilesLines
* base implementation of emoji picker [ci skip]Valery Sizov2015-12-221-1/+0
|
* Merge remote-tracking branch 'origin/feature/update-rubocop'Dmitriy Zaporozhets2015-12-161-1/+1
|\
| * Fixed Rubocop offensesGabriel Mazetto2015-12-151-1/+1
| |
* | Fix note pollingrs-issue-4032Robert Speicher2015-12-121-1/+2
|/ | | | Closes #4032
* Notify user when award-emoji comment is invalidGrzegorz Bizon2015-12-031-1/+6
|
* Render json message with errors if note didn't pass validationGrzegorz Bizon2015-12-031-10/+14
|
* Emoji bug: Invalid url to imageaward_fixValery Sizov2015-11-221-1/+1
|
* Award: merge request fixValery Sizov2015-11-211-2/+5
|
* Fix for Emojinotes_fix_stablenotes_fixValery Sizov2015-11-201-1/+1
|
* adressing commentsValery Sizov2015-11-191-6/+6
|
* satisfy rubocopValery Sizov2015-11-191-2/+2
|
* Emoji: fix image of emoji when it is submitted via commentValery Sizov2015-11-191-0/+1
|
* award emojiValery Sizov2015-11-191-1/+24
|
* Revert "Merge pull request #9820 from huacnlee/avoid-render-form-in-notes-list"rs-revert-gh-9820Robert Speicher2015-11-161-6/+1
| | | | | This reverts commit 63144cd062f6d259f1f30b6e06eb92a16caa8dec, reversing changes made to 8ab5df9d872414b2cca3ebd16d57b89e2f19e06a.
* Avoid render edit_form in each notes.Jason Lee2015-11-121-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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).
* Redirect to a default path if HTTP_REFERER is not setStan Hu2015-10-201-2/+2
| | | | | | | | | | Safari 9.0 does not yet honor the HTML5 `origin-when-cross-origin` mode, and it's possible load balancers/proxies strip the HTTP_REFERER from the request header. In these cases, default to some default path. Closes #3122 Closes https://github.com/gitlabhq/gitlabhq/issues/9731
* Show who last edited a comment if it wasn't the original authorDouwe Maan2015-07-301-5/+2
|
* Update controller filtersDmitriy Zaporozhets2015-06-261-1/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Support commenting on a diff in side-by-side viewStan Hu2015-06-161-2/+15
| | | | Closes https://github.com/gitlabhq/gitlabhq/issues/9283
* Fixed the Rails/ActionFilter copJeroen van Baarsen2015-04-201-4/+4
| | | | Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
* Fix bug where editing a comment with "+1" or "-1" would cause a server errorStan Hu2015-03-021-1/+7
| | | | Closes #1151
* Add Markdown preview to more formsVinnie Okada2014-10-151-4/+0
| | | | | Enable Markdown previews when creating and editing issues, merge requests, and milestones, and when editing notes.
* Dont allow edit or remove of system notesDmitriy Zaporozhets2014-08-291-4/+8
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Note strong_paramsDmitriy Zaporozhets2014-06-261-2/+9
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* dont render discussion diff unless note is for diffDmitriy Zaporozhets2014-06-251-0/+2
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Improve merge request commentsDmitriy Zaporozhets2014-06-241-1/+11
| | | | | | | | | When add diff note on 'Changes' page - and then go to 'Discussions' tab you will not see this discussion unless you reload a page. This commit fixes it by rendering discussion on 'Discussion' page as soon as you submit comment on 'Changes' page Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Remove NotesObserverDmitriy Zaporozhets2014-06-171-1/+1
|
* Serialize last_fetched_at as a string with secondsJacob Vosmaer2014-04-281-1/+1
|
* Pass last_fetched_at for notes to javascriptJacob Vosmaer2014-04-281-1/+2
|
* Move services for collecting items to FindersDmitriy Zaporozhets2014-02-251-1/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Move all Context classes into ServicesDmitriy Zaporozhets2014-01-161-2/+2
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Switch Notes controller to use jsonDmitriy Zaporozhets2013-12-251-39/+59
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Make note anchors actually workDmitriy Zaporozhets2013-12-251-33/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Fix dashboard event cachingDrew Blessing2013-12-131-0/+2
|
* Drop rjs from Issues#indexDmitriy Zaporozhets2013-11-291-7/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Drop rjs from Notes#indexDmitriy Zaporozhets2013-11-291-1/+14
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch 'master' into 6-0-devDmitriy Zaporozhets2013-07-021-0/+26
| | | | | | | Conflicts: app/views/dashboard/projects.html.haml app/views/layouts/_head_panel.html.haml config/routes.rb
* Move projects controllers/views in Projects moduleDmitriy Zaporozhets2013-06-231-0/+76