Skip to content

Commit

Permalink
rake update[v4.2.1]
Browse files Browse the repository at this point in the history
  • Loading branch information
glebm committed Dec 25, 2018
1 parent 4192f90 commit e8dde96
Show file tree
Hide file tree
Showing 19 changed files with 51 additions and 51 deletions.
14 changes: 7 additions & 7 deletions assets/javascripts/bootstrap-sprockets.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
//= require ./bootstrap/util
//= require ./bootstrap/carousel
//= require ./bootstrap/scrollspy
//= require ./bootstrap/button
//= require ./bootstrap/collapse
//= require ./bootstrap/modal
//= require ./bootstrap/tooltip
//= require ./bootstrap/toast
//= require ./bootstrap/tab
//= require ./bootstrap/alert
//= require ./bootstrap/dropdown
//= require ./bootstrap/carousel
//= require ./bootstrap/toast
//= require ./bootstrap/tooltip
//= require ./bootstrap/popover
//= require ./bootstrap/scrollspy
//= require ./bootstrap/collapse
//= require ./bootstrap/alert
//= require ./bootstrap/tab
28 changes: 14 additions & 14 deletions assets/javascripts/bootstrap.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Bootstrap v4.1.3 (https://getbootstrap.com/)
* Bootstrap v4.2.1 (https://getbootstrap.com/)
* Copyright 2011-2018 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
*/
Expand Down Expand Up @@ -70,7 +70,7 @@

/**
* --------------------------------------------------------------------------
* Bootstrap (v4.1.3): util.js
* Bootstrap (v4.2.1): util.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/
Expand Down Expand Up @@ -226,7 +226,7 @@
*/

var NAME = 'alert';
var VERSION = '4.1.3';
var VERSION = '4.2.1';
var DATA_KEY = 'bs.alert';
var EVENT_KEY = "." + DATA_KEY;
var DATA_API_KEY = '.data-api';
Expand Down Expand Up @@ -391,7 +391,7 @@
*/

var NAME$1 = 'button';
var VERSION$1 = '4.1.3';
var VERSION$1 = '4.2.1';
var DATA_KEY$1 = 'bs.button';
var EVENT_KEY$1 = "." + DATA_KEY$1;
var DATA_API_KEY$1 = '.data-api';
Expand Down Expand Up @@ -545,7 +545,7 @@
*/

var NAME$2 = 'carousel';
var VERSION$2 = '4.1.3';
var VERSION$2 = '4.2.1';
var DATA_KEY$2 = 'bs.carousel';
var EVENT_KEY$2 = "." + DATA_KEY$2;
var DATA_API_KEY$2 = '.data-api';
Expand Down Expand Up @@ -1143,7 +1143,7 @@
*/

var NAME$3 = 'collapse';
var VERSION$3 = '4.1.3';
var VERSION$3 = '4.2.1';
var DATA_KEY$3 = 'bs.collapse';
var EVENT_KEY$3 = "." + DATA_KEY$3;
var DATA_API_KEY$3 = '.data-api';
Expand Down Expand Up @@ -1503,7 +1503,7 @@
*/

var NAME$4 = 'dropdown';
var VERSION$4 = '4.1.3';
var VERSION$4 = '4.2.1';
var DATA_KEY$4 = 'bs.dropdown';
var EVENT_KEY$4 = "." + DATA_KEY$4;
var DATA_API_KEY$4 = '.data-api';
Expand Down Expand Up @@ -2025,7 +2025,7 @@
*/

var NAME$5 = 'modal';
var VERSION$5 = '4.1.3';
var VERSION$5 = '4.2.1';
var DATA_KEY$5 = 'bs.modal';
var EVENT_KEY$5 = "." + DATA_KEY$5;
var DATA_API_KEY$5 = '.data-api';
Expand Down Expand Up @@ -2601,7 +2601,7 @@
*/

var NAME$6 = 'tooltip';
var VERSION$6 = '4.1.3';
var VERSION$6 = '4.2.1';
var DATA_KEY$6 = 'bs.tooltip';
var EVENT_KEY$6 = "." + DATA_KEY$6;
var JQUERY_NO_CONFLICT$6 = $.fn[NAME$6];
Expand Down Expand Up @@ -3277,7 +3277,7 @@
*/

var NAME$7 = 'popover';
var VERSION$7 = '4.1.3';
var VERSION$7 = '4.2.1';
var DATA_KEY$7 = 'bs.popover';
var EVENT_KEY$7 = "." + DATA_KEY$7;
var JQUERY_NO_CONFLICT$7 = $.fn[NAME$7];
Expand Down Expand Up @@ -3464,7 +3464,7 @@
*/

var NAME$8 = 'scrollspy';
var VERSION$8 = '4.1.3';
var VERSION$8 = '4.2.1';
var DATA_KEY$8 = 'bs.scrollspy';
var EVENT_KEY$8 = "." + DATA_KEY$8;
var DATA_API_KEY$6 = '.data-api';
Expand Down Expand Up @@ -3771,7 +3771,7 @@
*/

var NAME$9 = 'tab';
var VERSION$9 = '4.1.3';
var VERSION$9 = '4.2.1';
var DATA_KEY$9 = 'bs.tab';
var EVENT_KEY$9 = "." + DATA_KEY$9;
var DATA_API_KEY$7 = '.data-api';
Expand Down Expand Up @@ -4003,7 +4003,7 @@
*/

var NAME$a = 'toast';
var VERSION$a = '4.1.3';
var VERSION$a = '4.2.1';
var DATA_KEY$a = 'bs.toast';
var EVENT_KEY$a = "." + DATA_KEY$a;
var JQUERY_NO_CONFLICT$a = $.fn[NAME$a];
Expand Down Expand Up @@ -4208,7 +4208,7 @@

/**
* --------------------------------------------------------------------------
* Bootstrap (v4.1.3): index.js
* Bootstrap (v4.2.1): index.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/
Expand Down
4 changes: 2 additions & 2 deletions assets/javascripts/bootstrap.min.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions assets/javascripts/bootstrap/alert.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Bootstrap alert.js v4.1.3 (https://getbootstrap.com/)
* Bootstrap alert.js v4.2.1 (https://getbootstrap.com/)
* Copyright 2011-2018 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
*/
Expand Down Expand Up @@ -35,7 +35,7 @@
*/

var NAME = 'alert';
var VERSION = '4.1.3';
var VERSION = '4.2.1';
var DATA_KEY = 'bs.alert';
var EVENT_KEY = "." + DATA_KEY;
var DATA_API_KEY = '.data-api';
Expand Down
4 changes: 2 additions & 2 deletions assets/javascripts/bootstrap/button.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Bootstrap button.js v4.1.3 (https://getbootstrap.com/)
* Bootstrap button.js v4.2.1 (https://getbootstrap.com/)
* Copyright 2011-2018 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
*/
Expand Down Expand Up @@ -34,7 +34,7 @@
*/

var NAME = 'button';
var VERSION = '4.1.3';
var VERSION = '4.2.1';
var DATA_KEY = 'bs.button';
var EVENT_KEY = "." + DATA_KEY;
var DATA_API_KEY = '.data-api';
Expand Down
4 changes: 2 additions & 2 deletions assets/javascripts/bootstrap/carousel.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Bootstrap carousel.js v4.1.3 (https://getbootstrap.com/)
* Bootstrap carousel.js v4.2.1 (https://getbootstrap.com/)
* Copyright 2011-2018 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
*/
Expand Down Expand Up @@ -69,7 +69,7 @@
*/

var NAME = 'carousel';
var VERSION = '4.1.3';
var VERSION = '4.2.1';
var DATA_KEY = 'bs.carousel';
var EVENT_KEY = "." + DATA_KEY;
var DATA_API_KEY = '.data-api';
Expand Down
4 changes: 2 additions & 2 deletions assets/javascripts/bootstrap/collapse.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Bootstrap collapse.js v4.1.3 (https://getbootstrap.com/)
* Bootstrap collapse.js v4.2.1 (https://getbootstrap.com/)
* Copyright 2011-2018 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
*/
Expand Down Expand Up @@ -69,7 +69,7 @@
*/

var NAME = 'collapse';
var VERSION = '4.1.3';
var VERSION = '4.2.1';
var DATA_KEY = 'bs.collapse';
var EVENT_KEY = "." + DATA_KEY;
var DATA_API_KEY = '.data-api';
Expand Down
4 changes: 2 additions & 2 deletions assets/javascripts/bootstrap/dropdown.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Bootstrap dropdown.js v4.1.3 (https://getbootstrap.com/)
* Bootstrap dropdown.js v4.2.1 (https://getbootstrap.com/)
* Copyright 2011-2018 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
*/
Expand Down Expand Up @@ -70,7 +70,7 @@
*/

var NAME = 'dropdown';
var VERSION = '4.1.3';
var VERSION = '4.2.1';
var DATA_KEY = 'bs.dropdown';
var EVENT_KEY = "." + DATA_KEY;
var DATA_API_KEY = '.data-api';
Expand Down
4 changes: 2 additions & 2 deletions assets/javascripts/bootstrap/modal.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Bootstrap modal.js v4.1.3 (https://getbootstrap.com/)
* Bootstrap modal.js v4.2.1 (https://getbootstrap.com/)
* Copyright 2011-2018 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
*/
Expand Down Expand Up @@ -69,7 +69,7 @@
*/

var NAME = 'modal';
var VERSION = '4.1.3';
var VERSION = '4.2.1';
var DATA_KEY = 'bs.modal';
var EVENT_KEY = "." + DATA_KEY;
var DATA_API_KEY = '.data-api';
Expand Down
4 changes: 2 additions & 2 deletions assets/javascripts/bootstrap/popover.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Bootstrap popover.js v4.1.3 (https://getbootstrap.com/)
* Bootstrap popover.js v4.2.1 (https://getbootstrap.com/)
* Copyright 2011-2018 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
*/
Expand Down Expand Up @@ -75,7 +75,7 @@
*/

var NAME = 'popover';
var VERSION = '4.1.3';
var VERSION = '4.2.1';
var DATA_KEY = 'bs.popover';
var EVENT_KEY = "." + DATA_KEY;
var JQUERY_NO_CONFLICT = $.fn[NAME];
Expand Down
4 changes: 2 additions & 2 deletions assets/javascripts/bootstrap/scrollspy.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Bootstrap scrollspy.js v4.1.3 (https://getbootstrap.com/)
* Bootstrap scrollspy.js v4.2.1 (https://getbootstrap.com/)
* Copyright 2011-2018 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
*/
Expand Down Expand Up @@ -69,7 +69,7 @@
*/

var NAME = 'scrollspy';
var VERSION = '4.1.3';
var VERSION = '4.2.1';
var DATA_KEY = 'bs.scrollspy';
var EVENT_KEY = "." + DATA_KEY;
var DATA_API_KEY = '.data-api';
Expand Down
4 changes: 2 additions & 2 deletions assets/javascripts/bootstrap/tab.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Bootstrap tab.js v4.1.3 (https://getbootstrap.com/)
* Bootstrap tab.js v4.2.1 (https://getbootstrap.com/)
* Copyright 2011-2018 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
*/
Expand Down Expand Up @@ -35,7 +35,7 @@
*/

var NAME = 'tab';
var VERSION = '4.1.3';
var VERSION = '4.2.1';
var DATA_KEY = 'bs.tab';
var EVENT_KEY = "." + DATA_KEY;
var DATA_API_KEY = '.data-api';
Expand Down
4 changes: 2 additions & 2 deletions assets/javascripts/bootstrap/toast.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Bootstrap toast.js v4.1.3 (https://getbootstrap.com/)
* Bootstrap toast.js v4.2.1 (https://getbootstrap.com/)
* Copyright 2011-2018 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
*/
Expand Down Expand Up @@ -69,7 +69,7 @@
*/

var NAME = 'toast';
var VERSION = '4.1.3';
var VERSION = '4.2.1';
var DATA_KEY = 'bs.toast';
var EVENT_KEY = "." + DATA_KEY;
var JQUERY_NO_CONFLICT = $.fn[NAME];
Expand Down
4 changes: 2 additions & 2 deletions assets/javascripts/bootstrap/tooltip.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Bootstrap tooltip.js v4.1.3 (https://getbootstrap.com/)
* Bootstrap tooltip.js v4.2.1 (https://getbootstrap.com/)
* Copyright 2011-2018 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
*/
Expand Down Expand Up @@ -70,7 +70,7 @@
*/

var NAME = 'tooltip';
var VERSION = '4.1.3';
var VERSION = '4.2.1';
var DATA_KEY = 'bs.tooltip';
var EVENT_KEY = "." + DATA_KEY;
var JQUERY_NO_CONFLICT = $.fn[NAME];
Expand Down
4 changes: 2 additions & 2 deletions assets/javascripts/bootstrap/util.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Bootstrap util.js v4.1.3 (https://getbootstrap.com/)
* Bootstrap util.js v4.2.1 (https://getbootstrap.com/)
* Copyright 2011-2018 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
*/
Expand All @@ -13,7 +13,7 @@

/**
* --------------------------------------------------------------------------
* Bootstrap (v4.1.3): util.js
* Bootstrap (v4.2.1): util.js
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
* --------------------------------------------------------------------------
*/
Expand Down
2 changes: 1 addition & 1 deletion assets/stylesheets/_bootstrap-grid.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Bootstrap Grid v4.1.3 (https://getbootstrap.com/)
* Bootstrap Grid v4.2.1 (https://getbootstrap.com/)
* Copyright 2011-2018 The Bootstrap Authors
* Copyright 2011-2018 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
Expand Down
2 changes: 1 addition & 1 deletion assets/stylesheets/_bootstrap-reboot.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Bootstrap Reboot v4.1.3 (https://getbootstrap.com/)
* Bootstrap Reboot v4.2.1 (https://getbootstrap.com/)
* Copyright 2011-2018 The Bootstrap Authors
* Copyright 2011-2018 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
Expand Down
2 changes: 1 addition & 1 deletion assets/stylesheets/_bootstrap.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Bootstrap v4.1.3 (https://getbootstrap.com/)
* Bootstrap v4.2.1 (https://getbootstrap.com/)
* Copyright 2011-2018 The Bootstrap Authors
* Copyright 2011-2018 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
Expand Down
2 changes: 1 addition & 1 deletion lib/bootstrap/version.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@

module Bootstrap
VERSION = '4.1.3'
BOOTSTRAP_SHA = '12c4d3c248b49f1730c75fcf8fbcb4a97274ccf6'
BOOTSTRAP_SHA = '9e4e94747bd698f4f61d48ed54c9c6d4d199bd32'
end

0 comments on commit e8dde96

Please sign in to comment.