root
/
gitlab-ce
mirror of https://gitlab.com/free-releases/gitlab-ce.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity
67,112 Commits 9,131 Branches 1,640 Tags 2 GiB
Commit Graph

66 Commits

Author SHA1 Message Date
Phil Hughes ff0f74ac6e
Tidy up main JS file 2018-01-10 11:07:42 +00: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
Phil Hughes e0bbadc2d2
use exported methods instead of gl.utils 2017-12-08 08:54:51 +00:00
Filipa Lacerda 139ce1c445
Export date utility functions as ES6 modules 2017-12-07 11:09:17 +00:00
Phil Hughes ffd7fbf53b
moved to es6 modules 2017-11-22 18:51:06 +00:00
Vitaliy @blackst0ne Klachkov 131e74d10d Add support of Mermaid 2017-11-22 14:12:04 +11:00
Filipa Lacerda 46dc343f60 Merge branch '38677-render-new-discussions-on-diff-tab' into 'master' 
Added discussion_line_code value to note response and use it to query the right…

Closes #38677

See merge request gitlab-org/gitlab-ce!14981
 2017-11-06 09:55:02 +00:00
Tim Zallmann 980f29716f Resolve "Convert autosize.js library to be a Yarn managed library" 2017-10-31 09:18:30 +00:00
Luke "Jared" Bennett 2f130527c0
FE review changes - remove internal details assertion and look for closest form if no discussion_line_code 2017-10-27 20:43:04 +01:00
Luke "Jared" Bennett b5079721bf
Add spec for root diff discussion note 2017-10-24 22:48:55 +01:00
Luke "Jared" Bennett 1ae013dad5
Fix karma 2017-10-23 14:37:32 +01:00
Ben Boeckel 1d30e5e964 notes.js: use the original content when resetting the form 
Otherwise, when an error occurred, the content was escaped and
re-escaped on every error.

Fixes #37724
 2017-10-19 13:31:51 -04:00
Clement Ho c194f22814 Merge branch '38871-cleanup-data-page-attribute-after-karma-test' into 'master' 
Cleanup data-page attribute after each Karma test

Closes #38871

See merge request gitlab-org/gitlab-ce!14742
 2017-10-11 17:37:20 +00:00
Eric Eastwood 03cd536b54 Cleanup data-page attribute after each Karma test 
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/38871
 2017-10-11 11:02:55 -05:00
Phil Hughes 556ef5ed9f
spec fixes 2017-10-11 08:41:33 +01:00
Phil Hughes cbfc97b112
karma spec fixes 2017-10-10 10:14:23 +01:00
Jacob Schatz 941a2d2737 Merge branch 'fix-comment-reflection' into 'security-9-5' 
Fix Live Comment XSS Vulnerability

See merge request gitlab/gitlabhq!2183
 2017-09-07 20:22:16 -04:00
Filipa Lacerda e81dd24251 Fix broken notes spec 2017-08-11 19:54:57 +01:00
Filipa Lacerda 106f0df394 Fix broken spec for issuable shortcuts and notes 2017-08-11 00:13:12 +01:00
Filipa Lacerda 2faf28fe1c Remove forgotten fdescribe 2017-08-10 17:30:59 +01:00
Filipa Lacerda d323bb79eb Change fixtures of old tests 2017-08-10 16:48:22 +01:00
Kushal Pandya 9e3ef082be Remove placeholder note when award emoji slash command is applied 2017-06-30 14:10:09 +00:00
Eric Eastwood 19e12aac02 Fix note highlight being added to new notes 
Always use a explicit true/false value to set highlight because jQuery
assumes `null` means toggle from whatever state and doesn't force false.

Regressed in
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12098
 2017-06-19 18:52:19 -05:00
Sean McGivern 352a9ed562 Merge branch '27070-rename-slash-commands-to-quick-actions' into 'master' 
Rename "Slash commands" to "Quick actions"

Closes #27070

See merge request !11811
 2017-06-16 16:32:53 +00:00
Eric Eastwood ea090291bb Rename "Slash commands" to "Quick actions" 
Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/27070

Deprecate "chat commands" in favor of "slash commands"

We looked for things like:

 - `slash commmand`
 - `slash_command`
 - `slash-command`
 - `SlashCommand`
 2017-06-15 09:01:56 -05:00
Phil Hughes 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
Eric Eastwood 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
Eric Eastwood 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
DJ Mountney 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
Kushal Pandya 7abe27b425 Improve user experience around slash commands in instant comments 2017-06-05 09:12:15 +00:00
Filipa Lacerda bfa46a9eab Merge branch 'task-list-2' into 'master' 
Update task_list to version 2.0.0

Closes #22470

See merge request !11525
 2017-05-31 16:35:54 +00:00
Eric Eastwood 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
Jared Deckard aaffc17882 Use native change event in the spec to trigger addEventListener 2017-05-23 08:29:09 -05:00
Eric Eastwood 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
Kushal Pandya 4b9c952d35 Fix ability to edit diff notes multiple times 2017-05-18 18:05:01 +00:00
Eric Eastwood 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
Phil Hughes 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
Jacopo 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
Kushal Pandya 55294ce60a Improve slash command stripping, escape temporary note contents 2017-05-15 15:07:43 +00:00
Kushal Pandya 5c25629a14 Fix slash commands detection in comments 2017-05-11 09:05:07 +00:00
Kushal Pandya b801f414aa Fix Karma failures for jQuery deferreds 2017-05-05 21:41:55 +00:00
Kushal Pandya 645593e5af Add instant comments support 2017-05-05 10:57:29 +00:00
Eric Eastwood cf34b07e80 Add real-time note edits 🐿️ 2017-05-03 17:41:16 +00:00
Luke "Jared" Bennett 0fc1e04f4c Add renderNote animation and added spec 2017-04-19 19:48:48 +00:00
Mike Greiling c74b7eb271 fix overlooked window binding in spec files 2017-02-17 17:02:14 -06:00
Simon Knox ced971b12a code style and test fixes 
fix test following https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9172
 2017-02-14 13:52:20 +11:00
Simon Knox 2084555a08 update karma test to expect ajax instead of POST 2017-02-09 01:12:12 +11: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
Mike Greiling ccada28f30 resolve all padded-blocks eslint violations 2017-01-18 17:16:41 -06:00