Commit Graph

207 Commits

Author SHA1 Message Date
Phil Hughes b20381204a
karma spec updates 2017-11-01 09:26:16 +00:00
Tim Zallmann 980f29716f Resolve "Convert autosize.js library to be a Yarn managed library" 2017-10-31 09:18:30 +00:00
Filipa Lacerda 6d7384f595 Merge branch 'es-module-autosave' into 'master'
Remove Autosave class from global namespace

See merge request gitlab-org/gitlab-ce!14856
2017-10-30 02:01:38 +00:00
Filipa Lacerda 1ab8aeeefd
Moves placeholders components into shared folder with documentation. Makes them easier to reuse in MR and Snippets comments 2017-10-19 10:39:47 +01:00
Mike Greiling b0c2772a90
convert Autosave into pure es module and remove global export 2017-10-12 11:31:29 -05:00
Phil Hughes fa2af5e0f5
Flash is now a ES6 module
Reduced the technical debt around our JS flash function by making it a
module that is imported rather than relying on the global function.
The global function still exists mainly for technical debt with how
some requests are being completed, but new JS should import the module
directly.

Also reduces some tech debt in the file by removing the need for jQuery.
Instead Flash is now 100% vanilla JS.
2017-10-10 10:14:22 +01:00
Sean McGivern a68a39e341 Merge branch '18608-lock-issues-v2' into 'master'
Resolve "Lock issue and merge request"

Closes #18608

See merge request gitlab-org/gitlab-ce!14531
2017-10-06 16:47:27 +00:00
Fatih Acet 4d0dea7bc1 Disable comment textarea while submitting a new comment. 2017-10-03 15:06:37 +03:00
Jarka Kadlecova c488bcd13e Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into 18608-lock-issues-v2
# Conflicts:
#	db/schema.rb
2017-10-03 09:37:48 +02:00
Mark Fletcher 3197f415c8 Fix comment deletion confirmation dialog typo 2017-10-02 16:42:35 +07:00
Luke "Jared" Bennett 59a6f15cd2
Further review changes 2017-10-02 10:34:40 +01:00
Luke "Jared" Bennett 00ee7a9f27
FE review changes app code 2017-10-01 16:45:48 +01:00
Luke "Jared" Bennett fe96bd416c
Fix md-area top border-radius with issue issuable-note-warning 2017-09-29 18:31:09 +01:00
Luke "Jared" Bennett a510d9bdfb
Correct disabled note form style 2017-09-27 15:46:09 +01:00
Luke "Jared" Bennett 1ae29851d0
Fix karma 2017-09-27 14:17:15 +01:00
Luke "Jared" Bennett 362bd88471
Fix static analysis 2017-09-27 13:35:31 +01:00
Jarka Kadlecova 360c147057 Disable comment form when discussion locked for user 2017-09-26 08:42:33 +02:00
Jarka Kadlecova 142bbd900b Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into 18608-lock-issues
# Conflicts:
#	app/assets/javascripts/notes/components/issue_comment_form.vue
2017-09-25 18:48:58 +02:00
Tim Zallmann 55f772bb98 Resolve "Better SVG Usage in the Frontend" 2017-09-22 08:39:47 +00:00
Jacob Schatz 9e46a897f2 Merge branch 'acet-fix-double-note-render' into 'master'
Fix rendering double note issue

Closes #38139

See merge request gitlab-org/gitlab-ce!14429
2017-09-22 02:25:43 +00:00
Fatih Acet f22f75b752 Fix rendering double note issue. 2017-09-22 04:04:52 +03:00
Fatih Acet 66da536a06 IssueNotes: Switch back to Write pane when note cancel or submit. 2017-09-22 02:30:14 +03:00
Jacob Schatz 137c5822ec Merge branch 'acet-fix-comment-form-resize' into 'master'
IssueNotes: Resize comment form after note submit and discard.

Closes #38115

See merge request gitlab-org/gitlab-ce!14401
2017-09-21 20:41:58 +00:00
Fatih Acet d9a3bbce61 IssueNotes: Resize comment form after note submit and discard. 2017-09-21 03:08:17 +03:00
Mike Greiling 57c97a10b0 Merge branch 'master' into 37220-es-modules
* master: (148 commits)
  Remove gaps under nav on build page
  Replace the 'project/snippets.feature' spinach test with an rspec analog
  Use correct group members path for members flyout link
  Replace the 'project/commits/revert.feature' spinach test with an rspec analog
  Merge branch 'rs-incoming-email-domain-docs' into 'security-10-0'
  Replace the 'project/archived.feature' spinach test with an rspec analog
  Fix broken link in docs/api/wiki.md
  Fixed the new sidebars width when browser has scrollbars
  Improve 'spec/features/profiles/*' specs
  Replace the 'search.feature' spinach test with an rspec analog
  dedupe yarn packages
  add dependency approvals (all MIT license)
  update build image to latest with node 8.x, yarn 1.0.2, and chrome 61
  Ensure we use `Entities::User` for non-admin `users/:id` API requests
  Minor update to address Sean McGivern's comment.
  Add data migration
  Fix setting share_with_group_lock
  created services for keys
  Prepare Repository#merge for migration to Gitaly
  Never connect to webpack-dev-server over SSL
  ...
2017-09-18 10:56:04 -05:00
Luke "Jared" Bennett 9ca7c94f66
Merge remote-tracking branch 'origin/master' into 18608-lock-issues 2017-09-18 10:54:12 +01:00
Fatih Acet 896f603f03 IssueNotes: Fix role badge styling. 2017-09-14 20:43:25 +03:00
Luke "Jared" Bennett a319418d9c
Merge FE 2017-09-14 14:10:41 +01:00
Filipa Lacerda 6a1b84c7b4 Use modules in common utils 2017-09-09 09:54:24 +01:00
Fatih Acet e5c8d2ca51 IssueNotesRefactor: Fix broken specs. 2017-08-29 02:39:07 +03:00
Fatih Acet ebf7d52d7c IssueNotesRefactor: Hide note reply form when submitted and show it again if there is an error. 2017-08-23 15:41:07 +03:00
Fatih Acet aa3ff56c60 IssueNotesRefactor: Empty textarea while submitting comment and restore content if request fails. 2017-08-23 15:41:07 +03:00
Fatih Acet 64820f9a6c IssueNotesRefactor: Show placeholder note immediately when editing.
Obviously not one of the best commits I always do.
2017-08-23 03:31:17 +03:00
Fatih Acet 46ed6cd8ca IssueNotesRefactor: Fix eslint errors. 2017-08-23 01:19:28 +03:00
Fatih Acet 0d08ba3dce IssueNotesRefactor: Fix error messages of edit/reply failure for discussions. 2017-08-23 01:10:24 +03:00
Fatih Acet 704ec994fa IssueNotesRefactor: Hide placeholders and flash messages before submitting a new note. 2017-08-22 23:45:01 +03:00
Fatih Acet d051621604 IssueNotesRefactor: Support legacy multiple notes for individual_note: true case. 2017-08-22 22:10:35 +03:00
Fatih Acet 479670df94 IssueNotesRefactor: Fix consistent typo. 2017-08-22 21:47:29 +03:00
Fatih Acet 4707c766df IssueNotesRefactor: Poll again when commands applied. 2017-08-21 22:54:05 +03:00
Fatih Acet 806c306367 IssueNotesRefactor: Fix GFM rendering after edits come in. 2017-08-21 22:16:41 +03:00
Fatih Acet 48acfb5c05 IssueNotesRefactor: Show Cmd+Enter to comment tooltip. 2017-08-21 21:48:09 +03:00
Fatih Acet adc73379f3 IssueNotesRefactor: First comment and then close the issue. 2017-08-21 21:45:28 +03:00
Fatih Acet e0d583cb73 IssueNotesRefactor: Minor naming change to improve readability. 2017-08-21 19:06:20 +03:00
Fatih Acet 0fc45b6c19 IssueNotesRefactor: Reenable button after failed submit attempt. 2017-08-21 19:05:55 +03:00
Fatih Acet 19f77cab3e IssueNotesRefactor: Fix flash container positioning. 2017-08-19 00:05:23 +03:00
Fatih Acet 7e82e45d87 IssueNotesRefactor: Prevent anon user to try to add award. 2017-08-18 19:32:39 +03:00
Fatih Acet 99be7d6e25 IssueNotesRefactor: Don’t explicitly check against undefined. 2017-08-18 19:02:21 +03:00
Fatih Acet 9d18bfa365 IssueNotesRefactor: Fix edit button and emoji dropdown for anon user. 2017-08-18 18:55:51 +03:00
Fatih Acet 70a322c5da IssueNotesRefactor: Support legacy last edited by case. 2017-08-18 18:52:17 +03:00
Fatih Acet 4e77db3962 IssueNotesRefactor: Fix discussion last updated text. 2017-08-18 18:52:17 +03:00