diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-12-23 12:05:48 +0000 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-12-23 12:05:48 +0000 |
commit | c53742b14d1abb4557f037d16b282ee7d26d4677 (patch) | |
tree | 903514e984b96dbef8568f9ac950ccb952dd9a5a | |
parent | 1607fba755691dbe0846d9c48e6960eee06d7f3a (diff) | |
parent | 5ad192ced2e3daf0c6b34fee11a50351cfe0918f (diff) | |
download | gitlab-ce-c53742b14d1abb4557f037d16b282ee7d26d4677.tar.gz |
Merge branch 'rs-update-jquery' into 'master'
Bump jquery-rails to ~> 4.0.0, jquery-ui-rails to ~> 5.0.0
Closes #2859
See merge request !2183
-rw-r--r-- | Gemfile | 4 | ||||
-rw-r--r-- | Gemfile.lock | 11 | ||||
-rw-r--r-- | app/assets/javascripts/application.js.coffee | 2 | ||||
-rw-r--r-- | app/assets/stylesheets/application.scss | 6 |
4 files changed, 12 insertions, 11 deletions
@@ -202,9 +202,9 @@ gem 'font-awesome-rails', '~> 4.2' gem 'gitlab_emoji', '~> 0.2.0' gem 'gon', '~> 6.0.1' gem 'jquery-atwho-rails', '~> 1.3.2' -gem 'jquery-rails', '~> 3.1.3' +gem 'jquery-rails', '~> 4.0.0' gem 'jquery-scrollto-rails', '~> 1.4.3' -gem 'jquery-ui-rails', '~> 4.2.1' +gem 'jquery-ui-rails', '~> 5.0.0' gem 'nprogress-rails', '~> 0.1.6.7' gem 'raphael-rails', '~> 2.1.2' gem 'request_store', '~> 1.2.0' diff --git a/Gemfile.lock b/Gemfile.lock index 21f405de2f2..7477b42f2d8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -372,15 +372,16 @@ GEM inflecto (0.0.2) ipaddress (0.8.0) jquery-atwho-rails (1.3.2) - jquery-rails (3.1.4) - railties (>= 3.0, < 5.0) + jquery-rails (4.0.5) + rails-dom-testing (~> 1.0) + railties (>= 4.2.0) thor (>= 0.14, < 2.0) jquery-scrollto-rails (1.4.3) railties (> 3.1, < 5.0) jquery-turbolinks (2.1.0) railties (>= 3.1.0) turbolinks - jquery-ui-rails (4.2.1) + jquery-ui-rails (5.0.5) railties (>= 3.2.16) json (1.8.3) jwt (1.5.2) @@ -879,10 +880,10 @@ DEPENDENCIES html-pipeline (~> 1.11.0) httparty (~> 0.13.3) jquery-atwho-rails (~> 1.3.2) - jquery-rails (~> 3.1.3) + jquery-rails (~> 4.0.0) jquery-scrollto-rails (~> 1.4.3) jquery-turbolinks (~> 2.1.0) - jquery-ui-rails (~> 4.2.1) + jquery-ui-rails (~> 5.0.0) kaminari (~> 0.16.3) letter_opener (~> 1.1.2) mail_room (~> 0.6.1) diff --git a/app/assets/javascripts/application.js.coffee b/app/assets/javascripts/application.js.coffee index 1539eba0faa..affab5bb030 100644 --- a/app/assets/javascripts/application.js.coffee +++ b/app/assets/javascripts/application.js.coffee @@ -5,7 +5,7 @@ # the compiled file. # #= require jquery -#= require jquery.ui.all +#= require jquery-ui #= require jquery_ujs #= require jquery.cookie #= require jquery.endless-scroll diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 7b060ce4853..0c0451fe4dd 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -2,8 +2,8 @@ * This is a manifest file that'll automatically include all the stylesheets available in this directory * and any sub-directories. You're free to add application-wide styles to this file and they'll appear at * the top of the compiled file, but it's generally better to create a new file per style scope. - *= require jquery.ui.datepicker - *= require jquery.ui.autocomplete + *= require jquery-ui/datepicker + *= require jquery-ui/autocomplete *= require jquery.atwho *= require select2 *= require_self @@ -48,4 +48,4 @@ /* * Styles for JS behaviors. */ -@import "behaviors.scss";
\ No newline at end of file +@import "behaviors.scss"; |