d32de82196
Merge branch '33483-fix-note-highlight-being-lost-on-note-update' into 'master'
...
Fix note highlight being lost after real time update
Closes #33483
See merge request !12098
2017-06-15 07:46:43 +00:00
4182e3fa63
Fix autocomplete not working on note edit form
...
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/33529
Bug introduced in
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/11278
2017-06-14 11:55:34 -05:00
82181f6c0a
Fix note highlight being lost after real time update
...
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/33483
2017-06-14 11:32:12 -05:00
7113b1a45b
Merge branch 'cherry-pick-dc2ac993' into 'security-9-2'
...
Escapes html content before appending it to the DOM
See merge request !2107
2017-06-08 09:48:10 -07:00
7abe27b425
Improve user experience around slash commands in instant comments
2017-06-05 09:12:15 +00:00
60ceffe479
Merge branch 'fix-up-notes-technical-debt' into 'master'
...
Fix up some notes.js tech debt
See merge request !11283
2017-05-29 13:19:06 +00:00
41b47965a7
More consistent padding of notes, system notes, and note form
2017-05-26 19:01:42 +00:00
20bd76da27
Fix up some notes tech debt
...
Fix up tech debt comments from @jschatz1
- https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/10837#note_28757436
- https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/10837#note_28757905
- https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/10837#note_28757952
- https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/10837#note_28758013
2017-05-26 11:36:49 -05:00
6cc8a376bb
Merge branch 'fix-weird-jquery-data-attribute-caching-issue-in-notes' into 'master'
...
Fix jQuery data attribute caching issue causing expanding issues
Closes #32705
See merge request !11609
2017-05-22 18:08:38 +00:00
5563bf9ce6
Fix jQuery data attribute caching issue casuing expanding issues
...
Command | Result
$link.data('lineType') | ''
$link.data('line-type') | ''
$link.attr('data-line-type') | 'new'
$link[0].dataset.lineType | 'new'
2017-05-22 11:10:01 -05:00
b261fb7b33
Merge branch 'adopt-es-module-syntax' into 'master'
...
Adopt ES module syntax
See merge request !9567
2017-05-22 16:07:43 +00:00
682cfbb4dc
Fix system note comparison and standardize note setup
...
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/32551
2017-05-19 09:50:59 -05:00
4b9c952d35
Fix ability to edit diff notes multiple times
2017-05-18 18:05:01 +00:00
4d2d2b1179
Merge branch '32424-fix-linking-to-unresolved-expanded-diff-note' into 'master'
...
Fix linking to unresolved/expanded diff note
Closes #32424
See merge request !11458
2017-05-18 14:13:37 +00:00
010e1dacab
Merge branch '32449-fix-note-comparison-trailing-newline-edge-case' into 'master'
...
Fix note flicker with note you can't edit and trailing new line edge case
Closes #32449
See merge request !11472
2017-05-18 09:39:29 +00:00
f21a315590
Fix missing .original-note-content and trailing new line edge case
...
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/32449
2017-05-18 03:23:16 -05:00
1e0c6439ff
Disable reference prefixes in notes for Snippets
2017-05-18 08:10:59 +00:00
027ad1381e
Fix linking to unresolved/expanded diff note
...
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/32424
Bug introduced in
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/11327
2017-05-17 23:30:13 -05:00
5bd549187a
update remaining uses of CJS syntax to ES module syntax
2017-05-16 15:52:40 -05:00
b8b6de4c75
Make `gfm_auto_complete` into a module and fix up tech debt
2017-05-16 18:42:06 +00:00
1a24a6704f
Merge branch '32125-fix-link-to-note-in-diff' into 'master'
...
Fix linking to resolved note in diff
Closes #32125
See merge request !11327
2017-05-16 09:22:52 +00:00
3599d9ab90
Merge branch '24373-warning-message-go-away' into 'master'
...
Notes warning message should go away once resolved
Closes #24373
See merge request !10823
2017-05-16 09:01:59 +00:00
1fe6beae47
Notes: Warning message should go away once resolved
...
Flash error messages disappear(`fadeOut`) automatically after any successful request
2017-05-15 22:26:52 +02:00
55294ce60a
Improve slash command stripping, escape temporary note contents
2017-05-15 15:07:43 +00:00
16da7f2365
Fix linking to resolved note in diff
...
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/32125
2017-05-12 17:48:29 -05:00
d567b6474a
31886 Remove spinner from loading comment
2017-05-12 10:08:50 -07:00
5c25629a14
Fix slash commands detection in comments
2017-05-11 09:05:07 +00:00
ff5bd7a9e8
Merge branch 'remove-needless-bind-polyfills' into 'master'
...
Remove needless bind and indexOf polyfills
See merge request !11187
2017-05-09 17:38:05 +00:00
19c4aec32d
Merge branch 'up-arrow-focus-discussion-comment' into 'master'
...
Fixed UP arrow key not editing last comment in discussion
Closes #31348
See merge request !11173
2017-05-09 09:08:03 +00:00
0151325dac
Merge request widget redesign
2017-05-09 04:15:34 +00:00
8d865f62b7
remove bind polyfill from notes.js
2017-05-08 17:40:18 -05:00
ee01ebd9e4
Fixed UP arrow key not editing last comment in discussion
...
Closes #31348
2017-05-08 14:31:11 +01:00
b801f414aa
Fix Karma failures for jQuery deferreds
2017-05-05 21:41:55 +00:00
645593e5af
Add instant comments support
2017-05-05 10:57:29 +00:00
cf34b07e80
Add real-time note edits 🐿️
2017-05-03 17:41:16 +00:00
0fc1e04f4c
Add renderNote animation and added spec
2017-04-19 19:48:48 +00:00
c8cea68fe0
alfredo review changes
2017-04-07 22:21:21 +01:00
06e7de40a5
Review changes
2017-04-07 19:37:12 +01:00
d80f903673
Fix creating discussion when diff view is set to parallel
2017-04-07 11:12:43 -05:00
99918be731
Added variable button fix
2017-04-07 15:31:14 +01:00
18e2388de1
Fixed issue button state bug
2017-04-07 14:09:15 +01:00
907b754173
Fixed bugs and added tests
2017-04-07 02:50:10 +01:00
99e4431c68
Update unit tests
2017-04-06 14:48:36 +01:00
2a18425e97
phil review changes
2017-04-06 13:04:57 +01:00
a9186d07e9
Fixed close button text
2017-04-06 10:28:25 +01:00
5200686bd9
Disable submit button and dropdown when submitt comment form
2017-04-06 01:31:44 -05:00
d9dedac858
Be more specific with selector
2017-04-05 23:40:19 -05:00
b47b6abfdb
Fix squared buttons by removing not needed CSS classes
...
Also removes dropdown HTML where is not needed.
2017-04-05 23:01:43 -05:00
4d70fc5810
Do not initialize comment type toggle if form is not available
...
This is for when user has not logged in
2017-04-05 23:01:43 -05:00
0085592670
Move CommentTypeToggle use from gl_form to notes
2017-04-05 18:46:53 +01:00
5e3fa02553
Added resolvable discussion frontend
2017-04-05 18:34:13 +01:00
afa53810de
Fix specs
2017-04-05 17:44:14 +01:00
fe26b8af94
Correctly display multiple separate discussions on the same diff line
2017-04-05 17:44:14 +01:00
bb8cc94668
Don't use original_discussion_id
2017-04-05 17:44:14 +01:00
76aa0bedd7
Fix field name
2017-04-05 17:44:14 +01:00
9c30b0e918
Fix some specs
2017-04-05 17:44:14 +01:00
08bbb9fce6
Add option to start a new discussion on an MR
2017-04-05 17:44:14 +01:00
5f7c0bd7b7
remove Cookies class from global space
2017-03-22 03:07:27 -05:00
cd0825f612
Get view type based on diff_view Cookie
...
This is because we need to persist the same view type across tabs
2017-03-08 14:19:21 -05:00
1466b7eecc
Added discussion comments avatars to diff
2017-03-08 16:07:26 +00:00
0a31efb577
Remove query parameters from notes polling endpoint to make caching easier
2017-03-01 16:34:28 +01:00
9f949d4e24
add /award slash command
...
add /award slash command; Allow posting of just an emoji in comment
2017-02-28 22:38:19 +02:00
0f31c5a92b
replace implicit this == window with explicit binding
2017-02-17 16:58:32 -06:00
8a928af0fc
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into task_list_refactor
2017-02-16 13:10:32 +11:00
0fe942c671
allow clicking on text or icon to trigger expand
2017-02-15 16:39:18 -05:00
7b69580e1d
style links on system notes to look clickable
2017-02-15 16:39:18 -05:00
3f713db0da
update correct field for Notes - it's called note not description
2017-02-15 16:53:17 +11:00
6059fdef5e
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into task_list_refactor
2017-02-14 06:05:58 +11:00
f9c58d9388
Refactored diff notes Vue app
...
It now relies on its Vue bundle rather than the window. Fixes some reactivity issues that was happening in EE
2017-02-09 15:54:19 +00:00
766d011b46
notes use new task_list, and PATCH instead of POST
...
use data attribute for submit url
optional onSuccess
2017-02-08 20:23:45 +11:00
97ecae00a6
switch notes to use task_list, but keep its update function for now
2017-02-08 17:04:00 +11:00
5fcbe12730
Merge branch 'master' into go-go-gadget-webpack
...
* master: (83 commits)
Fix small typo on new branch button spec
Abillity to promote project labels to group labels
Update and pin the `jwt` gem to ~> 1.5.6
refactor merge request build service
Update index.md
Clarify that Auto Deploy requires a public project.
cop for gem fetched from a git source
Add CHANGELOG entry
Remove new branch button for confidential issues
Remove flash warning from login page
add complete changelog
Add project ID index to `project_authorizations` table to optimize queries
Fix disable storing of sensitive information when importing a new repo
Fix notification when global=disabled, group=watch
Ensure rake is called within the correct bundle context
Fix 8.16.0 release date.
Improve search within group logic
Add changelog item about new attributes in group api
Update group api doc with full_name and full_path attributes
Add tests for nested groups in search service and search helper
...
2017-01-31 14:38:45 -06:00
86dcde3120
Merge branch '26282-autosize-js-memory-leak' into 'master'
...
Resolve "ba-resize memory leak"
Closes #26282
See merge request !8412
2017-01-30 21:12:34 +00:00
69e4072f89
Merge branch 'master' into go-go-gadget-webpack
...
* master: (389 commits)
Document "No gems fetched from git repositories" policy [ci skip]
Typos
Small gramatical tweaks
Typos
Added PHP & NPM doc
Use `:empty_project` where possible in request specs
Add caching of droplab ajax requests
Use `:empty_project` where possible in model specs
Revert 3f17f29a
2017-01-27 19:33:58 -06:00
f0b7e5708c
Flag multiple empty lines in eslint, fix offenses.
2017-01-24 16:48:06 -05:00
fed94dceaf
remove ba-resize
...
refactor js-autosize code now that ba-resize is gone
Added specs
2017-01-20 20:42:49 +00:00
4616617dd7
Merge branch 'simple-eslint-fixes' into 'master'
...
Simple eslint fixes
See merge request !8536
2017-01-19 16:01:26 +00:00
0d2ae3e7c1
Merge branch 'master' into go-go-gadget-webpack
...
* master: (67 commits)
Add some API endpoints for time tracking.
use destructuring syntax instead
add changelog yml file
correct User_agent placement in robots.txt
Fixing typo
Fix Project#update_repository_size to convert MB to Bytes properly
Remove repository trait from factories that don't need it in features
Add the `:repository` trait to `:project` factories in Cucumber steps
Add a `:repository` trait to the `:empty_project` factory
Update clipboard_button text: Copy commit SHA to clipboard
Fix search bar filter dropdown scrollbars
get rid of log
fix UI behaviour - only make new calls when button is clicked and dropdown is not displayed
better UI fix - simple solution
Disable all cops in .rubocop_todo.yml
fix spec
refactored a bunch of stuff based on feedback
fix serializer
fix bug retrieving medians
fix specs
...
2017-01-18 22:23:53 -06:00
588d7e8ae0
resolve all parseInt radix eslint violations
2017-01-18 17:18:40 -06:00
04eff5fdb0
resolve all x-spacing and no-spaced-x eslint violations
2017-01-18 17:18:40 -06:00
96931b1748
resolve all indent eslint violations
2017-01-18 17:16:41 -06:00
ccada28f30
resolve all padded-blocks eslint violations
2017-01-18 17:16:41 -06:00
e7b5945c59
resolve all semi and no-extra-semi eslint violations
2017-01-18 17:15:27 -06:00
639bca4362
Merge branch 'master' into go-go-gadget-webpack
2017-01-13 10:30:40 -05:00
557a0bf14c
Address MR comments
2017-01-13 09:16:35 -05:00
aa934c7469
refresh merge widget after using /merge command
2017-01-11 08:48:07 -05:00
fe964cc235
migrate all javascript asset bundles and require syntax
2017-01-10 12:30:38 -06:00
cb537324a3
Fixed edit form authenticity_token call failing the tests
2017-01-06 10:33:06 +00:00
36412ee2c2
Fix review comments.
2017-01-05 00:44:00 +03:00
09fc4f557b
Review fixes.
2017-01-04 23:37:54 +03:00
9ae7e99a09
Use gl.utils.isInViewport and improve gl.utils.animateToElement.
2017-01-04 23:37:54 +03:00
32fe9ad24e
Hide edit warning element when form reverted.
2017-01-04 23:37:54 +03:00
183a52f8e1
Fix single note edit form specs.
2017-01-04 23:37:54 +03:00
0143573dd5
Separate edit form in Changes and Discussions tab.
...
if we are in the Merge Requests page, this change will clone existing note-edit-form and add a mr-discussion-edit-form class to cloned element so we will have two note-edit-form in place. One for Discussions tab one for Changes tab.
For MR page, we basically need two note-edit-form because you may want to edit your comment in both tabs at the same time and we shouldn't remove or discard note-edit-form in other tab.
2017-01-04 23:37:54 +03:00
18165f9785
Fix task list for single edit note widget changes.
2017-01-04 23:37:54 +03:00
3e779f07b2
Fix single comment edit form issues.
2017-01-04 23:37:54 +03:00
1100320b0c
Refactor discussion edit widget to have only one at a time.
2017-01-04 23:37:54 +03:00
4d1f583712
Merge branch 'katex-math' into 'master'
...
Render math in Asciidoc and Markdown with KaTeX using code blocks
Closes #13690 and #13180
See merge request !8003
2016-12-15 14:11:38 +00:00
2d170a20dc
Render math in Asciidoc and Markdown with KaTeX using code blocks
2016-12-14 16:50:54 +00:00
8e0e902b13
resolve all instances of no-undef eslint rule violations
2016-12-14 02:11:13 -06:00
Phil Hughes
Eric Eastwood
DJ Mountney
Kushal Pandya
Fatih Acet
Douwe Maan
Filipa Lacerda
Sam Rose
Mike Greiling
Jacopo
tauriedavis
Luke "Jared" Bennett
Douwe Maan
Alfredo Sumaran
Adam Niedzielski
mhasbini
Simon Knox
Bryce Johnson
Jarka Kadlecova
Jarka Kadlecova
Sean McGivern
Munken