diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-05-29 12:10:46 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-05-29 12:10:46 +0300 |
| commit | acb7721fe807a75860f4be0a3bb50146232fa229 (patch) | |
| tree | e4d5d3eaf5102b6ac9770bc42d44a058143a8d47 /app/assets | |
| parent | ac584d6b086691ad6b496c082a80bc78b8f08a22 (diff) | |
| parent | bd12ca5eb3c8b6ca9de28cbbb074ff1e29c661f2 (diff) | |
Merge branch 'rs-teaspoon' into 'master'
Add Teaspoon for Javascript testing
Looking to expand our Javascript unit tests, and this gem makes things a bit better in that respect.
See https://github.com/modeset/teaspoon
See merge request !715
Diffstat (limited to 'app/assets')
| -rw-r--r-- | app/assets/javascripts/issue.js.coffee | 1 | ||||
| -rw-r--r-- | app/assets/javascripts/merge_request.js.coffee | 3 | ||||
| -rw-r--r-- | app/assets/javascripts/notes.js.coffee | 2 | ||||
| -rw-r--r-- | app/assets/javascripts/shortcuts_issuable.coffee | 2 | ||||
| -rw-r--r-- | app/assets/javascripts/stat_graph_contributors.js.coffee | 1 |
5 files changed, 1 insertions, 8 deletions
diff --git a/app/assets/javascripts/issue.js.coffee b/app/assets/javascripts/issue.js.coffee index 86ad3d03bac..74d6b80be5e 100644 --- a/app/assets/javascripts/issue.js.coffee +++ b/app/assets/javascripts/issue.js.coffee @@ -1,4 +1,3 @@ -#= require jquery #= require jquery.waitforimages #= require task_list diff --git a/app/assets/javascripts/merge_request.js.coffee b/app/assets/javascripts/merge_request.js.coffee index a5a2caf1263..19967ebb2e5 100644 --- a/app/assets/javascripts/merge_request.js.coffee +++ b/app/assets/javascripts/merge_request.js.coffee @@ -1,5 +1,4 @@ -#= require jquery -#= require bootstrap +#= require jquery.waitforimages #= require task_list class @MergeRequest diff --git a/app/assets/javascripts/notes.js.coffee b/app/assets/javascripts/notes.js.coffee index f186fec2a0c..b9bd5c730bf 100644 --- a/app/assets/javascripts/notes.js.coffee +++ b/app/assets/javascripts/notes.js.coffee @@ -1,6 +1,4 @@ -#= require jquery #= require autosave -#= require bootstrap #= require dropzone #= require dropzone_input #= require gfm_auto_complete diff --git a/app/assets/javascripts/shortcuts_issuable.coffee b/app/assets/javascripts/shortcuts_issuable.coffee index 6b534f29218..bb532194682 100644 --- a/app/assets/javascripts/shortcuts_issuable.coffee +++ b/app/assets/javascripts/shortcuts_issuable.coffee @@ -1,6 +1,4 @@ -#= require jquery #= require mousetrap - #= require shortcuts_navigation class @ShortcutsIssuable extends ShortcutsNavigation diff --git a/app/assets/javascripts/stat_graph_contributors.js.coffee b/app/assets/javascripts/stat_graph_contributors.js.coffee index ed12bdcef22..3be14cb43dd 100644 --- a/app/assets/javascripts/stat_graph_contributors.js.coffee +++ b/app/assets/javascripts/stat_graph_contributors.js.coffee @@ -1,5 +1,4 @@ #= require d3 -#= require jquery #= require stat_graph_contributors_util class @ContributorsStatGraph |