EDIT / kanjai · Commits

Commit 2409aa9833225ffe6b5cdc4840b353725f1f1ea0

Authored by Karpikau Andrei
1 parent a35297be

chanhe version

Inline Side-by-side
Showing 3 changed files with 119 additions and 98 deletions
@@ -129,37 +129,36 @@ @@ -129,37 +129,36 @@
129 <orderEntry type="library" scope="PROVIDED" name="activerecord (v4.2.6, rbenv: 2.1.3) [gem]" level="application" /> 129 <orderEntry type="library" scope="PROVIDED" name="activerecord (v4.2.6, rbenv: 2.1.3) [gem]" level="application" />
130 <orderEntry type="library" scope="PROVIDED" name="activesupport (v4.2.6, rbenv: 2.1.3) [gem]" level="application" /> 130 <orderEntry type="library" scope="PROVIDED" name="activesupport (v4.2.6, 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" /> 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.6.1, rbenv: 2.1.3) [gem]" level="application" />  
133 - <orderEntry type="library" scope="PROVIDED" name="arel (v6.0.3, rbenv: 2.1.3) [gem]" level="application" />  
134 - <orderEntry type="library" scope="PROVIDED" name="aws-sdk (v2.9.20, 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.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" />
  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" />
  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" />
140 <orderEntry type="library" scope="PROVIDED" name="builder (v3.2.2, rbenv: 2.1.3) [gem]" level="application" /> 140 <orderEntry type="library" scope="PROVIDED" name="builder (v3.2.2, 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" /> 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.2, rbenv: 2.1.3) [gem]" level="application" />  
143 - <orderEntry type="library" scope="PROVIDED" name="daemons (v1.2.4, 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" />
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.2, rbenv: 2.1.3) [gem]" level="application" />
145 - <orderEntry type="library" scope="PROVIDED" name="delayed_job_active_record (v4.1.1, 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" />
148 <orderEntry type="library" scope="PROVIDED" name="erubis (v2.7.0, rbenv: 2.1.3) [gem]" level="application" /> 148 <orderEntry type="library" scope="PROVIDED" name="erubis (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" /> 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="globalid (v0.3.7, 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="i18n (v0.7.0, 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="jbuilder (v2.6.4, 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="jmespath (v1.3.1, 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="jquery-rails (v3.1.2, 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="json (v1.8.3, 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="libv8 (v3.16.14.17, 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="loofah (v2.0.3, 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="mail (v2.6.4, rbenv: 2.1.3) [gem]" level="application" />  
161 - <orderEntry type="library" scope="PROVIDED" name="mime-types (v3.1, rbenv: 2.1.3) [gem]" level="application" />  
162 - <orderEntry type="library" scope="PROVIDED" name="mime-types-data (v3.2016.0521, 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="mini_mime (v1.0.0, 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" /> 162 <orderEntry type="library" scope="PROVIDED" name="mini_portile (v0.5.3, 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" /> 163 <orderEntry type="library" scope="PROVIDED" name="minitest (v5.8.4, rbenv: 2.1.3) [gem]" level="application" />
165 <orderEntry type="library" scope="PROVIDED" name="multi_json (v1.12.1, 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" />
@@ -179,24 +178,24 @@ @@ -179,24 +178,24 @@
179 <orderEntry type="library" scope="PROVIDED" name="rake (v11.1.2, 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" />
180 <orderEntry type="library" scope="PROVIDED" name="rdoc (v4.3.0, 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" />
181 <orderEntry type="library" scope="PROVIDED" name="ref (v2.0.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" />
182 - <orderEntry type="library" scope="PROVIDED" name="responders (v2.3.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" />
183 <orderEntry type="library" scope="PROVIDED" name="rspec-core (v3.4.4, rbenv: 2.1.3) [gem]" level="application" /> 182 <orderEntry type="library" scope="PROVIDED" name="rspec-core (v3.4.4, rbenv: 2.1.3) [gem]" level="application" />
184 <orderEntry type="library" scope="PROVIDED" name="rspec-expectations (v3.4.0, rbenv: 2.1.3) [gem]" level="application" /> 183 <orderEntry type="library" scope="PROVIDED" name="rspec-expectations (v3.4.0, rbenv: 2.1.3) [gem]" level="application" />
185 <orderEntry type="library" scope="PROVIDED" name="rspec-mocks (v3.4.1, rbenv: 2.1.3) [gem]" level="application" /> 184 <orderEntry type="library" scope="PROVIDED" name="rspec-mocks (v3.4.1, rbenv: 2.1.3) [gem]" level="application" />
186 <orderEntry type="library" scope="PROVIDED" name="rspec-rails (v3.4.2, 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" />
187 <orderEntry type="library" scope="PROVIDED" name="rspec-support (v3.4.1, 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" />
188 - <orderEntry type="library" scope="PROVIDED" name="sass (v3.4.22, rbenv: 2.1.3) [gem]" level="application" />  
189 - <orderEntry type="library" scope="PROVIDED" name="sass-rails (v5.0.6, 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" />
  188 + <orderEntry type="library" scope="PROVIDED" name="sass-rails (v5.0.7, rbenv: 2.1.3) [gem]" level="application" />
190 <orderEntry type="library" scope="PROVIDED" name="sdoc (v0.4.2, 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" />
191 - <orderEntry type="library" scope="PROVIDED" name="sprockets (v3.7.0, 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" />
192 <orderEntry type="library" scope="PROVIDED" name="sprockets-rails (v3.2.0, 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" />
193 <orderEntry type="library" scope="PROVIDED" name="therubyracer (v0.12.2, 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" />
194 <orderEntry type="library" scope="PROVIDED" name="thor (v0.19.1, 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" />
195 <orderEntry type="library" scope="PROVIDED" name="thread_safe (v0.3.5, 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" />
196 - <orderEntry type="library" scope="PROVIDED" name="tilt (v2.0.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" />
197 <orderEntry type="library" scope="PROVIDED" name="tzinfo (v1.2.2, 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" />
198 - <orderEntry type="library" scope="PROVIDED" name="uglifier (v3.2.0, rbenv: 2.1.3) [gem]" level="application" />  
199 - <orderEntry type="library" scope="PROVIDED" name="warden (v1.2.6, 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" />
  198 + <orderEntry type="library" scope="PROVIDED" name="warden (v1.2.7, rbenv: 2.1.3) [gem]" level="application" />
200 </component> 199 </component>
201 <component name="RModuleSettingsStorage"> 200 <component name="RModuleSettingsStorage">
202 <LOAD_PATH number="0" /> 201 <LOAD_PATH number="0" />
@@ -2,24 +2,9 @@ @@ -2,24 +2,9 @@
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="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/controllers/kanjai/form_controller.rb" />  
6 - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/mailers/kanjai_mailer.rb" />  
7 - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/views/kanjai_mailer/send_mail.html.erb" />  
8 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/.generators" afterPath="$PROJECT_DIR$/.idea/.generators" />  
9 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/kanjai.iml" afterPath="$PROJECT_DIR$/.idea/kanjai.iml" /> 5 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/kanjai.iml" afterPath="$PROJECT_DIR$/.idea/kanjai.iml" />
10 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/runConfigurations/Development__kanjai.xml" afterPath="$PROJECT_DIR$/.idea/runConfigurations/Development__kanjai.xml" />  
11 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/runConfigurations/Production__kanjai.xml" afterPath="$PROJECT_DIR$/.idea/runConfigurations/Production__kanjai.xml" />  
12 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/runConfigurations/spec__kanjai.xml" afterPath="$PROJECT_DIR$/.idea/runConfigurations/spec__kanjai.xml" />  
13 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/runConfigurations/test__kanjai.xml" afterPath="$PROJECT_DIR$/.idea/runConfigurations/test__kanjai.xml" />  
14 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/vcs.xml" afterPath="$PROJECT_DIR$/.idea/vcs.xml" />  
15 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> 6 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
16 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/controllers/kanjai/admin/pages_controller.rb" afterPath="$PROJECT_DIR$/app/controllers/kanjai/admin/pages_controller.rb" />  
17 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/models/kanjai/page_content.rb" afterPath="$PROJECT_DIR$/app/models/kanjai/page_content.rb" />  
18 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/views/kanjai/admin/pages/content_types/_content.html.erb" afterPath="$PROJECT_DIR$/app/views/kanjai/admin/pages/content_types/_content.html.erb" />  
19 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/views/kanjai/admin/pages/show_editor.html.erb" afterPath="$PROJECT_DIR$/app/views/kanjai/admin/pages/show_editor.html.erb" />  
20 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/config/routes.rb" afterPath="$PROJECT_DIR$/config/routes.rb" />  
21 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/kanjai/template_generator.rb" afterPath="$PROJECT_DIR$/lib/kanjai/template_generator.rb" />  
22 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/kanjai/version.rb" afterPath="$PROJECT_DIR$/lib/kanjai/version.rb" /> 7 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Gemfile.lock" afterPath="$PROJECT_DIR$/Gemfile.lock" />
23 </list> 8 </list>
24 <ignored path="kanjai.iws" /> 9 <ignored path="kanjai.iws" />
25 <ignored path=".idea/workspace.xml" /> 10 <ignored path=".idea/workspace.xml" />
@@ -40,6 +25,26 @@ @@ -40,6 +25,26 @@
40 </component> 25 </component>
41 <component name="FileEditorManager"> 26 <component name="FileEditorManager">
42 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> 27 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
  28 + <file leaf-file-name="Gemfile" pinned="false" current-in-tab="false">
  29 + <entry file="file://$PROJECT_DIR$/Gemfile">
  30 + <provider selected="true" editor-type-id="text-editor">
  31 + <state relative-caret-position="0">
  32 + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  33 + <folding />
  34 + </state>
  35 + </provider>
  36 + </entry>
  37 + </file>
  38 + <file leaf-file-name="kanjai.gemspec" pinned="false" current-in-tab="false">
  39 + <entry file="file://$PROJECT_DIR$/kanjai.gemspec">
  40 + <provider selected="true" editor-type-id="text-editor">
  41 + <state relative-caret-position="300">
  42 + <caret line="20" column="24" lean-forward="false" selection-start-line="20" selection-start-column="20" selection-end-line="20" selection-end-column="24" />
  43 + <folding />
  44 + </state>
  45 + </provider>
  46 + </entry>
  47 + </file>
43 <file leaf-file-name="pages_controller.rb" pinned="false" current-in-tab="false"> 48 <file leaf-file-name="pages_controller.rb" pinned="false" current-in-tab="false">
44 <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin/pages_controller.rb"> 49 <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin/pages_controller.rb">
45 <provider selected="true" editor-type-id="text-editor"> 50 <provider selected="true" editor-type-id="text-editor">
@@ -80,6 +85,16 @@ @@ -80,6 +85,16 @@
80 </provider> 85 </provider>
81 </entry> 86 </entry>
82 </file> 87 </file>
  88 + <file leaf-file-name="Gemfile.lock" pinned="false" current-in-tab="false">
  89 + <entry file="file://$PROJECT_DIR$/Gemfile.lock">
  90 + <provider selected="true" editor-type-id="text-editor">
  91 + <state relative-caret-position="-865">
  92 + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  93 + <folding />
  94 + </state>
  95 + </provider>
  96 + </entry>
  97 + </file>
83 <file leaf-file-name="admin.rb" pinned="false" current-in-tab="false"> 98 <file leaf-file-name="admin.rb" pinned="false" current-in-tab="false">
84 <entry file="file://$PROJECT_DIR$/lib/admin.rb"> 99 <entry file="file://$PROJECT_DIR$/lib/admin.rb">
85 <provider selected="true" editor-type-id="text-editor"> 100 <provider selected="true" editor-type-id="text-editor">
@@ -104,7 +119,7 @@ @@ -104,7 +119,7 @@
104 <entry file="file://$PROJECT_DIR$/lib/kanjai/version.rb"> 119 <entry file="file://$PROJECT_DIR$/lib/kanjai/version.rb">
105 <provider selected="true" editor-type-id="text-editor"> 120 <provider selected="true" editor-type-id="text-editor">
106 <state relative-caret-position="15"> 121 <state relative-caret-position="15">
107 - <caret line="1" column="19" lean-forward="false" selection-start-line="1" selection-start-column="19" selection-end-line="1" selection-end-column="19" /> 122 + <caret line="1" column="13" lean-forward="false" selection-start-line="1" selection-start-column="13" selection-end-line="1" selection-end-column="13" />
108 <folding /> 123 <folding />
109 </state> 124 </state>
110 </provider> 125 </provider>
@@ -121,8 +136,16 @@ @@ -121,8 +136,16 @@
121 <find>element</find> 136 <find>element</find>
122 <find>gsub!</find> 137 <find>gsub!</find>
123 <find>replace_attributes_marker</find> 138 <find>replace_attributes_marker</find>
124 - <find>subpart_generate</find>  
125 <find>content_generator</find> 139 <find>content_generator</find>
  140 + <find>subpart_generate</find>
  141 + <find>71</find>
  142 + <find>071</find>
  143 + <find>0.71</find>
  144 + <find>0.071</find>
  145 + <find>0.0.71</find>
  146 + <find>0.0.7</find>
  147 + <find>0.0.72</find>
  148 + <find>sass</find>
126 </findStrings> 149 </findStrings>
127 <dirStrings> 150 <dirStrings>
128 <dir>$PROJECT_DIR$</dir> 151 <dir>$PROJECT_DIR$</dir>
@@ -654,12 +677,12 @@ @@ -654,12 +677,12 @@
654 <workItem from="1500931211896" duration="152000" /> 677 <workItem from="1500931211896" duration="152000" />
655 <workItem from="1500931637579" duration="304000" /> 678 <workItem from="1500931637579" duration="304000" />
656 <workItem from="1501482504677" duration="10000" /> 679 <workItem from="1501482504677" duration="10000" />
657 - <workItem from="1513232887722" duration="8211000" /> 680 + <workItem from="1513232887722" duration="9778000" />
658 </task> 681 </task>
659 <servers /> 682 <servers />
660 </component> 683 </component>
661 <component name="TimeTrackingManager"> 684 <component name="TimeTrackingManager">
662 - <option name="totallyTimeSpent" value="12024000" /> 685 + <option name="totallyTimeSpent" value="13591000" />
663 </component> 686 </component>
664 <component name="ToolWindowManager"> 687 <component name="ToolWindowManager">
665 <frame x="0" y="23" width="1280" height="730" extended-state="6" /> 688 <frame x="0" y="23" width="1280" height="730" extended-state="6" />
@@ -834,14 +857,6 @@ @@ -834,14 +857,6 @@
834 </state> 857 </state>
835 </provider> 858 </provider>
836 </entry> 859 </entry>
837 - <entry file="file://$PROJECT_DIR$/Gemfile.lock">  
838 - <provider selected="true" editor-type-id="text-editor">  
839 - <state relative-caret-position="0">  
840 - <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />  
841 - <folding />  
842 - </state>  
843 - </provider>  
844 - </entry>  
845 <entry file="file://$PROJECT_DIR$/.ruby-version"> 860 <entry file="file://$PROJECT_DIR$/.ruby-version">
846 <provider selected="true" editor-type-id="text-editor"> 861 <provider selected="true" editor-type-id="text-editor">
847 <state relative-caret-position="0"> 862 <state relative-caret-position="0">
@@ -850,14 +865,6 @@ @@ -850,14 +865,6 @@
850 </state> 865 </state>
851 </provider> 866 </provider>
852 </entry> 867 </entry>
853 - <entry file="file://$PROJECT_DIR$/kanjai.gemspec">  
854 - <provider selected="true" editor-type-id="text-editor">  
855 - <state relative-caret-position="600">  
856 - <caret line="40" column="26" lean-forward="false" selection-start-line="40" selection-start-column="20" selection-end-line="40" selection-end-column="26" />  
857 - <folding />  
858 - </state>  
859 - </provider>  
860 - </entry>  
861 <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin_controller.rb"> 868 <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin_controller.rb">
862 <provider selected="true" editor-type-id="text-editor"> 869 <provider selected="true" editor-type-id="text-editor">
863 <state relative-caret-position="90"> 870 <state relative-caret-position="90">
@@ -882,14 +889,6 @@ @@ -882,14 +889,6 @@
882 </state> 889 </state>
883 </provider> 890 </provider>
884 </entry> 891 </entry>
885 - <entry file="file://$PROJECT_DIR$/Gemfile">  
886 - <provider selected="true" editor-type-id="text-editor">  
887 - <state relative-caret-position="0">  
888 - <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />  
889 - <folding />  
890 - </state>  
891 - </provider>  
892 - </entry>  
893 <entry file="file://$PROJECT_DIR$/app/models/kanjai/page_template.rb"> 892 <entry file="file://$PROJECT_DIR$/app/models/kanjai/page_template.rb">
894 <provider selected="true" editor-type-id="text-editor"> 893 <provider selected="true" editor-type-id="text-editor">
895 <state relative-caret-position="391"> 894 <state relative-caret-position="391">
@@ -1066,7 +1065,7 @@ @@ -1066,7 +1065,7 @@
1066 </state> 1065 </state>
1067 </provider> 1066 </provider>
1068 </entry> 1067 </entry>
1069 - <entry file="file://$PROJECT_DIR$/lib/kanjai.rb"> 1068 + <entry file="file://$PROJECT_DIR$/lib/admin.rb">
1070 <provider selected="true" editor-type-id="text-editor"> 1069 <provider selected="true" editor-type-id="text-editor">
1071 <state relative-caret-position="0"> 1070 <state relative-caret-position="0">
1072 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 1071 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
@@ -1074,7 +1073,7 @@ @@ -1074,7 +1073,7 @@
1074 </state> 1073 </state>
1075 </provider> 1074 </provider>
1076 </entry> 1075 </entry>
1077 - <entry file="file://$PROJECT_DIR$/lib/admin.rb"> 1076 + <entry file="file://$PROJECT_DIR$/lib/kanjai.rb">
1078 <provider selected="true" editor-type-id="text-editor"> 1077 <provider selected="true" editor-type-id="text-editor">
1079 <state relative-caret-position="0"> 1078 <state relative-caret-position="0">
1080 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 1079 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
@@ -1090,10 +1089,34 @@ @@ -1090,10 +1089,34 @@
1090 </state> 1089 </state>
1091 </provider> 1090 </provider>
1092 </entry> 1091 </entry>
  1092 + <entry file="file://$PROJECT_DIR$/Gemfile">
  1093 + <provider selected="true" editor-type-id="text-editor">
  1094 + <state relative-caret-position="0">
  1095 + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  1096 + <folding />
  1097 + </state>
  1098 + </provider>
  1099 + </entry>
  1100 + <entry file="file://$PROJECT_DIR$/Gemfile.lock">
  1101 + <provider selected="true" editor-type-id="text-editor">
  1102 + <state relative-caret-position="-865">
  1103 + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  1104 + <folding />
  1105 + </state>
  1106 + </provider>
  1107 + </entry>
  1108 + <entry file="file://$PROJECT_DIR$/kanjai.gemspec">
  1109 + <provider selected="true" editor-type-id="text-editor">
  1110 + <state relative-caret-position="300">
  1111 + <caret line="20" column="24" lean-forward="false" selection-start-line="20" selection-start-column="20" selection-end-line="20" selection-end-column="24" />
  1112 + <folding />
  1113 + </state>
  1114 + </provider>
  1115 + </entry>
1093 <entry file="file://$PROJECT_DIR$/lib/kanjai/version.rb"> 1116 <entry file="file://$PROJECT_DIR$/lib/kanjai/version.rb">
1094 <provider selected="true" editor-type-id="text-editor"> 1117 <provider selected="true" editor-type-id="text-editor">
1095 <state relative-caret-position="15"> 1118 <state relative-caret-position="15">
1096 - <caret line="1" column="19" lean-forward="false" selection-start-line="1" selection-start-column="19" selection-end-line="1" selection-end-column="19" /> 1119 + <caret line="1" column="13" lean-forward="false" selection-start-line="1" selection-start-column="13" selection-end-line="1" selection-end-column="13" />
1097 <folding /> 1120 <folding />
1098 </state> 1121 </state>
1099 </provider> 1122 </provider>
1 PATH 1 PATH
2 remote: . 2 remote: .
3 specs: 3 specs:
4 - kanjai (0.0.71) 4 + kanjai (0.0.72)
5 acts_as_list 5 acts_as_list
6 acts_as_tree 6 acts_as_tree
7 aws-sdk 7 aws-sdk
@@ -59,34 +59,34 @@ GEM @@ -59,34 +59,34 @@ GEM
59 minitest (~> 5.1) 59 minitest (~> 5.1)
60 thread_safe (~> 0.3, >= 0.3.4) 60 thread_safe (~> 0.3, >= 0.3.4)
61 tzinfo (~> 1.1) 61 tzinfo (~> 1.1)
62 - acts_as_list (0.8.2) 62 + acts_as_list (0.9.5)
63 activerecord (>= 3.0) 63 activerecord (>= 3.0)
64 - acts_as_tree (2.6.0) 64 + acts_as_tree (2.7.0)
65 activerecord (>= 3.0.0) 65 activerecord (>= 3.0.0)
66 - arel (6.0.3)  
67 - aws-sdk (2.6.32)  
68 - aws-sdk-resources (= 2.6.32)  
69 - aws-sdk-core (2.6.32) 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)
70 aws-sigv4 (~> 1.0) 70 aws-sigv4 (~> 1.0)
71 jmespath (~> 1.0) 71 jmespath (~> 1.0)
72 - aws-sdk-resources (2.6.32)  
73 - aws-sdk-core (= 2.6.32)  
74 - aws-sigv4 (1.0.0) 72 + aws-sdk-resources (2.9.20)
  73 + aws-sdk-core (= 2.9.20)
  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.2) 79 + concurrent-ruby (1.0.5)
80 daemons (1.2.4) 80 daemons (1.2.4)
81 delayed_job (4.1.2) 81 delayed_job (4.1.2)
82 activesupport (>= 3.0, < 5.1) 82 activesupport (>= 3.0, < 5.1)
83 delayed_job_active_record (4.1.1) 83 delayed_job_active_record (4.1.1)
84 activerecord (>= 3.0, < 5.1) 84 activerecord (>= 3.0, < 5.1)
85 delayed_job (>= 3.0, < 5) 85 delayed_job (>= 3.0, < 5)
86 - devise (4.2.0) 86 + devise (4.3.0)
87 bcrypt (~> 3.0) 87 bcrypt (~> 3.0)
88 orm_adapter (~> 0.1) 88 orm_adapter (~> 0.1)
89 - railties (>= 4.1.0, < 5.1) 89 + railties (>= 4.1.0, < 5.2)
90 responders 90 responders
91 warden (~> 1.2.3) 91 warden (~> 1.2.3)
92 diff-lcs (1.2.5) 92 diff-lcs (1.2.5)
@@ -97,12 +97,12 @@ GEM @@ -97,12 +97,12 @@ 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 - globalid (0.3.7)  
101 - activesupport (>= 4.1.0) 100 + globalid (0.4.1)
  101 + activesupport (>= 4.2.0)
102 i18n (0.7.0) 102 i18n (0.7.0)
103 - jbuilder (2.6.1)  
104 - activesupport (>= 3.0.0, < 5.1)  
105 - multi_json (~> 1.2) 103 + jbuilder (2.6.4)
  104 + activesupport (>= 3.0.0)
  105 + multi_json (>= 1.2)
106 jmespath (1.3.1) 106 jmespath (1.3.1)
107 jquery-rails (3.1.2) 107 jquery-rails (3.1.2)
108 railties (>= 3.0, < 5.0) 108 railties (>= 3.0, < 5.0)
@@ -111,11 +111,9 @@ GEM @@ -111,11 +111,9 @@ GEM
111 libv8 (3.16.14.17) 111 libv8 (3.16.14.17)
112 loofah (2.0.3) 112 loofah (2.0.3)
113 nokogiri (>= 1.5.9) 113 nokogiri (>= 1.5.9)
114 - mail (2.6.4)  
115 - mime-types (>= 1.16, < 4)  
116 - mime-types (3.1)  
117 - mime-types-data (~> 3.2015)  
118 - mime-types-data (3.2016.0521) 114 + mail (2.7.0)
  115 + mini_mime (>= 0.1.1)
  116 + mini_mime (1.0.0)
119 mini_portile (0.5.3) 117 mini_portile (0.5.3)
120 minitest (5.8.4) 118 minitest (5.8.4)
121 multi_json (1.12.1) 119 multi_json (1.12.1)
@@ -158,8 +156,9 @@ GEM @@ -158,8 +156,9 @@ GEM
158 rake (11.1.2) 156 rake (11.1.2)
159 rdoc (4.3.0) 157 rdoc (4.3.0)
160 ref (2.0.0) 158 ref (2.0.0)
161 - responders (2.3.0)  
162 - railties (>= 4.2.0, < 5.1) 159 + responders (2.4.0)
  160 + actionpack (>= 4.2.0, < 5.3)
  161 + railties (>= 4.2.0, < 5.3)
163 rspec-core (3.4.4) 162 rspec-core (3.4.4)
164 rspec-support (~> 3.4.0) 163 rspec-support (~> 3.4.0)
165 rspec-expectations (3.4.0) 164 rspec-expectations (3.4.0)
@@ -177,7 +176,7 @@ GEM @@ -177,7 +176,7 @@ GEM
177 rspec-mocks (~> 3.4.0) 176 rspec-mocks (~> 3.4.0)
178 rspec-support (~> 3.4.0) 177 rspec-support (~> 3.4.0)
179 rspec-support (3.4.1) 178 rspec-support (3.4.1)
180 - sass (3.4.22) 179 + sass (3.4.23)
181 sass-rails (5.0.6) 180 sass-rails (5.0.6)
182 railties (>= 4.0.0, < 6) 181 railties (>= 4.0.0, < 6)
183 sass (~> 3.1) 182 sass (~> 3.1)
@@ -187,7 +186,7 @@ GEM @@ -187,7 +186,7 @@ GEM
187 sdoc (0.4.2) 186 sdoc (0.4.2)
188 json (~> 1.7, >= 1.7.7) 187 json (~> 1.7, >= 1.7.7)
189 rdoc (~> 4.0) 188 rdoc (~> 4.0)
190 - sprockets (3.7.0) 189 + sprockets (3.7.1)
191 concurrent-ruby (~> 1.0) 190 concurrent-ruby (~> 1.0)
192 rack (> 1, < 3) 191 rack (> 1, < 3)
193 sprockets-rails (3.2.0) 192 sprockets-rails (3.2.0)
@@ -199,12 +198,12 @@ GEM @@ -199,12 +198,12 @@ GEM
199 ref 198 ref
200 thor (0.19.1) 199 thor (0.19.1)
201 thread_safe (0.3.5) 200 thread_safe (0.3.5)
202 - tilt (2.0.5) 201 + tilt (2.0.7)
203 tzinfo (1.2.2) 202 tzinfo (1.2.2)
204 thread_safe (~> 0.1) 203 thread_safe (~> 0.1)
205 - uglifier (3.0.4) 204 + uglifier (3.2.0)
206 execjs (>= 0.3.0, < 3) 205 execjs (>= 0.3.0, < 3)
207 - warden (1.2.6) 206 + warden (1.2.7)
208 rack (>= 1.0) 207 rack (>= 1.0)
209 208
210 PLATFORMS 209 PLATFORMS