checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
---
2
2
SHA256:
3
- metadata.gz: d46b0e667c524b53bbcfd7291119c3078c1bcef2f379077610f11efa75cb7bcd
4
- data.tar.gz: 3952ce8b418d28245b3ba4a0126435958facc728363abd50deb0e6b110556b65
3
+ metadata.gz: 406c498360f8019bff664abb10c1607a5e9c7fff833fdf435558fe3d75aeb472
4
+ data.tar.gz: 590891edac2051e98a8c0428071b63882e62d493f5a5a7d12d938f9b8c51bd4b
5
5
SHA512:
6
- metadata.gz: dfc23eddf6eeb31093fa017f53ebc46c5a115d1d0edbc3ab40747eb243d4516e99c74d5c6d497bcb9731a62ab224ecde5f62352b50f57ab384a9595ac6d2ae53
7
- data.tar.gz: d8abfa6ea6c991820b67fb389c629f6b49d09610c1d0821e009084e475649b6aef7a861c620960ef58b9efa0d4a0709b9606690f6b19557910c0fd3946130f5f
6
+ metadata.gz: c6cc2b63b31fdc302fd9c4b8014e7133578995f815fe00e1d082b6bf662cade34c363162e5a72fae2b7299ac70dc4e093b43c4eac43165e61258d067131d6e98
7
+ data.tar.gz: 5ee50935ad12820bf14bed3a6e86521cae20a255746cd01c8770f27cff4c011081cc53a1476760d2817b59dc11b6a47cfa7f2c490ba5769ef46bf82620f5fcf3
data/CHANGELOG.md CHANGED
@@ -1,3 +1,10 @@
1
+ ## Rails 6.0.0.rc2 (July 22, 2019) ##
2
+
3
+ * Fix `select_tag` so that it doesn't change `options` when `include_blank` is present.
4
+
5
+ *Younes SERRAJ*
6
+
7
+
1
8
## Rails 6.0.0.rc1 (April 24, 2019) ##
2
9
3
10
* Fix partial caching skips same item issue
data/lib/action_view/cache_expiry.rb CHANGED
@@ -16,18 +16,23 @@ module ActionView
16
16
@watched_dirs = nil
17
17
@watcher_class = watcher
18
18
@watcher = nil
19
+ @mutex = Mutex.new
19
20
end
20
21
21
22
def clear_cache_if_necessary
22
- watched_dirs = dirs_to_watch
23
- if watched_dirs != @watched_dirs
24
- @watched_dirs = watched_dirs
25
- @watcher = @watcher_class.new([], watched_dirs) do
26
- clear_cache
23
+ @mutex.synchronize do
24
+ watched_dirs = dirs_to_watch
25
+ return if watched_dirs.empty?
26
+
27
+ if watched_dirs != @watched_dirs
28
+ @watched_dirs = watched_dirs
29
+ @watcher = @watcher_class.new([], watched_dirs) do
30
+ clear_cache
31
+ end
32
+ @watcher.execute
33
+ else
34
+ @watcher.execute_if_updated
27
35
end
28
- @watcher.execute
29
- else
30
- @watcher.execute_if_updated
31
36
end
32
37
end
33
38
data/lib/action_view/gem_version.rb CHANGED
@@ -10,7 +10,7 @@ module ActionView
10
10
MAJOR = 6
11
11
MINOR = 0
12
12
TINY = 0
13
- PRE = "rc1"
13
+ PRE = "rc2"
14
14
15
15
STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
16
16
end
data/lib/action_view/helpers/form_tag_helper.rb CHANGED
@@ -137,7 +137,8 @@ module ActionView
137
137
html_name = (options[:multiple] == true && !name.to_s.ends_with?("[]")) ? "#{name}[]" : name
138
138
139
139
if options.include?(:include_blank)
140
- include_blank = options.delete(:include_blank)
140
+ include_blank = options[:include_blank]
141
+ options = options.except(:include_blank)
141
142
options_for_blank_options_tag = { value: "" }
142
143
143
144
if include_blank == true
data/lib/action_view/helpers/translation_helper.rb CHANGED
@@ -60,7 +60,7 @@ module ActionView
60
60
def translate(key, options = {})
61
61
options = options.dup
62
62
if options.has_key?(:default)
63
- remaining_defaults = Array(options.delete(:default)).compact
63
+ remaining_defaults = Array.wrap(options.delete(:default)).compact
64
64
options[:default] = remaining_defaults unless remaining_defaults.first.kind_of?(Symbol)
65
65
end
66
66
data/lib/action_view/helpers/url_helper.rb CHANGED
@@ -253,7 +253,7 @@ module ActionView
253
253
# # <input value="New" type="submit" />
254
254
# # </form>"
255
255
#
256
- # <%= button_to "New", new_articles_path %>
256
+ # <%= button_to "New", new_article_path %>
257
257
# # => "<form method="post" action="/articles/new" class="button_to">
258
258
# # <input value="New" type="submit" />
259
259
# # </form>"
data/lib/assets/compiled/rails-ujs.js CHANGED
@@ -645,14 +645,14 @@ Released under the MIT license
645
645
};
646
646
647
647
Rails.preventInsignificantClick = function(e) {
648
- var data, insignificantMetaClick, link, metaClick, method, primaryMouseKey;
648
+ var data, insignificantMetaClick, link, metaClick, method, nonPrimaryMouseClick;
649
649
link = this;
650
650
method = (link.getAttribute('data-method') || 'GET').toUpperCase();
651
651
data = link.getAttribute('data-params');
652
652
metaClick = e.metaKey || e.ctrlKey;
653
653
insignificantMetaClick = metaClick && method === 'GET' && !data;
654
- primaryMouseKey = e.button === 0;
655
- if (!primaryMouseKey || insignificantMetaClick) {
654
+ nonPrimaryMouseClick = (e.button != null) && e.button !== 0;
655
+ if (nonPrimaryMouseClick || insignificantMetaClick) {
656
656
return e.stopImmediatePropagation();
657
657
}
658
658
};
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
--- !ruby/object:Gem::Specification
2
2
name: actionview
3
3
version: !ruby/object:Gem::Version
4
- version: 6.0.0.rc1
4
+ version: 6.0.0.rc2
5
5
platform: ruby
6
6
authors:
7
7
- David Heinemeier Hansson
8
8
autorequire:
9
9
bindir: bin
10
10
cert_chain: []
11
- date: 2019-04-24 00:00:00.000000000 Z
11
+ date: 2019-07-22 00:00:00.000000000 Z
12
12
dependencies:
13
13
- !ruby/object:Gem::Dependency
14
14
name: activesupport
@@ -16,14 +16,14 @@ dependencies:
16
16
requirements:
17
17
- - '='
18
18
- !ruby/object:Gem::Version
19
- version: 6.0.0.rc1
19
+ version: 6.0.0.rc2
20
20
type: :runtime
21
21
prerelease: false
22
22
version_requirements: !ruby/object:Gem::Requirement
23
23
requirements:
24
24
- - '='
25
25
- !ruby/object:Gem::Version
26
- version: 6.0.0.rc1
26
+ version: 6.0.0.rc2
27
27
- !ruby/object:Gem::Dependency
28
28
name: builder
29
29
requirement: !ruby/object:Gem::Requirement
@@ -92,28 +92,28 @@ dependencies:
92
92
requirements:
93
93
- - '='
94
94
- !ruby/object:Gem::Version
95
- version: 6.0.0.rc1
95
+ version: 6.0.0.rc2
96
96
type: :development
97
97
prerelease: false
98
98
version_requirements: !ruby/object:Gem::Requirement
99
99
requirements:
100
100
- - '='
101
101
- !ruby/object:Gem::Version
102
- version: 6.0.0.rc1
102
+ version: 6.0.0.rc2
103
103
- !ruby/object:Gem::Dependency
104
104
name: activemodel
105
105
requirement: !ruby/object:Gem::Requirement
106
106
requirements:
107
107
- - '='
108
108
- !ruby/object:Gem::Version
109
- version: 6.0.0.rc1
109
+ version: 6.0.0.rc2
110
110
type: :development
111
111
prerelease: false
112
112
version_requirements: !ruby/object:Gem::Requirement
113
113
requirements:
114
114
- - '='
115
115
- !ruby/object:Gem::Version
116
- version: 6.0.0.rc1
116
+ version: 6.0.0.rc2
117
117
description: Simple, battle-tested conventions and helpers for building web pages.
118
118
email: david@loudthinking.com
119
119
executables: []
@@ -235,8 +235,8 @@ homepage: https://rubyonrails.org
235
235
licenses:
236
236
- MIT
237
237
metadata:
238
- source_code_uri: https://github.com/rails/rails/tree/v6.0.0.rc1/actionview
239
- changelog_uri: https://github.com/rails/rails/blob/v6.0.0.rc1/actionview/CHANGELOG.md
238
+ source_code_uri: https://github.com/rails/rails/tree/v6.0.0.rc2/actionview
239
+ changelog_uri: https://github.com/rails/rails/blob/v6.0.0.rc2/actionview/CHANGELOG.md
240
240
post_install_message:
241
241
rdoc_options: []
242
242
require_paths:
bartesrlz

bartesrlz