Commit Graph

99 Commits

Author SHA1 Message Date
Fatih Acet 059ab73b8e Render MR Notes with Vue with behind a cookie 2018-02-28 00:10:43 +00:00
Rémy Coutable 97793a1616 Harmonize CE and EE JS code
Signed-off-by: Rémy Coutable <remy@rymai.me>
2018-02-22 13:34:35 +01:00
Clement Ho 1c2d283d50 Add dispatcher imports for bundles used in merge request show path 2018-02-15 16:50:20 -06:00
Phil Hughes eaf2f48dc7
Export and use Notes ES module 2017-12-15 16:33:36 +00:00
Filipa Lacerda 3c19c971df
Merge branch 'master' into 38869-datetime
* master: (112 commits)
  small change to make less conflict with EE version
  Add cop for use of remove_column
  Resolve merge conflicts with dev.gitlab.org/master after security release
  add index for doc/administration/operations/
  Remove RubySampler#sample_objects for performance as well
  Bugfix: User can't change the access level of an access requester
  Add spec for removing issues.assignee_id
  updated imports
  Keep track of storage check timings
  Remove a header level in the new 'Automatic CE->EE merge' doc
  Improve down step of removing issues.assignee_id column
  Fix specs after removing assignee_id field
  Remove issues.assignee_id column
  Resolve conflicts in app/models/user.rb
  Fix image view mode
  Do not raise when downstream pipeline is created
  Remove the need for destroy and add a comment in the spec
  Use build instead of create in importer spec
  Simplify normalizing of paths
  Remove allocation tracking code from InfluxDB sampler for performance
  ...
2017-12-11 19:42:58 +00:00
micael.bergeron cb6f51ec9b add support for the commit reference filter 2017-12-07 09:01:37 -05:00
Douwe Maan e4eba908cd Allow commenting on individual commits inside an MR 2017-12-07 09:01:19 -05:00
Filipa Lacerda 139ce1c445
Export date utility functions as ES6 modules 2017-12-07 11:09:17 +00: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
Felipe Artur b54203f0ad Commenting on image diffs 2017-10-07 04:25:17 +00:00
winh 97e81870c3 Add missing import statements 2017-09-18 12:51:57 +02:00
Phil Hughes cdb305ce68 Fix diff comment button not showing after deleting a comment 2017-09-05 10:20:40 +00:00
Phil Hughes 554afea059
Fix race condition with dispatcher.js
The dispatcher was trying to create a new instance of a class that is loaded in a file after main.js which would cause the filtered search to not work on issues. This would only happen on the first load when the JS is not cached. If the JS is cached, then everything will be fine.
2017-08-15 16:09:36 +01:00
Simon Knox 9b9c86787a fix Jump to next discussion
Notes tab was renamed to show, was previously overridden in merge_request_tabs.js
2017-07-27 20:46:53 +10:00
Filipa Lacerda aaa78199c2 Update vue-resource 2017-07-12 14:47:09 +00:00
Bryce Johnson 81e9c28425 Render add-diff-note button with server.
This commit moves the rendering of the button back to the server, and
shows/hides it using opacity rather than display. It also removes the
transform applied to the button on hover (scale). Previously, both of these
factors automatically triggered a reflow, which creates a performance
bottleneck on pages with larger DOM size.

MR: !12103
2017-06-29 12:50:45 -04:00
Douwe Maan dbb78b36e1 Fix title of discussion jump button at top of page 2017-05-26 17:27:16 -05:00
Filipa Lacerda 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
Bryce Johnson 3c668fa04f Consolidate user avatar Vue logic 2017-05-18 16:37:48 -04:00
Mike Greiling c594ed49f9 update diff_notes_bundle to ES module syntax 2017-05-16 15:48:57 -05:00
Simon Knox ac6556ba91 prevent dropdowns from being cut-off by scrollable tab container
rerender scrollable-tab area after Resolve Discussions button is rendered
2017-05-16 11:39:15 -05:00
Eric Eastwood 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
Fatih Acet 0151325dac Merge request widget redesign 2017-05-09 04:15:34 +00:00
Kushal Pandya d586b6cced Add ES lint support to identify poorly written Promises 2017-04-20 11:11:51 +00:00
Alfredo Sumaran e8561287dc Remove IIFEs from diff_notes_bundle.js 2017-04-17 01:35:56 -05:00
Sam Rose ef443a99ee Update ResolveBtn when CommentStore changes state 2017-04-13 17:22:17 -04:00
Douwe Maan bb8cc94668
Don't use original_discussion_id 2017-04-05 17:44:14 +01:00
Mike Greiling 5f7c0bd7b7 remove Cookies class from global space 2017-03-22 03:07:27 -05:00
Mike Greiling d9dedc36c3 remove Vue from the global space 2017-03-20 22:12:01 -05:00
Phil Hughes adeafa40b8 Fixes diff comment avatar tooltip escaping issues
We are safe to use `data-html` because we never actually use HTML here, only the pure markdown

Closes #29572
2017-03-16 15:58:49 +00:00
Bob Van Landuyt 091b846ebe Renamed `.js.es6` to `.js` 2017-03-13 08:27:52 +01:00
Bob Van Landuyt 0267b83898 Delegate a single discussion to a new issue
Delegate a discussion in a merge request into a new issue.
The discussion wil be marked as resolved and a system note will be
added linking to the newly created issue.
2017-03-13 08:27:51 +01:00
Phil Hughes 1466b7eecc Added discussion comments avatars to diff 2017-03-08 16:07:26 +00:00
winniehell 572f9782d5 Remove .es6 from file extensions (!9241) 2017-03-05 21:22:40 +01:00
Mike Greiling 8ba08213a1 remove require.context from diff_notes_bundle 2017-02-20 14:29:09 -06:00
Annabel Dunstone Gray 19cb7b0a3d Remove navbar height offsets 2017-02-10 15:09:08 -06:00
Phil Hughes 88fb39c229 Uses shared vue resource interceptor 2017-02-09 15:54:19 +00:00
Phil Hughes 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
Mike Greiling 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
  Remove unused js response from refs controller
  Add MR id to changelog entry
  fixed small mini pipeline graph line glitch
  Prevent form to be submitted twice
  Fix Error 500 when repositories contain annotated tags pointing to blobs
  Fix /explore sorting (trending)
  Simplify wording in "adding an image" docs
  Remove "official merge window" from CONTRIBUTING.md [ci skip]
  Update repository check documentation
  Fixed flexbox and wrap issues
  Update two_factor_authentication.md
  ...
2017-01-27 19:33:58 -06:00
Fatih Acet 4616617dd7 Merge branch 'simple-eslint-fixes' into 'master'
Simple eslint fixes

See merge request !8536
2017-01-19 16:01:26 +00:00
Mike Greiling 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
Mike Greiling 83ecc02daa resolve all prefer-const eslint violations 2017-01-18 20:33:02 -06:00
Mike Greiling 96931b1748 resolve all indent eslint violations 2017-01-18 17:16:41 -06:00
Mike Greiling e7b5945c59 resolve all semi and no-extra-semi eslint violations 2017-01-18 17:15:27 -06:00
Mike Greiling 9e4d04913a resolve all no-plusplus eslint violations 2017-01-18 17:15:27 -06:00
Bryce Johnson 64dd41a0e2 Backport timetracking frontend to CE. 2017-01-15 11:10:04 -05:00
Mike Greiling fe964cc235 migrate all javascript asset bundles and require syntax 2017-01-10 12:30:38 -06:00
Fatih Acet 12b6fdb194 Merge branch '25957-marking-a-diff-discussion-as-resolved-doesn-t-update-tooltips' into 'master'
Defer tooltip update on Resolve Comment button after DOM cycle

Closes #25957

See merge request !8335
2016-12-28 18:49:19 +00:00
Sam Rose 33251af3ab Defer tooltip update on Resolve Comment button after DOM cycle 2016-12-28 12:05:03 -05:00
Alfredo Sumaran ac3789d29f Merge branch 'fix-non-iife-classes' into 'master'
Ensure javascript classes declared outside an IIFE are properties of window

See merge request !8080
2016-12-28 16:43:55 +00:00