Commit Graph

8 Commits

Author SHA1 Message Date
Kushal Pandya 5dc56f83b3 Merge branch 'winh-dequarantine-labels-autocomplete' into 'master'
Move gfm_autocomplete_spec.rb out of quarantine

Closes #57995 and #56843

See merge request gitlab-org/gitlab-ce!25958
2019-03-20 08:49:06 +00:00
Mike Greiling 7f3719f328 Prefer node_modules At.js and jquery.carat versions
Remove references to the vendored copies of At.js and jquery.carat
as well as the legacy rails wrapper gem.
2019-03-13 14:02:19 +00:00
Winnie Hellmann af3307f7b4 Add getJSONFixture() helper to Jest 2019-03-11 14:55:18 +01:00
Winnie Hellmann aeffdd2acd Increase timeout for gfm_auto_complete_spec.js 2019-03-11 11:30:19 +01:00
Phil Hughes 9ff9047402 Merge branch 'winh-dequarantine-labels-autocomplete' into 'master'
Move gfm_autocomplete_spec.rb out of quarantine

Closes #57995 and #56843

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

(cherry picked from commit 2dcbc0fa56)
2019-03-11 11:20:27 +01:00
Winnie Hellmann 55f76ce8f6 Revert "Merge branch 'winh-dequarantine-labels-autocomplete' into 'master'"
This reverts merge request !25542
2019-03-05 11:02:00 +00:00
Winnie Hellmann f524dff3e9 Add tests for labels dropdown to gfm_auto_complete_spec.js 2019-02-27 09:08:41 +01:00
Winnie Hellmann f3006b6a1e Move gfm_auto_complete_spec.js to Jest 2019-02-21 14:26:27 +01:00