Commit be65b1a28e7107cbf28a2a901a783de5827d275e

Authored by Karpikau Andrei
1 parent 31590378

test ruby version

@@ -5,4 +5,4 @@ You are allowed to: @@ -5,4 +5,4 @@ You are allowed to:
5 2. Remove generators 5 2. Remove generators
6 3. Add installed generators 6 3. Add installed generators
7 To add new installed generators automatically delete this file and reload the project. 7 To add new installed generators automatically delete this file and reload the project.
8 ---><GeneratorsGroup><Generator name="active_record:devise" /><Generator name="assets" /><Generator name="controller" /><Generator name="delayed_job" /><Generator name="delayed_job:active_record" /><Generator name="delayed_job:upgrade" /><Generator name="devise" /><Generator name="devise:controllers" /><Generator name="devise:install" /><Generator name="devise:views" /><Generator name="factory_girl:model" /><Generator name="generator" /><Generator name="helper" /><Generator name="integration_test" /><Generator name="jbuilder" /><Generator name="job" /><Generator name="js:assets" /><Generator name="mailer" /><Generator name="migration" /><Generator name="model" /><Generator name="mongoid:devise" /><Generator name="resource" /><Generator name="responders:install" /><Generator name="responders_controller" /><Generator name="rspec:controller" /><Generator name="rspec:feature" /><Generator name="rspec:helper" /><Generator name="rspec:install" /><Generator name="rspec:integration" /><Generator name="rspec:job" /><Generator name="rspec:mailer" /><Generator name="rspec:model" /><Generator name="rspec:observer" /><Generator name="rspec:request" /><Generator name="rspec:scaffold" /><Generator name="rspec:view" /><Generator name="sass:assets" /><Generator name="sass:scaffold" /><Generator name="scaffold" /><Generator name="scaffold_controller" /><Generator name="scss:assets" /><Generator name="scss:scaffold" /><Generator name="task" /><Generator name="test_unit:generator" /><Generator name="test_unit:job" /><Generator name="test_unit:plugin" /></GeneratorsGroup></Settings> 8 +--><GeneratorsGroup><Generator name="active_record:devise" /><Generator name="assets" /><Generator name="controller" /><Generator name="delayed_job" /><Generator name="delayed_job:active_record" /><Generator name="delayed_job:upgrade" /><Generator name="devise" /><Generator name="devise:controllers" /><Generator name="devise:install" /><Generator name="devise:views" /><Generator name="factory_girl:model" /><Generator name="generator" /><Generator name="helper" /><Generator name="integration_test" /><Generator name="jbuilder" /><Generator name="job" /><Generator name="js:assets" /><Generator name="mailer" /><Generator name="migration" /><Generator name="model" /><Generator name="mongoid:devise" /><Generator name="resource" /><Generator name="responders:install" /><Generator name="responders_controller" /><Generator name="rspec:controller" /><Generator name="rspec:feature" /><Generator name="rspec:helper" /><Generator name="rspec:install" /><Generator name="rspec:integration" /><Generator name="rspec:job" /><Generator name="rspec:mailer" /><Generator name="rspec:model" /><Generator name="rspec:observer" /><Generator name="rspec:request" /><Generator name="rspec:scaffold" /><Generator name="rspec:view" /><Generator name="sass:assets" /><Generator name="scaffold" /><Generator name="scaffold_controller" /><Generator name="scss:assets" /><Generator name="task" /><Generator name="test_unit:generator" /><Generator name="test_unit:job" /><Generator name="test_unit:plugin" /></GeneratorsGroup></Settings>
@@ -131,9 +131,9 @@ @@ -131,9 +131,9 @@
131 <orderEntry type="library" scope="PROVIDED" name="acts_as_list (v0.9.5, rbenv: 2.1.3) [gem]" level="application" /> 131 <orderEntry type="library" scope="PROVIDED" name="acts_as_list (v0.9.5, rbenv: 2.1.3) [gem]" level="application" />
132 <orderEntry type="library" scope="PROVIDED" name="acts_as_tree (v2.7.0, rbenv: 2.1.3) [gem]" level="application" /> 132 <orderEntry type="library" scope="PROVIDED" name="acts_as_tree (v2.7.0, rbenv: 2.1.3) [gem]" level="application" />
133 <orderEntry type="library" scope="PROVIDED" name="arel (v6.0.4, rbenv: 2.1.3) [gem]" level="application" /> 133 <orderEntry type="library" scope="PROVIDED" name="arel (v6.0.4, rbenv: 2.1.3) [gem]" level="application" />
134 - <orderEntry type="library" scope="PROVIDED" name="aws-sdk (v3.0.1, rbenv: 2.1.3) [gem]" level="application" />  
135 - <orderEntry type="library" scope="PROVIDED" name="aws-sdk-core (v2.9.20, rbenv: 2.1.3) [gem]" level="application" />  
136 - <orderEntry type="library" scope="PROVIDED" name="aws-sdk-resources (v2.9.20, rbenv: 2.1.3) [gem]" level="application" /> 134 + <orderEntry type="library" scope="PROVIDED" name="aws-sdk (v2.6.32, rbenv: 2.1.3) [gem]" level="application" />
  135 + <orderEntry type="library" scope="PROVIDED" name="aws-sdk-core (v2.6.32, rbenv: 2.1.3) [gem]" level="application" />
  136 + <orderEntry type="library" scope="PROVIDED" name="aws-sdk-resources (v2.6.32, rbenv: 2.1.3) [gem]" level="application" />
137 <orderEntry type="library" scope="PROVIDED" name="aws-sigv4 (v1.0.2, rbenv: 2.1.3) [gem]" level="application" /> 137 <orderEntry type="library" scope="PROVIDED" name="aws-sigv4 (v1.0.2, rbenv: 2.1.3) [gem]" level="application" />
138 <orderEntry type="library" scope="PROVIDED" name="backport_new_renderer (v1.0.0, rbenv: 2.1.3) [gem]" level="application" /> 138 <orderEntry type="library" scope="PROVIDED" name="backport_new_renderer (v1.0.0, rbenv: 2.1.3) [gem]" level="application" />
139 <orderEntry type="library" scope="PROVIDED" name="bcrypt (v3.1.11, rbenv: 2.1.3) [gem]" level="application" /> 139 <orderEntry type="library" scope="PROVIDED" name="bcrypt (v3.1.11, rbenv: 2.1.3) [gem]" level="application" />
@@ -141,7 +141,7 @@ @@ -141,7 +141,7 @@
141 <orderEntry type="library" scope="PROVIDED" name="bundler (v1.9.0, rbenv: 2.1.3) [gem]" level="application" /> 141 <orderEntry type="library" scope="PROVIDED" name="bundler (v1.9.0, rbenv: 2.1.3) [gem]" level="application" />
142 <orderEntry type="library" scope="PROVIDED" name="concurrent-ruby (v1.0.5, rbenv: 2.1.3) [gem]" level="application" /> 142 <orderEntry type="library" scope="PROVIDED" name="concurrent-ruby (v1.0.5, rbenv: 2.1.3) [gem]" level="application" />
143 <orderEntry type="library" scope="PROVIDED" name="daemons (v1.2.5, rbenv: 2.1.3) [gem]" level="application" /> 143 <orderEntry type="library" scope="PROVIDED" name="daemons (v1.2.5, rbenv: 2.1.3) [gem]" level="application" />
144 - <orderEntry type="library" scope="PROVIDED" name="delayed_job (v4.1.2, rbenv: 2.1.3) [gem]" level="application" /> 144 + <orderEntry type="library" scope="PROVIDED" name="delayed_job (v4.1.3, rbenv: 2.1.3) [gem]" level="application" />
145 <orderEntry type="library" scope="PROVIDED" name="delayed_job_active_record (v4.1.2, rbenv: 2.1.3) [gem]" level="application" /> 145 <orderEntry type="library" scope="PROVIDED" name="delayed_job_active_record (v4.1.2, rbenv: 2.1.3) [gem]" level="application" />
146 <orderEntry type="library" scope="PROVIDED" name="devise (v4.3.0, rbenv: 2.1.3) [gem]" level="application" /> 146 <orderEntry type="library" scope="PROVIDED" name="devise (v4.3.0, rbenv: 2.1.3) [gem]" level="application" />
147 <orderEntry type="library" scope="PROVIDED" name="diff-lcs (v1.2.5, rbenv: 2.1.3) [gem]" level="application" /> 147 <orderEntry type="library" scope="PROVIDED" name="diff-lcs (v1.2.5, rbenv: 2.1.3) [gem]" level="application" />
@@ -149,19 +149,20 @@ @@ -149,19 +149,20 @@
149 <orderEntry type="library" scope="PROVIDED" name="execjs (v2.7.0, rbenv: 2.1.3) [gem]" level="application" /> 149 <orderEntry type="library" scope="PROVIDED" name="execjs (v2.7.0, rbenv: 2.1.3) [gem]" level="application" />
150 <orderEntry type="library" scope="PROVIDED" name="factory_girl (v4.7.0, rbenv: 2.1.3) [gem]" level="application" /> 150 <orderEntry type="library" scope="PROVIDED" name="factory_girl (v4.7.0, rbenv: 2.1.3) [gem]" level="application" />
151 <orderEntry type="library" scope="PROVIDED" name="factory_girl_rails (v4.8.0, rbenv: 2.1.3) [gem]" level="application" /> 151 <orderEntry type="library" scope="PROVIDED" name="factory_girl_rails (v4.8.0, rbenv: 2.1.3) [gem]" level="application" />
  152 + <orderEntry type="library" scope="PROVIDED" name="ffi (v1.9.14, rbenv: 2.1.3) [gem]" level="application" />
152 <orderEntry type="library" scope="PROVIDED" name="globalid (v0.4.1, rbenv: 2.1.3) [gem]" level="application" /> 153 <orderEntry type="library" scope="PROVIDED" name="globalid (v0.4.1, rbenv: 2.1.3) [gem]" level="application" />
153 <orderEntry type="library" scope="PROVIDED" name="i18n (v0.7.0, rbenv: 2.1.3) [gem]" level="application" /> 154 <orderEntry type="library" scope="PROVIDED" name="i18n (v0.7.0, rbenv: 2.1.3) [gem]" level="application" />
154 <orderEntry type="library" scope="PROVIDED" name="jbuilder (v2.7.0, rbenv: 2.1.3) [gem]" level="application" /> 155 <orderEntry type="library" scope="PROVIDED" name="jbuilder (v2.7.0, rbenv: 2.1.3) [gem]" level="application" />
155 <orderEntry type="library" scope="PROVIDED" name="jmespath (v1.3.1, rbenv: 2.1.3) [gem]" level="application" /> 156 <orderEntry type="library" scope="PROVIDED" name="jmespath (v1.3.1, rbenv: 2.1.3) [gem]" level="application" />
156 <orderEntry type="library" scope="PROVIDED" name="jquery-rails (v3.1.2, rbenv: 2.1.3) [gem]" level="application" /> 157 <orderEntry type="library" scope="PROVIDED" name="jquery-rails (v3.1.2, rbenv: 2.1.3) [gem]" level="application" />
157 <orderEntry type="library" scope="PROVIDED" name="json (v1.8.3, rbenv: 2.1.3) [gem]" level="application" /> 158 <orderEntry type="library" scope="PROVIDED" name="json (v1.8.3, rbenv: 2.1.3) [gem]" level="application" />
158 - <orderEntry type="library" scope="PROVIDED" name="libv8 (v3.16.14.17, rbenv: 2.1.3) [gem]" level="application" /> 159 + <orderEntry type="library" scope="PROVIDED" name="libv8 (v3.16.14.19, rbenv: 2.1.3) [gem]" level="application" />
159 <orderEntry type="library" scope="PROVIDED" name="loofah (v2.0.3, rbenv: 2.1.3) [gem]" level="application" /> 160 <orderEntry type="library" scope="PROVIDED" name="loofah (v2.0.3, rbenv: 2.1.3) [gem]" level="application" />
160 <orderEntry type="library" scope="PROVIDED" name="mail (v2.7.0, rbenv: 2.1.3) [gem]" level="application" /> 161 <orderEntry type="library" scope="PROVIDED" name="mail (v2.7.0, rbenv: 2.1.3) [gem]" level="application" />
161 <orderEntry type="library" scope="PROVIDED" name="mini_mime (v1.0.0, rbenv: 2.1.3) [gem]" level="application" /> 162 <orderEntry type="library" scope="PROVIDED" name="mini_mime (v1.0.0, rbenv: 2.1.3) [gem]" level="application" />
162 <orderEntry type="library" scope="PROVIDED" name="mini_portile (v0.5.3, rbenv: 2.1.3) [gem]" level="application" /> 163 <orderEntry type="library" scope="PROVIDED" name="mini_portile (v0.5.3, rbenv: 2.1.3) [gem]" level="application" />
163 <orderEntry type="library" scope="PROVIDED" name="minitest (v5.8.4, rbenv: 2.1.3) [gem]" level="application" /> 164 <orderEntry type="library" scope="PROVIDED" name="minitest (v5.8.4, rbenv: 2.1.3) [gem]" level="application" />
164 - <orderEntry type="library" scope="PROVIDED" name="multi_json (v1.12.1, rbenv: 2.1.3) [gem]" level="application" /> 165 + <orderEntry type="library" scope="PROVIDED" name="multi_json (v1.12.2, rbenv: 2.1.3) [gem]" level="application" />
165 <orderEntry type="library" scope="PROVIDED" name="nokogiri (v1.6.1, rbenv: 2.1.3) [gem]" level="application" /> 166 <orderEntry type="library" scope="PROVIDED" name="nokogiri (v1.6.1, rbenv: 2.1.3) [gem]" level="application" />
166 <orderEntry type="library" scope="PROVIDED" name="orm_adapter (v0.5.0, rbenv: 2.1.3) [gem]" level="application" /> 167 <orderEntry type="library" scope="PROVIDED" name="orm_adapter (v0.5.0, rbenv: 2.1.3) [gem]" level="application" />
167 <orderEntry type="library" scope="PROVIDED" name="pg (v0.17.1, rbenv: 2.1.3) [gem]" level="application" /> 168 <orderEntry type="library" scope="PROVIDED" name="pg (v0.17.1, rbenv: 2.1.3) [gem]" level="application" />
@@ -176,6 +177,8 @@ @@ -176,6 +177,8 @@
176 <orderEntry type="library" scope="PROVIDED" name="rails_stdout_logging (v0.0.5, rbenv: 2.1.3) [gem]" level="application" /> 177 <orderEntry type="library" scope="PROVIDED" name="rails_stdout_logging (v0.0.5, rbenv: 2.1.3) [gem]" level="application" />
177 <orderEntry type="library" scope="PROVIDED" name="railties (v4.2.6, rbenv: 2.1.3) [gem]" level="application" /> 178 <orderEntry type="library" scope="PROVIDED" name="railties (v4.2.6, rbenv: 2.1.3) [gem]" level="application" />
178 <orderEntry type="library" scope="PROVIDED" name="rake (v11.1.2, rbenv: 2.1.3) [gem]" level="application" /> 179 <orderEntry type="library" scope="PROVIDED" name="rake (v11.1.2, rbenv: 2.1.3) [gem]" level="application" />
  180 + <orderEntry type="library" scope="PROVIDED" name="rb-fsevent (v0.10.2, rbenv: 2.1.3) [gem]" level="application" />
  181 + <orderEntry type="library" scope="PROVIDED" name="rb-inotify (v0.9.10, rbenv: 2.1.3) [gem]" level="application" />
179 <orderEntry type="library" scope="PROVIDED" name="rdoc (v4.3.0, rbenv: 2.1.3) [gem]" level="application" /> 182 <orderEntry type="library" scope="PROVIDED" name="rdoc (v4.3.0, rbenv: 2.1.3) [gem]" level="application" />
180 <orderEntry type="library" scope="PROVIDED" name="ref (v2.0.0, rbenv: 2.1.3) [gem]" level="application" /> 183 <orderEntry type="library" scope="PROVIDED" name="ref (v2.0.0, rbenv: 2.1.3) [gem]" level="application" />
181 <orderEntry type="library" scope="PROVIDED" name="responders (v2.4.0, rbenv: 2.1.3) [gem]" level="application" /> 184 <orderEntry type="library" scope="PROVIDED" name="responders (v2.4.0, rbenv: 2.1.3) [gem]" level="application" />
@@ -184,15 +187,16 @@ @@ -184,15 +187,16 @@
184 <orderEntry type="library" scope="PROVIDED" name="rspec-mocks (v3.4.1, rbenv: 2.1.3) [gem]" level="application" /> 187 <orderEntry type="library" scope="PROVIDED" name="rspec-mocks (v3.4.1, rbenv: 2.1.3) [gem]" level="application" />
185 <orderEntry type="library" scope="PROVIDED" name="rspec-rails (v3.4.2, rbenv: 2.1.3) [gem]" level="application" /> 188 <orderEntry type="library" scope="PROVIDED" name="rspec-rails (v3.4.2, rbenv: 2.1.3) [gem]" level="application" />
186 <orderEntry type="library" scope="PROVIDED" name="rspec-support (v3.4.1, rbenv: 2.1.3) [gem]" level="application" /> 189 <orderEntry type="library" scope="PROVIDED" name="rspec-support (v3.4.1, rbenv: 2.1.3) [gem]" level="application" />
187 - <orderEntry type="library" scope="PROVIDED" name="sass (v3.4.23, rbenv: 2.1.3) [gem]" level="application" /> 190 + <orderEntry type="library" scope="PROVIDED" name="sass (v3.5.3, rbenv: 2.1.3) [gem]" level="application" />
  191 + <orderEntry type="library" scope="PROVIDED" name="sass-listen (v4.0.0, rbenv: 2.1.3) [gem]" level="application" />
188 <orderEntry type="library" scope="PROVIDED" name="sass-rails (v5.0.7, rbenv: 2.1.3) [gem]" level="application" /> 192 <orderEntry type="library" scope="PROVIDED" name="sass-rails (v5.0.7, rbenv: 2.1.3) [gem]" level="application" />
189 <orderEntry type="library" scope="PROVIDED" name="sdoc (v0.4.2, rbenv: 2.1.3) [gem]" level="application" /> 193 <orderEntry type="library" scope="PROVIDED" name="sdoc (v0.4.2, rbenv: 2.1.3) [gem]" level="application" />
190 <orderEntry type="library" scope="PROVIDED" name="sprockets (v3.7.1, rbenv: 2.1.3) [gem]" level="application" /> 194 <orderEntry type="library" scope="PROVIDED" name="sprockets (v3.7.1, rbenv: 2.1.3) [gem]" level="application" />
191 - <orderEntry type="library" scope="PROVIDED" name="sprockets-rails (v3.2.0, rbenv: 2.1.3) [gem]" level="application" /> 195 + <orderEntry type="library" scope="PROVIDED" name="sprockets-rails (v3.2.1, rbenv: 2.1.3) [gem]" level="application" />
192 <orderEntry type="library" scope="PROVIDED" name="therubyracer (v0.12.2, rbenv: 2.1.3) [gem]" level="application" /> 196 <orderEntry type="library" scope="PROVIDED" name="therubyracer (v0.12.2, rbenv: 2.1.3) [gem]" level="application" />
193 <orderEntry type="library" scope="PROVIDED" name="thor (v0.19.1, rbenv: 2.1.3) [gem]" level="application" /> 197 <orderEntry type="library" scope="PROVIDED" name="thor (v0.19.1, rbenv: 2.1.3) [gem]" level="application" />
194 <orderEntry type="library" scope="PROVIDED" name="thread_safe (v0.3.5, rbenv: 2.1.3) [gem]" level="application" /> 198 <orderEntry type="library" scope="PROVIDED" name="thread_safe (v0.3.5, rbenv: 2.1.3) [gem]" level="application" />
195 - <orderEntry type="library" scope="PROVIDED" name="tilt (v2.0.7, rbenv: 2.1.3) [gem]" level="application" /> 199 + <orderEntry type="library" scope="PROVIDED" name="tilt (v2.0.8, rbenv: 2.1.3) [gem]" level="application" />
196 <orderEntry type="library" scope="PROVIDED" name="tzinfo (v1.2.2, rbenv: 2.1.3) [gem]" level="application" /> 200 <orderEntry type="library" scope="PROVIDED" name="tzinfo (v1.2.2, rbenv: 2.1.3) [gem]" level="application" />
197 <orderEntry type="library" scope="PROVIDED" name="uglifier (v4.0.2, rbenv: 2.1.3) [gem]" level="application" /> 201 <orderEntry type="library" scope="PROVIDED" name="uglifier (v4.0.2, rbenv: 2.1.3) [gem]" level="application" />
198 <orderEntry type="library" scope="PROVIDED" name="warden (v1.2.7, rbenv: 2.1.3) [gem]" level="application" /> 202 <orderEntry type="library" scope="PROVIDED" name="warden (v1.2.7, rbenv: 2.1.3) [gem]" level="application" />
@@ -2,6 +2,11 @@ @@ -2,6 +2,11 @@
2 <project version="4"> 2 <project version="4">
3 <component name="ChangeListManager"> 3 <component name="ChangeListManager">
4 <list default="true" id="cbbcb0f9-d203-4967-aa4d-c08a939c7df0" name="Default" comment=""> 4 <list default="true" id="cbbcb0f9-d203-4967-aa4d-c08a939c7df0" name="Default" comment="">
  5 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/.generators" afterPath="$PROJECT_DIR$/.idea/.generators" />
  6 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/kanjai.iml" afterPath="$PROJECT_DIR$/.idea/kanjai.iml" />
  7 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
  8 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Gemfile.lock" afterPath="$PROJECT_DIR$/Gemfile.lock" />
  9 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/kanjai.gemspec" afterPath="$PROJECT_DIR$/kanjai.gemspec" />
5 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/kanjai/version.rb" afterPath="$PROJECT_DIR$/lib/kanjai/version.rb" /> 10 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/kanjai/version.rb" afterPath="$PROJECT_DIR$/lib/kanjai/version.rb" />
6 </list> 11 </list>
7 <ignored path="kanjai.iws" /> 12 <ignored path="kanjai.iws" />
@@ -36,8 +41,8 @@ @@ -36,8 +41,8 @@
36 <file leaf-file-name="kanjai.gemspec" pinned="false" current-in-tab="false"> 41 <file leaf-file-name="kanjai.gemspec" pinned="false" current-in-tab="false">
37 <entry file="file://$PROJECT_DIR$/kanjai.gemspec"> 42 <entry file="file://$PROJECT_DIR$/kanjai.gemspec">
38 <provider selected="true" editor-type-id="text-editor"> 43 <provider selected="true" editor-type-id="text-editor">
39 - <state relative-caret-position="300">  
40 - <caret line="20" column="24" lean-forward="false" selection-start-line="20" selection-start-column="20" selection-end-line="20" selection-end-column="24" /> 44 + <state relative-caret-position="381">
  45 + <caret line="47" column="37" lean-forward="false" selection-start-line="47" selection-start-column="37" selection-end-line="47" selection-end-column="37" />
41 <folding /> 46 <folding />
42 </state> 47 </state>
43 </provider> 48 </provider>
@@ -86,8 +91,8 @@ @@ -86,8 +91,8 @@
86 <file leaf-file-name="Gemfile.lock" pinned="false" current-in-tab="false"> 91 <file leaf-file-name="Gemfile.lock" pinned="false" current-in-tab="false">
87 <entry file="file://$PROJECT_DIR$/Gemfile.lock"> 92 <entry file="file://$PROJECT_DIR$/Gemfile.lock">
88 <provider selected="true" editor-type-id="text-editor"> 93 <provider selected="true" editor-type-id="text-editor">
89 - <state relative-caret-position="-865">  
90 - <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 94 + <state relative-caret-position="203">
  95 + <caret line="67" column="11" lean-forward="false" selection-start-line="67" selection-start-column="11" selection-end-line="67" selection-end-column="11" />
91 <folding /> 96 <folding />
92 </state> 97 </state>
93 </provider> 98 </provider>
@@ -143,6 +148,7 @@ @@ -143,6 +148,7 @@
143 <find>0.0.71</find> 148 <find>0.0.71</find>
144 <find>0.0.7</find> 149 <find>0.0.7</find>
145 <find>0.0.72</find> 150 <find>0.0.72</find>
  151 + <find>aws-sdk</find>
146 <find>sass</find> 152 <find>sass</find>
147 </findStrings> 153 </findStrings>
148 <dirStrings> 154 <dirStrings>
@@ -177,7 +183,6 @@ @@ -177,7 +183,6 @@
177 <option value="$PROJECT_DIR$/app/views/kanjai/admin/pages/delete_gallery_image.js.erb" /> 183 <option value="$PROJECT_DIR$/app/views/kanjai/admin/pages/delete_gallery_image.js.erb" />
178 <option value="$PROJECT_DIR$/app/assets/stylesheets/kanjai/general_admin.css.scss" /> 184 <option value="$PROJECT_DIR$/app/assets/stylesheets/kanjai/general_admin.css.scss" />
179 <option value="$PROJECT_DIR$/app/helpers/kanjai/admin/pages_helper.rb" /> 185 <option value="$PROJECT_DIR$/app/helpers/kanjai/admin/pages_helper.rb" />
180 - <option value="$PROJECT_DIR$/kanjai.gemspec" />  
181 <option value="$PROJECT_DIR$/lib/kanjai/content_function.rb" /> 186 <option value="$PROJECT_DIR$/lib/kanjai/content_function.rb" />
182 <option value="$PROJECT_DIR$/app/views/kanjai/pages/show.pdf.erb" /> 187 <option value="$PROJECT_DIR$/app/views/kanjai/pages/show.pdf.erb" />
183 <option value="$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/admin.js" /> 188 <option value="$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/admin.js" />
@@ -205,6 +210,7 @@ @@ -205,6 +210,7 @@
205 <option value="$PROJECT_DIR$/app/controllers/kanjai/admin/pages_controller.rb" /> 210 <option value="$PROJECT_DIR$/app/controllers/kanjai/admin/pages_controller.rb" />
206 <option value="$PROJECT_DIR$/app/views/kanjai/admin/pages/content_types/_content.html.erb" /> 211 <option value="$PROJECT_DIR$/app/views/kanjai/admin/pages/content_types/_content.html.erb" />
207 <option value="$PROJECT_DIR$/app/controllers/kanjai/form_controller.rb" /> 212 <option value="$PROJECT_DIR$/app/controllers/kanjai/form_controller.rb" />
  213 + <option value="$PROJECT_DIR$/kanjai.gemspec" />
208 <option value="$PROJECT_DIR$/lib/kanjai/version.rb" /> 214 <option value="$PROJECT_DIR$/lib/kanjai/version.rb" />
209 </list> 215 </list>
210 </option> 216 </option>
@@ -675,12 +681,12 @@ @@ -675,12 +681,12 @@
675 <workItem from="1500931211896" duration="152000" /> 681 <workItem from="1500931211896" duration="152000" />
676 <workItem from="1500931637579" duration="304000" /> 682 <workItem from="1500931637579" duration="304000" />
677 <workItem from="1501482504677" duration="10000" /> 683 <workItem from="1501482504677" duration="10000" />
678 - <workItem from="1513232887722" duration="9910000" /> 684 + <workItem from="1513232887722" duration="10388000" />
679 </task> 685 </task>
680 <servers /> 686 <servers />
681 </component> 687 </component>
682 <component name="TimeTrackingManager"> 688 <component name="TimeTrackingManager">
683 - <option name="totallyTimeSpent" value="13723000" /> 689 + <option name="totallyTimeSpent" value="14201000" />
684 </component> 690 </component>
685 <component name="ToolWindowManager"> 691 <component name="ToolWindowManager">
686 <frame x="0" y="23" width="1280" height="730" extended-state="6" /> 692 <frame x="0" y="23" width="1280" height="730" extended-state="6" />
@@ -1097,16 +1103,16 @@ @@ -1097,16 +1103,16 @@
1097 </entry> 1103 </entry>
1098 <entry file="file://$PROJECT_DIR$/Gemfile.lock"> 1104 <entry file="file://$PROJECT_DIR$/Gemfile.lock">
1099 <provider selected="true" editor-type-id="text-editor"> 1105 <provider selected="true" editor-type-id="text-editor">
1100 - <state relative-caret-position="-865">  
1101 - <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 1106 + <state relative-caret-position="203">
  1107 + <caret line="67" column="11" lean-forward="false" selection-start-line="67" selection-start-column="11" selection-end-line="67" selection-end-column="11" />
1102 <folding /> 1108 <folding />
1103 </state> 1109 </state>
1104 </provider> 1110 </provider>
1105 </entry> 1111 </entry>
1106 <entry file="file://$PROJECT_DIR$/kanjai.gemspec"> 1112 <entry file="file://$PROJECT_DIR$/kanjai.gemspec">
1107 <provider selected="true" editor-type-id="text-editor"> 1113 <provider selected="true" editor-type-id="text-editor">
1108 - <state relative-caret-position="300">  
1109 - <caret line="20" column="24" lean-forward="false" selection-start-line="20" selection-start-column="20" selection-end-line="20" selection-end-column="24" /> 1114 + <state relative-caret-position="381">
  1115 + <caret line="47" column="37" lean-forward="false" selection-start-line="47" selection-start-column="37" selection-end-line="47" selection-end-column="37" />
1110 <folding /> 1116 <folding />
1111 </state> 1117 </state>
1112 </provider> 1118 </provider>
1 PATH 1 PATH
2 remote: . 2 remote: .
3 specs: 3 specs:
4 - kanjai (0.0.72) 4 + kanjai (0.0.74)
5 acts_as_list 5 acts_as_list
6 acts_as_tree 6 acts_as_tree
7 - aws-sdk 7 + aws-sdk (= 2.6.32)
8 backport_new_renderer 8 backport_new_renderer
9 daemons 9 daemons
10 delayed_job_active_record 10 delayed_job_active_record
@@ -64,24 +64,24 @@ GEM @@ -64,24 +64,24 @@ GEM
64 acts_as_tree (2.7.0) 64 acts_as_tree (2.7.0)
65 activerecord (>= 3.0.0) 65 activerecord (>= 3.0.0)
66 arel (6.0.4) 66 arel (6.0.4)
67 - aws-sdk (2.9.20)  
68 - aws-sdk-resources (= 2.9.20)  
69 - aws-sdk-core (2.9.20) 67 + aws-sdk (2.6.32)
  68 + aws-sdk-resources (= 2.6.32)
  69 + aws-sdk-core (2.6.32)
70 aws-sigv4 (~> 1.0) 70 aws-sigv4 (~> 1.0)
71 jmespath (~> 1.0) 71 jmespath (~> 1.0)
72 - aws-sdk-resources (2.9.20)  
73 - aws-sdk-core (= 2.9.20) 72 + aws-sdk-resources (2.6.32)
  73 + aws-sdk-core (= 2.6.32)
74 aws-sigv4 (1.0.2) 74 aws-sigv4 (1.0.2)
75 backport_new_renderer (1.0.0) 75 backport_new_renderer (1.0.0)
76 rails 76 rails
77 bcrypt (3.1.11) 77 bcrypt (3.1.11)
78 builder (3.2.2) 78 builder (3.2.2)
79 concurrent-ruby (1.0.5) 79 concurrent-ruby (1.0.5)
80 - daemons (1.2.4)  
81 - delayed_job (4.1.2)  
82 - activesupport (>= 3.0, < 5.1)  
83 - delayed_job_active_record (4.1.1)  
84 - activerecord (>= 3.0, < 5.1) 80 + daemons (1.2.5)
  81 + delayed_job (4.1.3)
  82 + activesupport (>= 3.0, < 5.2)
  83 + delayed_job_active_record (4.1.2)
  84 + activerecord (>= 3.0, < 5.2)
85 delayed_job (>= 3.0, < 5) 85 delayed_job (>= 3.0, < 5)
86 devise (4.3.0) 86 devise (4.3.0)
87 bcrypt (~> 3.0) 87 bcrypt (~> 3.0)
@@ -97,18 +97,19 @@ GEM @@ -97,18 +97,19 @@ GEM
97 factory_girl_rails (4.7.0) 97 factory_girl_rails (4.7.0)
98 factory_girl (~> 4.7.0) 98 factory_girl (~> 4.7.0)
99 railties (>= 3.0.0) 99 railties (>= 3.0.0)
  100 + ffi (1.9.14)
100 globalid (0.4.1) 101 globalid (0.4.1)
101 activesupport (>= 4.2.0) 102 activesupport (>= 4.2.0)
102 i18n (0.7.0) 103 i18n (0.7.0)
103 - jbuilder (2.6.4)  
104 - activesupport (>= 3.0.0) 104 + jbuilder (2.7.0)
  105 + activesupport (>= 4.2.0)
105 multi_json (>= 1.2) 106 multi_json (>= 1.2)
106 jmespath (1.3.1) 107 jmespath (1.3.1)
107 jquery-rails (3.1.2) 108 jquery-rails (3.1.2)
108 railties (>= 3.0, < 5.0) 109 railties (>= 3.0, < 5.0)
109 thor (>= 0.14, < 2.0) 110 thor (>= 0.14, < 2.0)
110 json (1.8.3) 111 json (1.8.3)
111 - libv8 (3.16.14.17) 112 + libv8 (3.16.14.19)
112 loofah (2.0.3) 113 loofah (2.0.3)
113 nokogiri (>= 1.5.9) 114 nokogiri (>= 1.5.9)
114 mail (2.7.0) 115 mail (2.7.0)
@@ -116,7 +117,7 @@ GEM @@ -116,7 +117,7 @@ GEM
116 mini_mime (1.0.0) 117 mini_mime (1.0.0)
117 mini_portile (0.5.3) 118 mini_portile (0.5.3)
118 minitest (5.8.4) 119 minitest (5.8.4)
119 - multi_json (1.12.1) 120 + multi_json (1.12.2)
120 nokogiri (1.6.1) 121 nokogiri (1.6.1)
121 mini_portile (~> 0.5.0) 122 mini_portile (~> 0.5.0)
122 orm_adapter (0.5.0) 123 orm_adapter (0.5.0)
@@ -154,6 +155,9 @@ GEM @@ -154,6 +155,9 @@ GEM
154 rake (>= 0.8.7) 155 rake (>= 0.8.7)
155 thor (>= 0.18.1, < 2.0) 156 thor (>= 0.18.1, < 2.0)
156 rake (11.1.2) 157 rake (11.1.2)
  158 + rb-fsevent (0.10.2)
  159 + rb-inotify (0.9.10)
  160 + ffi (>= 0.5.0, < 2)
157 rdoc (4.3.0) 161 rdoc (4.3.0)
158 ref (2.0.0) 162 ref (2.0.0)
159 responders (2.4.0) 163 responders (2.4.0)
@@ -176,8 +180,12 @@ GEM @@ -176,8 +180,12 @@ GEM
176 rspec-mocks (~> 3.4.0) 180 rspec-mocks (~> 3.4.0)
177 rspec-support (~> 3.4.0) 181 rspec-support (~> 3.4.0)
178 rspec-support (3.4.1) 182 rspec-support (3.4.1)
179 - sass (3.4.23)  
180 - sass-rails (5.0.6) 183 + sass (3.5.3)
  184 + sass-listen (~> 4.0.0)
  185 + sass-listen (4.0.0)
  186 + rb-fsevent (~> 0.9, >= 0.9.4)
  187 + rb-inotify (~> 0.9, >= 0.9.7)
  188 + sass-rails (5.0.7)
181 railties (>= 4.0.0, < 6) 189 railties (>= 4.0.0, < 6)
182 sass (~> 3.1) 190 sass (~> 3.1)
183 sprockets (>= 2.8, < 4.0) 191 sprockets (>= 2.8, < 4.0)
@@ -189,7 +197,7 @@ GEM @@ -189,7 +197,7 @@ GEM
189 sprockets (3.7.1) 197 sprockets (3.7.1)
190 concurrent-ruby (~> 1.0) 198 concurrent-ruby (~> 1.0)
191 rack (> 1, < 3) 199 rack (> 1, < 3)
192 - sprockets-rails (3.2.0) 200 + sprockets-rails (3.2.1)
193 actionpack (>= 4.0) 201 actionpack (>= 4.0)
194 activesupport (>= 4.0) 202 activesupport (>= 4.0)
195 sprockets (>= 3.0.0) 203 sprockets (>= 3.0.0)
@@ -198,10 +206,10 @@ GEM @@ -198,10 +206,10 @@ GEM
198 ref 206 ref
199 thor (0.19.1) 207 thor (0.19.1)
200 thread_safe (0.3.5) 208 thread_safe (0.3.5)
201 - tilt (2.0.7) 209 + tilt (2.0.8)
202 tzinfo (1.2.2) 210 tzinfo (1.2.2)
203 thread_safe (~> 0.1) 211 thread_safe (~> 0.1)
204 - uglifier (3.2.0) 212 + uglifier (4.0.2)
205 execjs (>= 0.3.0, < 3) 213 execjs (>= 0.3.0, < 3)
206 warden (1.2.7) 214 warden (1.2.7)
207 rack (>= 1.0) 215 rack (>= 1.0)
@@ -45,7 +45,7 @@ Gem::Specification.new do |s| @@ -45,7 +45,7 @@ Gem::Specification.new do |s|
45 45
46 s.add_dependency "pg", '0.17.1' 46 s.add_dependency "pg", '0.17.1'
47 47
48 - s.add_dependency 'aws-sdk' 48 + s.add_dependency 'aws-sdk', '2.6.32'
49 49
50 s.add_dependency 'delayed_job_active_record' 50 s.add_dependency 'delayed_job_active_record'
51 51
1 module Kanjai 1 module Kanjai
2 - VERSION = "0.0.73" 2 + VERSION = "0.0.74"
3 end 3 end