home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-12 06:06:05 +10:00
Code Issues Packages Projects Releases Wiki Activity
21,146 Commits 48 Branches 340 Tags
e2f937ce22e6b0eb458bbdb3fa93b06d80ecfd21
Commit Graph
68 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets bdb4945dcf Fix random failing test - delete attachment 
Make sure we wait for AJAX request to finish before end test and cleanup
database

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-12-07 23:40:17 +01:00
Grzegorz Bizon bfe91b692a Remove space before exclamation mark in award alert 
[ci skip]
 2015-12-05 22:18:13 +01:00
Grzegorz Bizon 7af67f619a Combine new javascript Flash methods into one 2015-12-03 13:39:00 +01:00
Grzegorz Bizon 554f468462 Pin flash message to top if award note is invalid 2015-12-03 13:39:00 +01:00
Grzegorz Bizon 6fc1b94856 Show flash message instead of alert when note is invalid 2015-12-03 13:39:00 +01:00
Grzegorz Bizon a527f5c27f Notify user when award-emoji comment is invalid 2015-12-03 13:38:59 +01:00
Grzegorz Bizon c92b6e66dc Scroll to awards after adding emoji-award comment 
This makes it more intuitive, as user can see that something actually
happened after adding emoji-only comment in long discussions.
 2015-12-03 13:38:59 +01:00
Valery Sizov 23df515fd0 Emoji: fix image of emoji when it is submitted via comment 2015-11-19 01:26:00 +02:00
Valery Sizov 36d0442e83 replace emoji references from class name to data [ci skip] 2015-11-19 01:25:59 +02:00
Valery Sizov fd2c0fe446 award emoji 2015-11-19 01:25:27 +02: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
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
Robert Speicher 2ed5a5b70d Remove "quick submit" behavior specific to the Notes JS 2015-10-07 15:23:42 -04:00
Robert Speicher 7c20f30f05 Ensure notes are highlighted properly when they're updated 2015-09-30 16:58:35 -04:00
Robert Speicher 19c0bf2723 Simplify syntax highlighting of new notes 2015-09-10 15:38:25 -04:00
Robert Speicher cc22a2640f Add syntax highlight scheme to notes rendered client-side 2015-09-04 17:07:24 -04:00
Stan Hu dfe7807653 Fix live notes refresh in relative URL deployments 2015-07-26 09:54:53 -07:00
Daniel Gerhardt 7825001586 Fix file upload dialog for comment editing 
This fixes the file upload dialog which currently works for new comments
but not for comment editing. The cause for this is a missing DOM class
which causes traversal to the dropzone to fail.

This is fixed by adding the expected `gfm-form` class to the edit form.
It has to be added dynamically since adding it to the form template
would break the form's layout and comment saving.
 2015-07-17 21:15:52 +02:00
Stan Hu 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
Nicolas a68eabd212 Make submit hotkey available to all notes forms. 
Addresses #2221.
 2015-06-09 05:31:21 +02:00
Robert Speicher 73440b0364 Javascripts don't need to require jquery or bootstrap explicitly 2015-05-28 18:22:32 -04:00
Douwe Maan cbcc5f8544 Workaround that doesn't add unwanted newline. 2015-05-21 11:22:21 +02:00
Robert Speicher 8e40d594a2 Work around a Chrome 43 bug preventing note editing 2015-05-20 12:53:35 -04:00
Robert Speicher d5ee54df16 More JS dependency requirements 2015-05-06 15:31:08 -04:00
Robert Speicher 968c281f40 Make notes JS require its dependencies 2015-05-06 13:00:14 -04:00
Robert Speicher 922497560e Update task list behavior for Notes 2015-05-06 12:58:27 -04:00
Dmitriy Zaporozhets 40c3675372 Merge branch 'clear-note-form-on-succcess' into 'master' 
Prevent note form from being cleared when submitting failed.

When you try to submit a comment while you're not connected to the internet or while your connection is having trouble, the AJAX request would fail and the note would be deleted 😢

See merge request !468
 2015-03-29 10:58:34 +00:00
Douwe Maan 7a70fb123c Prevent holding Control-Enter or Command-Enter from posting comment multiple times. 2015-03-27 16:55:18 +01:00
Douwe Maan 351e61f4b2 Prevent note form from being cleared when submitting failed. 2015-03-27 12:52:07 +01:00
Dmitriy Zaporozhets 1f711fd93d Remove upvotes js logic since it does not work as expected anyway 2015-03-20 12:34:21 -07:00
Douwe Maan ab401a6132 Remove note attachment file selector. 2015-02-17 22:23:31 +01:00
Dmitriy Zaporozhets 0da0d800f2 Merge branch 'md-preview-class' into 'master' 
Make sure Markdown previews always use the same styling as the eventual destination.

Font size, image width and code-block styling weren't accurate between the markdown preview and the issue/wiki/note body.

See merge request !1514
 2015-02-17 20:38:53 +00:00
Douwe Maan 080449f8af Make sure Markdown previews always use the same styling as the eventual destination. 2015-02-17 17:58:08 +01:00
Douwe Maan 29a997cde9 Properly clear notes bindings to prevent double comments on Ctrl-Enter. 2015-02-16 18:25:57 +01:00
Douwe Maan d909ae73dc Actually submit comment on command-enter. 
Resolves #1869.
 2015-02-11 12:21:11 +01:00
Douwe Maan 463d9f76e4 Autosave and autorestore unsaved comments. 
Closes #1738.
 2015-02-07 20:55:17 +01:00
Douwe Maan 71668312c4 Submit comment on command-enter. 
Fixes #1869.
 2015-02-05 21:56:25 +01:00
Stefan Tatschner bf079c24af Replace highlight.js with rouge-fork rugments 
I decided to create a fork of rouge as rouge lacks a HTML formatter with
the required options such as wrapping a line with <span> tags.
Furthermore I was not really convinced about the clarity of rouge's
source code.

Rugments 1.0.0beta3 for now only includes some basic linting and a new
HTML formatter. Everything else should behave the same.
 2015-01-15 13:41:11 +01:00
Dmitriy Zaporozhets 23498337b1 Clone comment form on edit. Fixes bug with disappearing textarea or cancel of edit 2015-01-14 23:09:30 -08:00
Dmitriy Zaporozhets 4babc50eb7 Huge set of fixes for comments logic 2015-01-14 22:42:58 -08:00
Dmitriy Zaporozhets 80e784edb8 Fix image drag-n-drop to diff comments 2015-01-14 21:43:31 -08:00
Dmitriy Zaporozhets 8045d96ea8 Fix diff comments 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-24 13:39:35 +02:00
Vinnie Okada 742e6eeed2 Merge branch 'upstream-master' into markdown-preview 
Conflicts:
	spec/routing/project_routing_spec.rb
 2014-12-07 20:25:58 -07:00
Ciro Santilli c0c8dccf2e Export all coffee classes with @ 2014-10-20 23:03:33 +02:00
Vinnie Okada 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
Jacob Vosmaer 693cee89f9 Prevent notes polling when there are not notes 2014-09-29 17:32:56 +02:00
Marin Jankovski dac5e6de5a After comment is added, button should go back to Close button. 2014-09-08 14:07:31 +02:00
Dmitriy Zaporozhets 99425a124c Post comment when hit close/reopen btn in comment form 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-09-01 15:37:53 +03:00
Dmitriy Zaporozhets 20dbc2a139 Merge pull request #7425 from Razer6/remove_dup_javascript 
Remove duplicated setupNoteForm method
 2014-09-01 14:03:10 +03:00
Robert Schilling 15c682fcb0 Disable 'Save changes' button if input is empty, fixes #6351 2014-08-04 20:29:17 +02:00