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
92,237 Commits 9,131 Branches 1,640 Tags 2 GiB
Commit Graph

90 Commits

Author SHA1 Message Date
Winnie Hellmann 4cbca33862 Increase timeout for notes_spec.js 2019-04-11 15:08:53 +02:00
Winnie Hellmann ad985a7a28 Merge branch 'winh-remove-sushi' into 'master' 
Remove .raw from JavaScript fixture file names

Closes #59201

See merge request gitlab-org/gitlab-ce!26430

(cherry picked from commit 79a45f7f02)
 2019-03-26 16:03:28 +00:00
Filipa Lacerda 022968764c Revert "Merge branch 'winh-remove-sushi' into 'master'" 
This reverts merge request !26430
 2019-03-22 11:03:15 +00:00
Winnie Hellmann 3e9bb4ad31 Remove .raw from JavaScript fixture file names 
There is nothing more to say but

"Commits that change 30 or more lines across at least three files
must describe these changes in the commit body"
 2019-03-21 17:16:53 +01:00
Fatih Acet 6243c04e20
Fix failing specs and lint errors. 2019-01-30 23:18:16 +01:00
Mike Greiling f666026d71
Prettify all spec files 2018-10-17 11:18:17 -05:00
Johann Hubert Sonntagbauer 6f5723a169 enable jasmine/new-line-before-expect 2018-10-17 06:57:29 +02:00
Johann Hubert Sonntagbauer db4c1f665f enable jasmine/prefer-jasmine-matcher 2018-10-09 20:30:03 +02:00
Felipe Artur 3e66795ef1 Changes tab VUE refactoring 2018-06-21 12:22:40 +00:00
Lukas Eipert 0e6441164f
remove all unused eslint-disable rules 2018-06-20 14:28:28 +02:00
Clement Ho 26fcf83308 Resolve "Placeholder note renders the user name in a new line" 2018-06-14 17:35:15 +00:00
Clement Ho 56982fcf24 Merge branch 'master' into bootstrap4 2018-04-25 10:51:53 -05:00
Mike Greiling 704e866134
fix more instances of "import *" with spyOnDependency 2018-04-23 00:54:20 -05:00
Clement Ho 9bcf8f43c6 [skip ci] Replace hidden-xs 2018-04-09 16:50:40 -05:00
Winnie Hellmann 64572b5349 Cleanup test for disabling comment submit button 2018-03-22 14:48:03 +01:00
Jacob Schatz e1213ff6ae Adds tests 2018-03-21 15:45:23 -04:00
Mike Greiling c1708514f5
move render_gfm into behaviors directory 2018-03-19 23:07:46 -05:00
Mike Greiling f248be7257
require jQuery to be explicitly imported 2018-03-09 15:18:09 -06:00
Fatih Acet 059ab73b8e Render MR Notes with Vue with behind a cookie 2018-02-28 00:10:43 +00:00
Phil Hughes 10cc5d1a80
fixed task list spec 2018-02-05 09:41:46 +00:00
Phil Hughes 663681f719
fixed notes_spec.js 2018-02-05 09:41:45 +00:00
Phil Hughes 004158066d
fixed failing karma specs caused by TaskList 2018-02-05 09:41:44 +00:00
Phil Hughes b1c8b3aadb
fixed axios mock not being restored 2018-02-01 11:59:59 +00:00
Phil Hughes 988747df49
fixed notes_spec.js 2018-02-01 09:07:16 +00:00
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