EDIT / kanjai · Commits

Commit 1c9986b0186d8110dba8aac7cebabdccefa1fef4

Authored by Karpikau Andrei
1 parent 68edaefe

change version

Inline Side-by-side
Showing 6 changed files with 197 additions and 593 deletions
@@ -16,7 +16,7 @@ @@ -16,7 +16,7 @@
16 <shared> 16 <shared>
17 <configuration default="false" name="test: kanjai" type="RakeRunConfigurationType" factoryName="Rake"> 17 <configuration default="false" name="test: kanjai" type="RakeRunConfigurationType" factoryName="Rake">
18 <module name="kanjai" /> 18 <module name="kanjai" />
19 - <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RUBY_ARGS" VALUE="-e $stdout.sync=true;$stderr.sync=true;load($0=ARGV.shift)" /> 19 + <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RUBY_ARGS" VALUE="" />
20 <RAKE_RUN_CONFIG_SETTINGS_ID NAME="WORK DIR" VALUE="$MODULE_DIR$" /> 20 <RAKE_RUN_CONFIG_SETTINGS_ID NAME="WORK DIR" VALUE="$MODULE_DIR$" />
21 <RAKE_RUN_CONFIG_SETTINGS_ID NAME="SHOULD_USE_SDK" VALUE="false" /> 21 <RAKE_RUN_CONFIG_SETTINGS_ID NAME="SHOULD_USE_SDK" VALUE="false" />
22 <RAKE_RUN_CONFIG_SETTINGS_ID NAME="ALTERN_SDK_NAME" VALUE="" /> 22 <RAKE_RUN_CONFIG_SETTINGS_ID NAME="ALTERN_SDK_NAME" VALUE="" />
@@ -26,7 +26,7 @@ @@ -26,7 +26,7 @@
26 </envs> 26 </envs>
27 <EXTENSION ID="BundlerRunConfigurationExtension" bundleExecEnabled="false" /> 27 <EXTENSION ID="BundlerRunConfigurationExtension" bundleExecEnabled="false" />
28 <EXTENSION ID="JRubyRunConfigurationExtension" NailgunExecEnabled="false" /> 28 <EXTENSION ID="JRubyRunConfigurationExtension" NailgunExecEnabled="false" />
29 - <EXTENSION ID="RubyCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" track_test_folders="true" runner="rcov"> 29 + <EXTENSION ID="RubyCoverageRunConfigurationExtension" track_test_folders="true" runner="rcov">
30 <COVERAGE_PATTERN ENABLED="true"> 30 <COVERAGE_PATTERN ENABLED="true">
31 <PATTERN REGEXPS="/.rvm/" INCLUDED="false" /> 31 <PATTERN REGEXPS="/.rvm/" INCLUDED="false" />
32 </COVERAGE_PATTERN> 32 </COVERAGE_PATTERN>
@@ -37,19 +37,18 @@ @@ -37,19 +37,18 @@
37 <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_OPTION_TRACE" VALUE="false" /> 37 <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_OPTION_TRACE" VALUE="false" />
38 <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_OPTION_DRYRUN" VALUE="false" /> 38 <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_OPTION_DRYRUN" VALUE="false" />
39 <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_OPTION_PREREQS" VALUE="false" /> 39 <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_OPTION_PREREQS" VALUE="false" />
40 - <method /> 40 + <method v="2" />
41 </configuration> 41 </configuration>
42 <configuration default="false" name="spec: kanjai" type="RakeRunConfigurationType" factoryName="Rake"> 42 <configuration default="false" name="spec: kanjai" type="RakeRunConfigurationType" factoryName="Rake">
43 <module name="kanjai" /> 43 <module name="kanjai" />
44 - <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RUBY_ARGS" VALUE="-e $stdout.sync=true;$stderr.sync=true;load($0=ARGV.shift)" /> 44 + <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RUBY_ARGS" VALUE="" />
45 <RAKE_RUN_CONFIG_SETTINGS_ID NAME="WORK DIR" VALUE="$MODULE_DIR$" /> 45 <RAKE_RUN_CONFIG_SETTINGS_ID NAME="WORK DIR" VALUE="$MODULE_DIR$" />
46 <RAKE_RUN_CONFIG_SETTINGS_ID NAME="SHOULD_USE_SDK" VALUE="false" /> 46 <RAKE_RUN_CONFIG_SETTINGS_ID NAME="SHOULD_USE_SDK" VALUE="false" />
47 <RAKE_RUN_CONFIG_SETTINGS_ID NAME="ALTERN_SDK_NAME" VALUE="" /> 47 <RAKE_RUN_CONFIG_SETTINGS_ID NAME="ALTERN_SDK_NAME" VALUE="" />
48 <RAKE_RUN_CONFIG_SETTINGS_ID NAME="myPassParentEnvs" VALUE="true" /> 48 <RAKE_RUN_CONFIG_SETTINGS_ID NAME="myPassParentEnvs" VALUE="true" />
49 - <envs />  
50 <EXTENSION ID="BundlerRunConfigurationExtension" bundleExecEnabled="false" /> 49 <EXTENSION ID="BundlerRunConfigurationExtension" bundleExecEnabled="false" />
51 <EXTENSION ID="JRubyRunConfigurationExtension" NailgunExecEnabled="false" /> 50 <EXTENSION ID="JRubyRunConfigurationExtension" NailgunExecEnabled="false" />
52 - <EXTENSION ID="RubyCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" track_test_folders="true" runner="rcov"> 51 + <EXTENSION ID="RubyCoverageRunConfigurationExtension" track_test_folders="true" runner="rcov">
53 <COVERAGE_PATTERN ENABLED="true"> 52 <COVERAGE_PATTERN ENABLED="true">
54 <PATTERN REGEXPS="/.rvm/" INCLUDED="false" /> 53 <PATTERN REGEXPS="/.rvm/" INCLUDED="false" />
55 </COVERAGE_PATTERN> 54 </COVERAGE_PATTERN>
@@ -60,20 +59,19 @@ @@ -60,20 +59,19 @@
60 <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_OPTION_TRACE" VALUE="false" /> 59 <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_OPTION_TRACE" VALUE="false" />
61 <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_OPTION_DRYRUN" VALUE="false" /> 60 <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_OPTION_DRYRUN" VALUE="false" />
62 <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_OPTION_PREREQS" VALUE="false" /> 61 <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_OPTION_PREREQS" VALUE="false" />
63 - <method /> 62 + <method v="2" />
64 </configuration> 63 </configuration>
65 <configuration default="false" name="Production: kanjai" type="RailsRunConfigurationType" factoryName="Rails"> 64 <configuration default="false" name="Production: kanjai" type="RailsRunConfigurationType" factoryName="Rails">
66 <predefined_log_file id="RUBY_RAILS_SERVER" enabled="true" /> 65 <predefined_log_file id="RUBY_RAILS_SERVER" enabled="true" />
67 <module name="kanjai" /> 66 <module name="kanjai" />
68 - <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="RUBY_ARGS" VALUE="-e $stdout.sync=true;$stderr.sync=true;load($0=ARGV.shift)" /> 67 + <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="RUBY_ARGS" VALUE="" />
69 <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="WORK DIR" VALUE="$MODULE_DIR$" /> 68 <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="WORK DIR" VALUE="$MODULE_DIR$" />
70 <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="SHOULD_USE_SDK" VALUE="false" /> 69 <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="SHOULD_USE_SDK" VALUE="false" />
71 <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="ALTERN_SDK_NAME" VALUE="" /> 70 <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="ALTERN_SDK_NAME" VALUE="" />
72 <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="myPassParentEnvs" VALUE="true" /> 71 <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="myPassParentEnvs" VALUE="true" />
73 - <envs />  
74 <EXTENSION ID="BundlerRunConfigurationExtension" bundleExecEnabled="false" /> 72 <EXTENSION ID="BundlerRunConfigurationExtension" bundleExecEnabled="false" />
75 <EXTENSION ID="JRubyRunConfigurationExtension" NailgunExecEnabled="false" /> 73 <EXTENSION ID="JRubyRunConfigurationExtension" NailgunExecEnabled="false" />
76 - <EXTENSION ID="RubyCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" track_test_folders="true" runner="rcov"> 74 + <EXTENSION ID="RubyCoverageRunConfigurationExtension" track_test_folders="true" runner="rcov">
77 <COVERAGE_PATTERN ENABLED="true"> 75 <COVERAGE_PATTERN ENABLED="true">
78 <PATTERN REGEXPS="/.rvm/" INCLUDED="false" /> 76 <PATTERN REGEXPS="/.rvm/" INCLUDED="false" />
79 </COVERAGE_PATTERN> 77 </COVERAGE_PATTERN>
@@ -85,20 +83,19 @@ @@ -85,20 +83,19 @@
85 <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="RAILS_SERVER_TYPE" VALUE="Default" /> 83 <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="RAILS_SERVER_TYPE" VALUE="Default" />
86 <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="ENVIRONMENT_TYPE" VALUE="production" /> 84 <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="ENVIRONMENT_TYPE" VALUE="production" />
87 <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="LAUNCH_JS" VALUE="false" /> 85 <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="LAUNCH_JS" VALUE="false" />
88 - <method /> 86 + <method v="2" />
89 </configuration> 87 </configuration>
90 <configuration default="false" name="Development: kanjai" type="RailsRunConfigurationType" factoryName="Rails"> 88 <configuration default="false" name="Development: kanjai" type="RailsRunConfigurationType" factoryName="Rails">
91 <predefined_log_file id="RUBY_RAILS_SERVER" enabled="true" /> 89 <predefined_log_file id="RUBY_RAILS_SERVER" enabled="true" />
92 <module name="kanjai" /> 90 <module name="kanjai" />
93 - <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="RUBY_ARGS" VALUE="-e $stdout.sync=true;$stderr.sync=true;load($0=ARGV.shift)" /> 91 + <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="RUBY_ARGS" VALUE="" />
94 <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="WORK DIR" VALUE="$MODULE_DIR$" /> 92 <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="WORK DIR" VALUE="$MODULE_DIR$" />
95 <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="SHOULD_USE_SDK" VALUE="false" /> 93 <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="SHOULD_USE_SDK" VALUE="false" />
96 <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="ALTERN_SDK_NAME" VALUE="" /> 94 <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="ALTERN_SDK_NAME" VALUE="" />
97 <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="myPassParentEnvs" VALUE="true" /> 95 <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="myPassParentEnvs" VALUE="true" />
98 - <envs />  
99 <EXTENSION ID="BundlerRunConfigurationExtension" bundleExecEnabled="false" /> 96 <EXTENSION ID="BundlerRunConfigurationExtension" bundleExecEnabled="false" />
100 <EXTENSION ID="JRubyRunConfigurationExtension" NailgunExecEnabled="false" /> 97 <EXTENSION ID="JRubyRunConfigurationExtension" NailgunExecEnabled="false" />
101 - <EXTENSION ID="RubyCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" track_test_folders="true" runner="rcov"> 98 + <EXTENSION ID="RubyCoverageRunConfigurationExtension" track_test_folders="true" runner="rcov">
102 <COVERAGE_PATTERN ENABLED="true"> 99 <COVERAGE_PATTERN ENABLED="true">
103 <PATTERN REGEXPS="/.rvm/" INCLUDED="false" /> 100 <PATTERN REGEXPS="/.rvm/" INCLUDED="false" />
104 </COVERAGE_PATTERN> 101 </COVERAGE_PATTERN>
@@ -110,10 +107,9 @@ @@ -110,10 +107,9 @@
110 <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="RAILS_SERVER_TYPE" VALUE="Default" /> 107 <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="RAILS_SERVER_TYPE" VALUE="Default" />
111 <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="ENVIRONMENT_TYPE" VALUE="development" /> 108 <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="ENVIRONMENT_TYPE" VALUE="development" />
112 <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="LAUNCH_JS" VALUE="false" /> 109 <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="LAUNCH_JS" VALUE="false" />
113 - <method /> 110 + <method v="2" />
114 </configuration> 111 </configuration>
115 </shared> 112 </shared>
116 - <local />  
117 </component> 113 </component>
118 <component name="NewModuleRootManager"> 114 <component name="NewModuleRootManager">
119 <content url="file://$MODULE_DIR$"> 115 <content url="file://$MODULE_DIR$">
@@ -2,16 +2,14 @@ @@ -2,16 +2,14 @@
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 beforePath="$PROJECT_DIR$/.idea/kanjai.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/kanjai.iml" afterDir="false" />
5 <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> 6 <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
6 <change beforePath="$PROJECT_DIR$/Gemfile.lock" beforeDir="false" afterPath="$PROJECT_DIR$/Gemfile.lock" afterDir="false" /> 7 <change beforePath="$PROJECT_DIR$/Gemfile.lock" beforeDir="false" afterPath="$PROJECT_DIR$/Gemfile.lock" afterDir="false" />
7 - <change beforePath="$PROJECT_DIR$/config/initializers/admin.rb" beforeDir="false" afterPath="$PROJECT_DIR$/config/initializers/admin.rb" afterDir="false" />  
8 - <change beforePath="$PROJECT_DIR$/lib/kanjai/version.rb" beforeDir="false" afterPath="$PROJECT_DIR$/lib/kanjai/version.rb" afterDir="false" />  
9 </list> 8 </list>
10 <ignored path="kanjai.iws" /> 9 <ignored path="kanjai.iws" />
11 <ignored path=".idea/workspace.xml" /> 10 <ignored path=".idea/workspace.xml" />
12 <ignored path=".idea/dataSources.local.xml" /> 11 <ignored path=".idea/dataSources.local.xml" />
13 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> 12 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
14 - <option name="TRACKING_ENABLED" value="true" />  
15 <option name="SHOW_DIALOG" value="false" /> 13 <option name="SHOW_DIALOG" value="false" />
16 <option name="HIGHLIGHT_CONFLICTS" value="true" /> 14 <option name="HIGHLIGHT_CONFLICTS" value="true" />
17 <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" /> 15 <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -20,12 +18,24 @@ @@ -20,12 +18,24 @@
20 <component name="CreatePatchCommitExecutor"> 18 <component name="CreatePatchCommitExecutor">
21 <option name="PATCH_PATH" value="" /> 19 <option name="PATCH_PATH" value="" />
22 </component> 20 </component>
  21 + <component name="FUSProjectUsageTrigger">
  22 + <session id="1963050572">
  23 + <usages-collector id="statistics.lifecycle.project">
  24 + <counts>
  25 + <entry key="project.closed" value="1" />
  26 + <entry key="project.open.time.8" value="1" />
  27 + <entry key="project.open.time.9" value="1" />
  28 + <entry key="project.opened" value="2" />
  29 + </counts>
  30 + </usages-collector>
  31 + </session>
  32 + </component>
23 <component name="FavoritesManager"> 33 <component name="FavoritesManager">
24 <favorites_list name="kanjai" /> 34 <favorites_list name="kanjai" />
25 </component> 35 </component>
26 <component name="FileEditorManager"> 36 <component name="FileEditorManager">
27 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> 37 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
28 - <file leaf-file-name="aws.rb" pinned="false" current-in-tab="false"> 38 + <file pinned="false" current-in-tab="false">
29 <entry file="file://$PROJECT_DIR$/config/initializers/aws.rb"> 39 <entry file="file://$PROJECT_DIR$/config/initializers/aws.rb">
30 <provider selected="true" editor-type-id="text-editor"> 40 <provider selected="true" editor-type-id="text-editor">
31 <state relative-caret-position="75"> 41 <state relative-caret-position="75">
@@ -34,7 +44,7 @@ @@ -34,7 +44,7 @@
34 </provider> 44 </provider>
35 </entry> 45 </entry>
36 </file> 46 </file>
37 - <file leaf-file-name="template_generator.rb" pinned="false" current-in-tab="false"> 47 + <file pinned="false" current-in-tab="false">
38 <entry file="file://$PROJECT_DIR$/lib/kanjai/template_generator.rb"> 48 <entry file="file://$PROJECT_DIR$/lib/kanjai/template_generator.rb">
39 <provider selected="true" editor-type-id="text-editor"> 49 <provider selected="true" editor-type-id="text-editor">
40 <state relative-caret-position="3390"> 50 <state relative-caret-position="3390">
@@ -43,25 +53,25 @@ @@ -43,25 +53,25 @@
43 </provider> 53 </provider>
44 </entry> 54 </entry>
45 </file> 55 </file>
46 - <file leaf-file-name="pages_controller.rb" pinned="false" current-in-tab="false"> 56 + <file pinned="false" current-in-tab="false">
47 <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb"> 57 <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb">
48 <provider selected="true" editor-type-id="text-editor"> 58 <provider selected="true" editor-type-id="text-editor">
49 - <state relative-caret-position="495">  
50 - <caret line="33" column="34" selection-start-line="33" selection-start-column="34" selection-end-line="33" selection-end-column="34" /> 59 + <state relative-caret-position="465">
  60 + <caret line="31" selection-start-line="31" selection-end-line="31" />
51 </state> 61 </state>
52 </provider> 62 </provider>
53 </entry> 63 </entry>
54 </file> 64 </file>
55 - <file leaf-file-name="version.rb" pinned="false" current-in-tab="true"> 65 + <file pinned="false" current-in-tab="true">
56 <entry file="file://$PROJECT_DIR$/lib/kanjai/version.rb"> 66 <entry file="file://$PROJECT_DIR$/lib/kanjai/version.rb">
57 <provider selected="true" editor-type-id="text-editor"> 67 <provider selected="true" editor-type-id="text-editor">
58 - <state relative-caret-position="15">  
59 - <caret line="1" column="19" selection-start-line="1" selection-start-column="19" selection-end-line="1" selection-end-column="19" /> 68 + <state relative-caret-position="45">
  69 + <caret line="3" selection-start-line="3" selection-end-line="3" />
60 </state> 70 </state>
61 </provider> 71 </provider>
62 </entry> 72 </entry>
63 </file> 73 </file>
64 - <file leaf-file-name="Gemfile.lock" pinned="false" current-in-tab="false"> 74 + <file pinned="false" current-in-tab="false">
65 <entry file="file://$PROJECT_DIR$/Gemfile.lock"> 75 <entry file="file://$PROJECT_DIR$/Gemfile.lock">
66 <provider selected="true" editor-type-id="text-editor"> 76 <provider selected="true" editor-type-id="text-editor">
67 <state relative-caret-position="795"> 77 <state relative-caret-position="795">
@@ -70,7 +80,7 @@ @@ -70,7 +80,7 @@
70 </provider> 80 </provider>
71 </entry> 81 </entry>
72 </file> 82 </file>
73 - <file leaf-file-name="devise.rb" pinned="false" current-in-tab="false"> 83 + <file pinned="false" current-in-tab="false">
74 <entry file="file://$PROJECT_DIR$/config/initializers/devise.rb"> 84 <entry file="file://$PROJECT_DIR$/config/initializers/devise.rb">
75 <provider selected="true" editor-type-id="text-editor"> 85 <provider selected="true" editor-type-id="text-editor">
76 <state relative-caret-position="90"> 86 <state relative-caret-position="90">
@@ -79,7 +89,7 @@ @@ -79,7 +89,7 @@
79 </provider> 89 </provider>
80 </entry> 90 </entry>
81 </file> 91 </file>
82 - <file leaf-file-name="admin.rb" pinned="false" current-in-tab="false"> 92 + <file pinned="false" current-in-tab="false">
83 <entry file="file://$PROJECT_DIR$/config/initializers/admin.rb"> 93 <entry file="file://$PROJECT_DIR$/config/initializers/admin.rb">
84 <provider selected="true" editor-type-id="text-editor"> 94 <provider selected="true" editor-type-id="text-editor">
85 <state relative-caret-position="45"> 95 <state relative-caret-position="45">
@@ -88,17 +98,17 @@ @@ -88,17 +98,17 @@
88 </provider> 98 </provider>
89 </entry> 99 </entry>
90 </file> 100 </file>
91 - <file leaf-file-name="kanjai.rb" pinned="false" current-in-tab="false"> 101 + <file pinned="false" current-in-tab="false">
92 <entry file="file://$PROJECT_DIR$/lib/kanjai.rb"> 102 <entry file="file://$PROJECT_DIR$/lib/kanjai.rb">
93 <provider selected="true" editor-type-id="text-editor" /> 103 <provider selected="true" editor-type-id="text-editor" />
94 </entry> 104 </entry>
95 </file> 105 </file>
96 - <file leaf-file-name="engine.rb" pinned="false" current-in-tab="false"> 106 + <file pinned="false" current-in-tab="false">
97 <entry file="file://$PROJECT_DIR$/lib/kanjai/engine.rb"> 107 <entry file="file://$PROJECT_DIR$/lib/kanjai/engine.rb">
98 <provider selected="true" editor-type-id="text-editor" /> 108 <provider selected="true" editor-type-id="text-editor" />
99 </entry> 109 </entry>
100 </file> 110 </file>
101 - <file leaf-file-name="20160707115443_add_show_public_only_to_kanjai_pages.rb" pinned="false" current-in-tab="false"> 111 + <file pinned="false" current-in-tab="false">
102 <entry file="file://$PROJECT_DIR$/db/migrate/20160707115443_add_show_public_only_to_kanjai_pages.rb"> 112 <entry file="file://$PROJECT_DIR$/db/migrate/20160707115443_add_show_public_only_to_kanjai_pages.rb">
103 <provider selected="true" editor-type-id="text-editor"> 113 <provider selected="true" editor-type-id="text-editor">
104 <state relative-caret-position="30"> 114 <state relative-caret-position="30">
@@ -111,7 +121,6 @@ @@ -111,7 +121,6 @@
111 </component> 121 </component>
112 <component name="FindInProjectRecents"> 122 <component name="FindInProjectRecents">
113 <findStrings> 123 <findStrings>
114 - <find>che</find>  
115 <find>check_p</find> 124 <find>check_p</find>
116 <find>check_permission</find> 125 <find>check_permission</find>
117 <find>admin_email</find> 126 <find>admin_email</find>
@@ -141,6 +150,7 @@ @@ -141,6 +150,7 @@
141 <find>show_public_only</find> 150 <find>show_public_only</find>
142 <find>UserSession</find> 151 <find>UserSession</find>
143 <find>User</find> 152 <find>User</find>
  153 + <find>KANJAI_DOMAIN</find>
144 </findStrings> 154 </findStrings>
145 <dirStrings> 155 <dirStrings>
146 <dir>$PROJECT_DIR$/app/controllers</dir> 156 <dir>$PROJECT_DIR$/app/controllers</dir>
@@ -215,9 +225,6 @@ @@ -215,9 +225,6 @@
215 <detection-done>true</detection-done> 225 <detection-done>true</detection-done>
216 <sorting>DEFINITION_ORDER</sorting> 226 <sorting>DEFINITION_ORDER</sorting>
217 </component> 227 </component>
218 - <component name="NodePackageJsonFileManager">  
219 - <packageJsonPaths />  
220 - </component>  
221 <component name="ProjectFrameBounds" extendedState="6"> 228 <component name="ProjectFrameBounds" extendedState="6">
222 <option name="y" value="23" /> 229 <option name="y" value="23" />
223 <option name="width" value="1280" /> 230 <option name="width" value="1280" />
@@ -273,9 +280,9 @@ @@ -273,9 +280,9 @@
273 </panes> 280 </panes>
274 </component> 281 </component>
275 <component name="PropertiesComponent"> 282 <component name="PropertiesComponent">
  283 + <property name="HbShouldOpenHtmlAsHb" value="" />
276 <property name="WebServerToolWindowFactoryState" value="false" /> 284 <property name="WebServerToolWindowFactoryState" value="false" />
277 <property name="last_opened_file_path" value="$PROJECT_DIR$" /> 285 <property name="last_opened_file_path" value="$PROJECT_DIR$" />
278 - <property name="HbShouldOpenHtmlAsHb" value="" />  
279 <property name="recentsLimit" value="5" /> 286 <property name="recentsLimit" value="5" />
280 </component> 287 </component>
281 <component name="RecentsManager"> 288 <component name="RecentsManager">
@@ -305,188 +312,6 @@ @@ -305,188 +312,6 @@
305 </option> 312 </option>
306 </component> 313 </component>
307 <component name="RunManager" selected="Rails.Development: kanjai"> 314 <component name="RunManager" selected="Rails.Development: kanjai">
308 - <configuration default="true" type="CucumberRunConfigurationType" factoryName="Cucumber">  
309 - <predefined_log_file id="RUBY_CUCUMBER" enabled="true" />  
310 - <module name="" />  
311 - <CUCUMBER_RUN_CONFIG_SETTINGS_ID NAME="RUBY_ARGS" VALUE="-e $stdout.sync=true;$stderr.sync=true;load($0=ARGV.shift)" />  
312 - <CUCUMBER_RUN_CONFIG_SETTINGS_ID NAME="WORK DIR" VALUE="" />  
313 - <CUCUMBER_RUN_CONFIG_SETTINGS_ID NAME="SHOULD_USE_SDK" VALUE="false" />  
314 - <CUCUMBER_RUN_CONFIG_SETTINGS_ID NAME="ALTERN_SDK_NAME" VALUE="" />  
315 - <CUCUMBER_RUN_CONFIG_SETTINGS_ID NAME="myPassParentEnvs" VALUE="true" />  
316 - <envs />  
317 - <EXTENSION ID="BundlerRunConfigurationExtension" bundleExecEnabled="false" />  
318 - <EXTENSION ID="JRubyRunConfigurationExtension" NailgunExecEnabled="false" />  
319 - <EXTENSION ID="RubyCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" track_test_folders="true" runner="rcov">  
320 - <COVERAGE_PATTERN ENABLED="true">  
321 - <PATTERN REGEXPS="/.rvm/" INCLUDED="false" />  
322 - </COVERAGE_PATTERN>  
323 - </EXTENSION>  
324 - <CUCUMBER_RUN_CONFIG_SETTINGS_ID NAME="TEST_FILE_MASK" VALUE="**/*.feature" />  
325 - <CUCUMBER_RUN_CONFIG_SETTINGS_ID NAME="TEST_TEST_TYPE" VALUE="TEST_SCRIPT" />  
326 - <CUCUMBER_RUN_CONFIG_SETTINGS_ID NAME="TESTS_FOLDER_PATH" VALUE="" />  
327 - <CUCUMBER_RUN_CONFIG_SETTINGS_ID NAME="TEST_SCRIPT_PATH" VALUE="" />  
328 - <CUCUMBER_RUN_CONFIG_SETTINGS_ID NAME="TEST_TAGS_FILTER" VALUE="" />  
329 - <CUCUMBER_RUN_CONFIG_SETTINGS_ID NAME="TEST_NAME_FILTER" VALUE="" />  
330 - <CUCUMBER_RUN_CONFIG_SETTINGS_ID NAME="CUCUMBER_ARGS" VALUE="--color -r features" />  
331 - <CUCUMBER_RUN_CONFIG_SETTINGS_ID NAME="RUNNER_VERSION" VALUE="" />  
332 - <CUCUMBER_RUN_CONFIG_SETTINGS_ID NAME="FULL_BACKTRACE" VALUE="false" />  
333 - <CUCUMBER_RUN_CONFIG_SETTINGS_ID NAME="VERBOSE_OPTION" VALUE="false" />  
334 - <CUCUMBER_RUN_CONFIG_SETTINGS_ID NAME="DRB" VALUE="false" />  
335 - <CUCUMBER_RUN_CONFIG_SETTINGS_ID NAME="ZEUS" VALUE="false" />  
336 - <CUCUMBER_RUN_CONFIG_SETTINGS_ID NAME="SPRING" VALUE="false" />  
337 - <CUCUMBER_RUN_CONFIG_SETTINGS_ID NAME="CUCUMBER_RUNNER_PATH" VALUE="" />  
338 - <CUCUMBER_RUN_CONFIG_SETTINGS_ID NAME="USE_CUSTOM_RUNNER" VALUE="false" />  
339 - <CUCUMBER_RUN_CONFIG_SETTINGS_ID NAME="SETTINGS_VERSION" VALUE="2" />  
340 - <method />  
341 - </configuration>  
342 - <configuration default="true" type="JavaScriptTestRunnerJest" factoryName="Jest">  
343 - <node-interpreter value="project" />  
344 - <working-dir value="" />  
345 - <envs />  
346 - <scope-kind value="ALL" />  
347 - <method />  
348 - </configuration>  
349 - <configuration default="true" type="JavaScriptTestRunnerProtractor" factoryName="Protractor">  
350 - <config-file value="" />  
351 - <node-interpreter value="project" />  
352 - <envs />  
353 - <method />  
354 - </configuration>  
355 - <configuration default="true" type="JavascriptDebugType" factoryName="JavaScript Debug">  
356 - <method />  
357 - </configuration>  
358 - <configuration default="true" type="RSpecRunConfigurationType" factoryName="RSpec">  
359 - <predefined_log_file id="RUBY_RSPEC" enabled="true" />  
360 - <module name="" />  
361 - <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="RUBY_ARGS" VALUE="-e $stdout.sync=true;$stderr.sync=true;load($0=ARGV.shift)" />  
362 - <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="WORK DIR" VALUE="" />  
363 - <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="SHOULD_USE_SDK" VALUE="false" />  
364 - <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="ALTERN_SDK_NAME" VALUE="" />  
365 - <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="myPassParentEnvs" VALUE="true" />  
366 - <envs />  
367 - <EXTENSION ID="BundlerRunConfigurationExtension" bundleExecEnabled="false" />  
368 - <EXTENSION ID="JRubyRunConfigurationExtension" NailgunExecEnabled="false" />  
369 - <EXTENSION ID="RubyCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" track_test_folders="true" runner="rcov">  
370 - <COVERAGE_PATTERN ENABLED="true">  
371 - <PATTERN REGEXPS="/.rvm/" INCLUDED="false" />  
372 - </COVERAGE_PATTERN>  
373 - </EXTENSION>  
374 - <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="TESTS_FOLDER_PATH" VALUE="" />  
375 - <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="TEST_SCRIPT_PATH" VALUE="" />  
376 - <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="SPEC_RUNNER_PATH" VALUE="" />  
377 - <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="TEST_FILE_MASK" VALUE="**/*_spec.rb" />  
378 - <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="SPEC_EXAMPLE_NAME" VALUE="" />  
379 - <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="TEST_TEST_TYPE" VALUE="TEST_SCRIPT" />  
380 - <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="SPEC_ARGS" VALUE="" />  
381 - <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="RUNNER_VERSION" VALUE="" />  
382 - <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="USE_CUSTOM_SPEC_RUNNER" VALUE="false" />  
383 - <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="DRB" VALUE="false" />  
384 - <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="ZEUS" VALUE="false" />  
385 - <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="SPRING" VALUE="false" />  
386 - <RSPEC_RUN_CONFIG_SETTINGS_ID NAME="FULL_BACKTRACE" VALUE="false" />  
387 - <method />  
388 - </configuration>  
389 - <configuration default="true" type="RailsRunConfigurationType" factoryName="Rails">  
390 - <predefined_log_file id="RUBY_RAILS_SERVER" enabled="true" />  
391 - <module name="" />  
392 - <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="RUBY_ARGS" VALUE="-e $stdout.sync=true;$stderr.sync=true;load($0=ARGV.shift)" />  
393 - <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="WORK DIR" VALUE="$MODULE_DIR$" />  
394 - <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="SHOULD_USE_SDK" VALUE="false" />  
395 - <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="ALTERN_SDK_NAME" VALUE="" />  
396 - <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="myPassParentEnvs" VALUE="true" />  
397 - <envs />  
398 - <EXTENSION ID="BundlerRunConfigurationExtension" bundleExecEnabled="false" />  
399 - <EXTENSION ID="JRubyRunConfigurationExtension" NailgunExecEnabled="false" />  
400 - <EXTENSION ID="RubyCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" track_test_folders="true" runner="rcov">  
401 - <COVERAGE_PATTERN ENABLED="true">  
402 - <PATTERN REGEXPS="/.rvm/" INCLUDED="false" />  
403 - </COVERAGE_PATTERN>  
404 - </EXTENSION>  
405 - <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="SCRIPT_ARGS" VALUE="" />  
406 - <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="PORT" VALUE="3000" />  
407 - <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="IP" VALUE="0.0.0.0" />  
408 - <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="DUMMY_APP" VALUE="test/dummy" />  
409 - <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="RAILS_SERVER_TYPE" VALUE="Default" />  
410 - <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="ENVIRONMENT_TYPE" VALUE="development" />  
411 - <RAILS_SERVER_CONFIG_SETTINGS_ID NAME="LAUNCH_JS" VALUE="false" />  
412 - <method />  
413 - </configuration>  
414 - <configuration default="true" type="RakeRunConfigurationType" factoryName="Rake">  
415 - <module name="" />  
416 - <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RUBY_ARGS" VALUE="-e $stdout.sync=true;$stderr.sync=true;load($0=ARGV.shift)" />  
417 - <RAKE_RUN_CONFIG_SETTINGS_ID NAME="WORK DIR" VALUE="" />  
418 - <RAKE_RUN_CONFIG_SETTINGS_ID NAME="SHOULD_USE_SDK" VALUE="false" />  
419 - <RAKE_RUN_CONFIG_SETTINGS_ID NAME="ALTERN_SDK_NAME" VALUE="" />  
420 - <RAKE_RUN_CONFIG_SETTINGS_ID NAME="myPassParentEnvs" VALUE="true" />  
421 - <envs />  
422 - <EXTENSION ID="BundlerRunConfigurationExtension" bundleExecEnabled="false" />  
423 - <EXTENSION ID="JRubyRunConfigurationExtension" NailgunExecEnabled="false" />  
424 - <EXTENSION ID="RubyCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" track_test_folders="true" runner="rcov">  
425 - <COVERAGE_PATTERN ENABLED="true">  
426 - <PATTERN REGEXPS="/.rvm/" INCLUDED="false" />  
427 - </COVERAGE_PATTERN>  
428 - </EXTENSION>  
429 - <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_NAME" VALUE="" />  
430 - <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_ARGS" VALUE="" />  
431 - <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_ATTACHED_TEST_FRAMEWORKS" VALUE="" />  
432 - <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_OPTION_TRACE" VALUE="false" />  
433 - <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_OPTION_DRYRUN" VALUE="false" />  
434 - <RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_OPTION_PREREQS" VALUE="false" />  
435 - <method />  
436 - </configuration>  
437 - <configuration default="true" type="RubyRunConfigurationType" factoryName="Ruby">  
438 - <module name="" />  
439 - <RUBY_RUN_CONFIG NAME="RUBY_ARGS" VALUE="-e $stdout.sync=true;$stderr.sync=true;load($0=ARGV.shift)" />  
440 - <RUBY_RUN_CONFIG NAME="WORK DIR" VALUE="" />  
441 - <RUBY_RUN_CONFIG NAME="SHOULD_USE_SDK" VALUE="false" />  
442 - <RUBY_RUN_CONFIG NAME="ALTERN_SDK_NAME" VALUE="" />  
443 - <RUBY_RUN_CONFIG NAME="myPassParentEnvs" VALUE="true" />  
444 - <envs />  
445 - <EXTENSION ID="BundlerRunConfigurationExtension" bundleExecEnabled="false" />  
446 - <EXTENSION ID="JRubyRunConfigurationExtension" NailgunExecEnabled="false" />  
447 - <EXTENSION ID="RubyCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" track_test_folders="true" runner="rcov">  
448 - <COVERAGE_PATTERN ENABLED="true">  
449 - <PATTERN REGEXPS="/.rvm/" INCLUDED="false" />  
450 - </COVERAGE_PATTERN>  
451 - </EXTENSION>  
452 - <RUBY_RUN_CONFIG NAME="SCRIPT_PATH" VALUE="" />  
453 - <RUBY_RUN_CONFIG NAME="SCRIPT_ARGS" VALUE="" />  
454 - <method />  
455 - </configuration>  
456 - <configuration default="true" type="TestUnitRunConfigurationType" factoryName="Test::Unit/Shoulda/Minitest">  
457 - <predefined_log_file id="RUBY_TESTUNIT" enabled="true" />  
458 - <module name="" />  
459 - <RTEST_RUN_CONFIG_SETTINGS_ID NAME="RUBY_ARGS" VALUE="-e $stdout.sync=true;$stderr.sync=true;load($0=ARGV.shift)" />  
460 - <RTEST_RUN_CONFIG_SETTINGS_ID NAME="WORK DIR" VALUE="" />  
461 - <RTEST_RUN_CONFIG_SETTINGS_ID NAME="SHOULD_USE_SDK" VALUE="false" />  
462 - <RTEST_RUN_CONFIG_SETTINGS_ID NAME="ALTERN_SDK_NAME" VALUE="" />  
463 - <RTEST_RUN_CONFIG_SETTINGS_ID NAME="myPassParentEnvs" VALUE="true" />  
464 - <envs />  
465 - <EXTENSION ID="BundlerRunConfigurationExtension" bundleExecEnabled="false" />  
466 - <EXTENSION ID="JRubyRunConfigurationExtension" NailgunExecEnabled="false" />  
467 - <EXTENSION ID="RubyCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" track_test_folders="true" runner="rcov">  
468 - <COVERAGE_PATTERN ENABLED="true">  
469 - <PATTERN REGEXPS="/.rvm/" INCLUDED="false" />  
470 - </COVERAGE_PATTERN>  
471 - </EXTENSION>  
472 - <RTEST_RUN_CONFIG_SETTINGS_ID NAME="TESTS_FOLDER_PATH" VALUE="" />  
473 - <RTEST_RUN_CONFIG_SETTINGS_ID NAME="TEST_SCRIPT_PATH" VALUE="" />  
474 - <RTEST_RUN_CONFIG_SETTINGS_ID NAME="TEST_FILE_MASK" VALUE="" />  
475 - <RTEST_RUN_CONFIG_SETTINGS_ID NAME="TEST_METHOD_NAME" VALUE="" />  
476 - <RTEST_RUN_CONFIG_SETTINGS_ID NAME="TEST_TEST_TYPE" VALUE="TEST_SCRIPT" />  
477 - <RTEST_RUN_CONFIG_SETTINGS_ID NAME="DRB" VALUE="false" />  
478 - <RTEST_RUN_CONFIG_SETTINGS_ID NAME="ZEUS" VALUE="false" />  
479 - <RTEST_RUN_CONFIG_SETTINGS_ID NAME="SPRING" VALUE="false" />  
480 - <RTEST_RUN_CONFIG_SETTINGS_ID NAME="RUNNER_OPTIONS" VALUE="" />  
481 - <method />  
482 - </configuration>  
483 - <configuration default="true" type="js.build_tools.npm" factoryName="npm">  
484 - <command value="run" />  
485 - <scripts />  
486 - <node-interpreter value="project" />  
487 - <envs />  
488 - <method />  
489 - </configuration>  
490 <configuration default="true" type="js.build_tools.gulp" factoryName="Gulp.js"> 315 <configuration default="true" type="js.build_tools.gulp" factoryName="Gulp.js">
491 <node-interpreter>project</node-interpreter> 316 <node-interpreter>project</node-interpreter>
492 <node-options /> 317 <node-options />
@@ -494,6 +319,7 @@ @@ -494,6 +319,7 @@
494 <tasks /> 319 <tasks />
495 <arguments /> 320 <arguments />
496 <pass-parent-envs>true</pass-parent-envs> 321 <pass-parent-envs>true</pass-parent-envs>
  322 + <method v="2" />
497 </configuration> 323 </configuration>
498 <list> 324 <list>
499 <item itemvalue="Rake.test: kanjai" /> 325 <item itemvalue="Rake.test: kanjai" />
@@ -551,39 +377,40 @@ @@ -551,39 +377,40 @@
551 <workItem from="1532528310773" duration="526000" /> 377 <workItem from="1532528310773" duration="526000" />
552 <workItem from="1532617523201" duration="881000" /> 378 <workItem from="1532617523201" duration="881000" />
553 <workItem from="1533023763618" duration="569000" /> 379 <workItem from="1533023763618" duration="569000" />
554 - <workItem from="1533043884272" duration="151000" /> 380 + <workItem from="1533043884272" duration="812000" />
  381 + <workItem from="1536316862776" duration="652000" />
  382 + <workItem from="1536432181981" duration="68000" />
555 </task> 383 </task>
556 <servers /> 384 <servers />
557 </component> 385 </component>
558 <component name="TimeTrackingManager"> 386 <component name="TimeTrackingManager">
559 - <option name="totallyTimeSpent" value="49030000" /> 387 + <option name="totallyTimeSpent" value="50411000" />
560 </component> 388 </component>
561 <component name="ToolWindowManager"> 389 <component name="ToolWindowManager">
562 - <frame x="0" y="23" width="1280" height="730" extended-state="6" />  
563 - <editor active="true" /> 390 + <frame x="0" y="23" width="1280" height="728" extended-state="6" />
564 <layout> 391 <layout>
565 - <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.37421876" />  
566 - <window_info anchor="bottom" id="TODO" order="6" />  
567 - <window_info anchor="bottom" id="Docker" order="8" show_stripe_button="false" />  
568 - <window_info anchor="bottom" id="Event Log" order="7" side_tool="true" weight="0.32930514" />  
569 - <window_info anchor="right" id="Database" order="3" />  
570 - <window_info anchor="bottom" id="Database Changes" order="8" show_stripe_button="false" />  
571 - <window_info anchor="bottom" id="Run" order="2" />  
572 - <window_info anchor="bottom" id="Version Control" order="7" /> 392 + <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.3861066" />
573 <window_info id="Structure" order="1" side_tool="true" weight="0.25" /> 393 <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
574 - <window_info anchor="bottom" id="Terminal" order="7" />  
575 - <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />  
576 <window_info id="Favorites" order="2" side_tool="true" /> 394 <window_info id="Favorites" order="2" side_tool="true" />
577 - <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" /> 395 + <window_info anchor="bottom" id="Message" order="0" />
  396 + <window_info anchor="bottom" id="Find" order="1" weight="0.32930514" />
  397 + <window_info anchor="bottom" id="Run" order="2" />
  398 + <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
  399 + <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
578 <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" /> 400 <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
  401 + <window_info anchor="bottom" id="TODO" order="6" />
  402 + <window_info anchor="bottom" id="Changes" order="7" />
  403 + <window_info anchor="bottom" id="Terminal" order="8" />
  404 + <window_info anchor="bottom" id="Version Control" order="9" />
  405 + <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" weight="0.32930514" />
  406 + <window_info anchor="bottom" id="Application Servers" order="11" />
  407 + <window_info anchor="bottom" id="Messages" order="12" weight="0.32930514" />
  408 + <window_info anchor="bottom" id="Docker" order="13" show_stripe_button="false" />
  409 + <window_info anchor="bottom" id="Database Changes" order="14" show_stripe_button="false" />
579 <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" /> 410 <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
580 <window_info anchor="right" id="Ant Build" order="1" weight="0.25" /> 411 <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
581 - <window_info anchor="bottom" id="Changes" order="7" />  
582 - <window_info anchor="bottom" id="Application Servers" order="7" />  
583 - <window_info anchor="bottom" id="Messages" order="7" weight="0.32930514" />  
584 - <window_info anchor="bottom" id="Message" order="0" />  
585 - <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />  
586 - <window_info anchor="bottom" id="Find" order="1" weight="0.32930514" /> 412 + <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
  413 + <window_info anchor="right" id="Database" order="3" />
587 </layout> 414 </layout>
588 </component> 415 </component>
589 <component name="TypeScriptGeneratedFilesManager"> 416 <component name="TypeScriptGeneratedFilesManager">
@@ -600,208 +427,7 @@ @@ -600,208 +427,7 @@
600 <component name="VcsContentAnnotationSettings"> 427 <component name="VcsContentAnnotationSettings">
601 <option name="myLimit" value="2678400000" /> 428 <option name="myLimit" value="2678400000" />
602 </component> 429 </component>
603 - <component name="XDebuggerManager">  
604 - <breakpoint-manager>  
605 - <option name="time" value="1" />  
606 - </breakpoint-manager>  
607 - </component>  
608 <component name="editorHistoryManager"> 430 <component name="editorHistoryManager">
609 - <entry file="file://$PROJECT_DIR$/lib/kanjai/version.rb">  
610 - <provider selected="true" editor-type-id="text-editor">  
611 - <state relative-caret-position="15">  
612 - <caret line="1" column="13" selection-start-line="1" selection-start-column="13" selection-end-line="1" selection-end-column="13" />  
613 - </state>  
614 - </provider>  
615 - </entry>  
616 - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/form_controller.rb">  
617 - <provider selected="true" editor-type-id="text-editor">  
618 - <state relative-caret-position="75">  
619 - <caret line="5" column="44" selection-start-line="5" selection-start-column="32" selection-end-line="5" selection-end-column="44" />  
620 - </state>  
621 - </provider>  
622 - </entry>  
623 - <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/content_types/_content.html.erb">  
624 - <provider selected="true" editor-type-id="text-editor">  
625 - <state relative-caret-position="15">  
626 - <caret line="1" column="121" selection-start-line="1" selection-start-column="121" selection-end-line="1" selection-end-column="121" />  
627 - </state>  
628 - </provider>  
629 - </entry>  
630 - <entry file="file://$PROJECT_DIR$/app/models/kanjai/page_template.rb">  
631 - <provider selected="true" editor-type-id="text-editor">  
632 - <state relative-caret-position="1800">  
633 - <caret line="120" column="25" selection-start-line="120" selection-start-column="16" selection-end-line="120" selection-end-column="25" />  
634 - </state>  
635 - </provider>  
636 - </entry>  
637 - <entry file="file://$PROJECT_DIR$/app/models/kanjai/page_content_marker.rb">  
638 - <provider selected="true" editor-type-id="text-editor">  
639 - <state relative-caret-position="255">  
640 - <caret line="17" column="65" selection-start-line="17" selection-start-column="53" selection-end-line="17" selection-end-column="65" />  
641 - </state>  
642 - </provider>  
643 - </entry>  
644 - <entry file="file://$PROJECT_DIR$/app/mailers/kanjai_mailer.rb">  
645 - <provider selected="true" editor-type-id="text-editor">  
646 - <state relative-caret-position="60">  
647 - <caret line="4" column="5" selection-start-line="4" selection-start-column="5" selection-end-line="4" selection-end-column="5" />  
648 - </state>  
649 - </provider>  
650 - </entry>  
651 - <entry file="file://$PROJECT_DIR$/app/views/kanjai_mailer/send_mail.html.erb">  
652 - <provider selected="true" editor-type-id="text-editor">  
653 - <state relative-caret-position="45">  
654 - <caret line="3" column="11" selection-start-line="3" selection-start-column="3" selection-end-line="3" selection-end-column="11" />  
655 - </state>  
656 - </provider>  
657 - </entry>  
658 - <entry file="file://$PROJECT_DIR$/lib/kanjai/template_generator.rb">  
659 - <provider selected="true" editor-type-id="text-editor">  
660 - <state relative-caret-position="4395">  
661 - <caret line="293" column="41" selection-start-line="293" selection-start-column="41" selection-end-line="293" selection-end-column="41" />  
662 - </state>  
663 - </provider>  
664 - </entry>  
665 - <entry file="file://$PROJECT_DIR$/config/routes.rb">  
666 - <provider selected="true" editor-type-id="text-editor">  
667 - <state relative-caret-position="855">  
668 - <caret line="57" column="32" selection-start-line="57" selection-start-column="17" selection-end-line="57" selection-end-column="32" />  
669 - </state>  
670 - </provider>  
671 - </entry>  
672 - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin/page_templates_controller.rb">  
673 - <provider selected="true" editor-type-id="text-editor">  
674 - <state relative-caret-position="1500">  
675 - <caret line="100" column="21" selection-start-line="100" selection-start-column="6" selection-end-line="100" selection-end-column="21" />  
676 - </state>  
677 - </provider>  
678 - </entry>  
679 - <entry file="file://$PROJECT_DIR$/lib/kanjai/version.rb">  
680 - <provider selected="true" editor-type-id="text-editor">  
681 - <state relative-caret-position="15">  
682 - <caret line="1" column="13" selection-start-line="1" selection-start-column="13" selection-end-line="1" selection-end-column="13" />  
683 - </state>  
684 - </provider>  
685 - </entry>  
686 - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/form_controller.rb">  
687 - <provider selected="true" editor-type-id="text-editor">  
688 - <state relative-caret-position="75">  
689 - <caret line="5" column="44" selection-start-line="5" selection-start-column="32" selection-end-line="5" selection-end-column="44" />  
690 - </state>  
691 - </provider>  
692 - </entry>  
693 - <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/content_types/_content.html.erb">  
694 - <provider selected="true" editor-type-id="text-editor">  
695 - <state relative-caret-position="15">  
696 - <caret line="1" column="121" selection-start-line="1" selection-start-column="121" selection-end-line="1" selection-end-column="121" />  
697 - </state>  
698 - </provider>  
699 - </entry>  
700 - <entry file="file://$PROJECT_DIR$/app/models/kanjai/page_content_marker.rb">  
701 - <provider selected="true" editor-type-id="text-editor">  
702 - <state relative-caret-position="255">  
703 - <caret line="17" column="65" selection-start-line="17" selection-start-column="53" selection-end-line="17" selection-end-column="65" />  
704 - </state>  
705 - </provider>  
706 - </entry>  
707 - <entry file="file://$PROJECT_DIR$/app/mailers/kanjai_mailer.rb">  
708 - <provider selected="true" editor-type-id="text-editor">  
709 - <state relative-caret-position="60">  
710 - <caret line="4" column="5" selection-start-line="4" selection-start-column="5" selection-end-line="4" selection-end-column="5" />  
711 - </state>  
712 - </provider>  
713 - </entry>  
714 - <entry file="file://$PROJECT_DIR$/app/views/kanjai_mailer/send_mail.html.erb">  
715 - <provider selected="true" editor-type-id="text-editor">  
716 - <state relative-caret-position="45">  
717 - <caret line="3" column="11" selection-start-line="3" selection-start-column="3" selection-end-line="3" selection-end-column="11" />  
718 - </state>  
719 - </provider>  
720 - </entry>  
721 - <entry file="file://$PROJECT_DIR$/lib/kanjai/template_generator.rb">  
722 - <provider selected="true" editor-type-id="text-editor">  
723 - <state relative-caret-position="4395">  
724 - <caret line="293" column="41" selection-start-line="293" selection-start-column="41" selection-end-line="293" selection-end-column="41" />  
725 - </state>  
726 - </provider>  
727 - </entry>  
728 - <entry file="file://$PROJECT_DIR$/config/routes.rb">  
729 - <provider selected="true" editor-type-id="text-editor">  
730 - <state relative-caret-position="855">  
731 - <caret line="57" column="32" selection-start-line="57" selection-start-column="17" selection-end-line="57" selection-end-column="32" />  
732 - </state>  
733 - </provider>  
734 - </entry>  
735 - <entry file="file://$PROJECT_DIR$/app/models/kanjai/page_template.rb">  
736 - <provider selected="true" editor-type-id="text-editor">  
737 - <state relative-caret-position="1800">  
738 - <caret line="120" column="25" selection-start-line="120" selection-start-column="16" selection-end-line="120" selection-end-column="25" />  
739 - </state>  
740 - </provider>  
741 - </entry>  
742 - <entry file="file://$PROJECT_DIR$/lib/kanjai/version.rb">  
743 - <provider selected="true" editor-type-id="text-editor">  
744 - <state relative-caret-position="15">  
745 - <caret line="1" column="13" selection-start-line="1" selection-start-column="13" selection-end-line="1" selection-end-column="13" />  
746 - </state>  
747 - </provider>  
748 - </entry>  
749 - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/form_controller.rb">  
750 - <provider selected="true" editor-type-id="text-editor">  
751 - <state relative-caret-position="75">  
752 - <caret line="5" column="44" selection-start-line="5" selection-start-column="32" selection-end-line="5" selection-end-column="44" />  
753 - </state>  
754 - </provider>  
755 - </entry>  
756 - <entry file="file://$PROJECT_DIR$/app/models/kanjai/page_content_marker.rb">  
757 - <provider selected="true" editor-type-id="text-editor">  
758 - <state relative-caret-position="255">  
759 - <caret line="17" column="65" selection-start-line="17" selection-start-column="53" selection-end-line="17" selection-end-column="65" />  
760 - </state>  
761 - </provider>  
762 - </entry>  
763 - <entry file="file://$PROJECT_DIR$/app/mailers/kanjai_mailer.rb">  
764 - <provider selected="true" editor-type-id="text-editor">  
765 - <state relative-caret-position="60">  
766 - <caret line="4" column="5" lean-forward="true" selection-start-line="4" selection-start-column="5" selection-end-line="4" selection-end-column="5" />  
767 - </state>  
768 - </provider>  
769 - </entry>  
770 - <entry file="file://$PROJECT_DIR$/app/views/kanjai_mailer/send_mail.html.erb">  
771 - <provider selected="true" editor-type-id="text-editor">  
772 - <state relative-caret-position="45">  
773 - <caret line="3" column="11" selection-start-line="3" selection-start-column="3" selection-end-line="3" selection-end-column="11" />  
774 - </state>  
775 - </provider>  
776 - </entry>  
777 - <entry file="file://$PROJECT_DIR$/lib/kanjai/template_generator.rb">  
778 - <provider selected="true" editor-type-id="text-editor">  
779 - <state relative-caret-position="4395">  
780 - <caret line="293" column="41" selection-start-line="293" selection-start-column="41" selection-end-line="293" selection-end-column="41" />  
781 - </state>  
782 - </provider>  
783 - </entry>  
784 - <entry file="file://$PROJECT_DIR$/config/routes.rb">  
785 - <provider selected="true" editor-type-id="text-editor">  
786 - <state relative-caret-position="855">  
787 - <caret line="57" column="32" selection-start-line="57" selection-start-column="17" selection-end-line="57" selection-end-column="32" />  
788 - </state>  
789 - </provider>  
790 - </entry>  
791 - <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/content_types/_content.html.erb">  
792 - <provider selected="true" editor-type-id="text-editor">  
793 - <state relative-caret-position="15">  
794 - <caret line="1" column="121" selection-start-line="1" selection-start-column="121" selection-end-line="1" selection-end-column="121" />  
795 - </state>  
796 - </provider>  
797 - </entry>  
798 - <entry file="file://$PROJECT_DIR$/lib/kanjai/version.rb">  
799 - <provider selected="true" editor-type-id="text-editor">  
800 - <state relative-caret-position="15">  
801 - <caret line="1" column="13" selection-start-line="1" selection-start-column="13" selection-end-line="1" selection-end-column="13" />  
802 - </state>  
803 - </provider>  
804 - </entry>  
805 <entry file="file://$PROJECT_DIR$/kanjai.gemspec"> 431 <entry file="file://$PROJECT_DIR$/kanjai.gemspec">
806 <provider selected="true" editor-type-id="text-editor"> 432 <provider selected="true" editor-type-id="text-editor">
807 <state relative-caret-position="300"> 433 <state relative-caret-position="300">
@@ -893,38 +519,31 @@ @@ -893,38 +519,31 @@
893 </state> 519 </state>
894 </provider> 520 </provider>
895 </entry> 521 </entry>
896 - <entry file="file://$PROJECT_DIR$/Gemfile.lock"> 522 + <entry file="file://$PROJECT_DIR$/config/initializers/aws.rb">
897 <provider selected="true" editor-type-id="text-editor"> 523 <provider selected="true" editor-type-id="text-editor">
898 - <state relative-caret-position="795">  
899 - <caret line="53" column="13" selection-start-line="53" selection-start-column="13" selection-end-line="53" selection-end-column="13" /> 524 + <state relative-caret-position="75">
  525 + <caret line="5" column="57" selection-start-line="5" selection-start-column="41" selection-end-line="5" selection-end-column="57" />
900 </state> 526 </state>
901 </provider> 527 </provider>
902 </entry> 528 </entry>
903 - <entry file="file://$PROJECT_DIR$/db/migrate/20160707115443_add_show_public_only_to_kanjai_pages.rb"> 529 + <entry file="file://$PROJECT_DIR$/lib/kanjai/template_generator.rb">
904 <provider selected="true" editor-type-id="text-editor"> 530 <provider selected="true" editor-type-id="text-editor">
905 - <state relative-caret-position="30">  
906 - <caret line="2" column="73" selection-start-line="2" selection-start-column="4" selection-end-line="2" selection-end-column="73" /> 531 + <state relative-caret-position="3390">
  532 + <caret line="226" column="42" selection-start-line="226" selection-start-column="23" selection-end-line="226" selection-end-column="42" />
907 </state> 533 </state>
908 </provider> 534 </provider>
909 </entry> 535 </entry>
910 <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb"> 536 <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb">
911 <provider selected="true" editor-type-id="text-editor"> 537 <provider selected="true" editor-type-id="text-editor">
912 - <state relative-caret-position="495">  
913 - <caret line="33" column="34" selection-start-line="33" selection-start-column="34" selection-end-line="33" selection-end-column="34" />  
914 - </state>  
915 - </provider>  
916 - </entry>  
917 - <entry file="file://$PROJECT_DIR$/config/initializers/aws.rb">  
918 - <provider selected="true" editor-type-id="text-editor">  
919 - <state relative-caret-position="75">  
920 - <caret line="5" column="57" selection-start-line="5" selection-start-column="41" selection-end-line="5" selection-end-column="57" /> 538 + <state relative-caret-position="465">
  539 + <caret line="31" selection-start-line="31" selection-end-line="31" />
921 </state> 540 </state>
922 </provider> 541 </provider>
923 </entry> 542 </entry>
924 - <entry file="file://$PROJECT_DIR$/lib/kanjai/template_generator.rb"> 543 + <entry file="file://$PROJECT_DIR$/Gemfile.lock">
925 <provider selected="true" editor-type-id="text-editor"> 544 <provider selected="true" editor-type-id="text-editor">
926 - <state relative-caret-position="3390">  
927 - <caret line="226" column="42" selection-start-line="226" selection-start-column="23" selection-end-line="226" selection-end-column="42" /> 545 + <state relative-caret-position="795">
  546 + <caret line="53" column="13" selection-start-line="53" selection-start-column="13" selection-end-line="53" selection-end-column="13" />
928 </state> 547 </state>
929 </provider> 548 </provider>
930 </entry> 549 </entry>
@@ -948,10 +567,17 @@ @@ -948,10 +567,17 @@
948 <entry file="file://$PROJECT_DIR$/lib/kanjai/engine.rb"> 567 <entry file="file://$PROJECT_DIR$/lib/kanjai/engine.rb">
949 <provider selected="true" editor-type-id="text-editor" /> 568 <provider selected="true" editor-type-id="text-editor" />
950 </entry> 569 </entry>
  570 + <entry file="file://$PROJECT_DIR$/db/migrate/20160707115443_add_show_public_only_to_kanjai_pages.rb">
  571 + <provider selected="true" editor-type-id="text-editor">
  572 + <state relative-caret-position="30">
  573 + <caret line="2" column="73" selection-start-line="2" selection-start-column="4" selection-end-line="2" selection-end-column="73" />
  574 + </state>
  575 + </provider>
  576 + </entry>
951 <entry file="file://$PROJECT_DIR$/lib/kanjai/version.rb"> 577 <entry file="file://$PROJECT_DIR$/lib/kanjai/version.rb">
952 <provider selected="true" editor-type-id="text-editor"> 578 <provider selected="true" editor-type-id="text-editor">
953 - <state relative-caret-position="15">  
954 - <caret line="1" column="19" selection-start-line="1" selection-start-column="19" selection-end-line="1" selection-end-column="19" /> 579 + <state relative-caret-position="45">
  580 + <caret line="3" selection-start-line="3" selection-end-line="3" />
955 </state> 581 </state>
956 </provider> 582 </provider>
957 </entry> 583 </entry>
1 PATH 1 PATH
2 remote: . 2 remote: .
3 specs: 3 specs:
4 - kanjai (0.0.81) 4 + kanjai (0.0.82)
5 acts_as_list 5 acts_as_list
6 acts_as_tree 6 acts_as_tree
7 aws-sdk (= 2.6.32) 7 aws-sdk (= 2.6.32)
@@ -10,11 +10,9 @@ PATH @@ -10,11 +10,9 @@ PATH
10 delayed_job_active_record 10 delayed_job_active_record
11 devise 11 devise
12 jbuilder (~> 2.0) 12 jbuilder (~> 2.0)
13 - jquery-rails (= 3.1.2)  
14 json 13 json
15 - nokogiri (= 1.6.1)  
16 pg (= 0.17.1) 14 pg (= 0.17.1)
17 - rails (~> 4.2.4) 15 + rails (~> 5.2)
18 rails_12factor 16 rails_12factor
19 sass-rails (~> 5.0) 17 sass-rails (~> 5.0)
20 sdoc (~> 0.4.0) 18 sdoc (~> 0.4.0)
@@ -24,46 +22,52 @@ PATH @@ -24,46 +22,52 @@ PATH
24 GEM 22 GEM
25 remote: https://rubygems.org/ 23 remote: https://rubygems.org/
26 specs: 24 specs:
27 - actionmailer (4.2.6)  
28 - actionpack (= 4.2.6)  
29 - actionview (= 4.2.6)  
30 - activejob (= 4.2.6) 25 + actioncable (5.2.1)
  26 + actionpack (= 5.2.1)
  27 + nio4r (~> 2.0)
  28 + websocket-driver (>= 0.6.1)
  29 + actionmailer (5.2.1)
  30 + actionpack (= 5.2.1)
  31 + actionview (= 5.2.1)
  32 + activejob (= 5.2.1)
31 mail (~> 2.5, >= 2.5.4) 33 mail (~> 2.5, >= 2.5.4)
32 - rails-dom-testing (~> 1.0, >= 1.0.5)  
33 - actionpack (4.2.6)  
34 - actionview (= 4.2.6)  
35 - activesupport (= 4.2.6)  
36 - rack (~> 1.6)  
37 - rack-test (~> 0.6.2)  
38 - rails-dom-testing (~> 1.0, >= 1.0.5) 34 + rails-dom-testing (~> 2.0)
  35 + actionpack (5.2.1)
  36 + actionview (= 5.2.1)
  37 + activesupport (= 5.2.1)
  38 + rack (~> 2.0)
  39 + rack-test (>= 0.6.3)
  40 + rails-dom-testing (~> 2.0)
39 rails-html-sanitizer (~> 1.0, >= 1.0.2) 41 rails-html-sanitizer (~> 1.0, >= 1.0.2)
40 - actionview (4.2.6)  
41 - activesupport (= 4.2.6) 42 + actionview (5.2.1)
  43 + activesupport (= 5.2.1)
42 builder (~> 3.1) 44 builder (~> 3.1)
43 - erubis (~> 2.7.0)  
44 - rails-dom-testing (~> 1.0, >= 1.0.5)  
45 - rails-html-sanitizer (~> 1.0, >= 1.0.2)  
46 - activejob (4.2.6)  
47 - activesupport (= 4.2.6)  
48 - globalid (>= 0.3.0)  
49 - activemodel (4.2.6)  
50 - activesupport (= 4.2.6)  
51 - builder (~> 3.1)  
52 - activerecord (4.2.6)  
53 - activemodel (= 4.2.6)  
54 - activesupport (= 4.2.6)  
55 - arel (~> 6.0)  
56 - activesupport (4.2.6)  
57 - i18n (~> 0.7)  
58 - json (~> 1.7, >= 1.7.7) 45 + erubi (~> 1.4)
  46 + rails-dom-testing (~> 2.0)
  47 + rails-html-sanitizer (~> 1.0, >= 1.0.3)
  48 + activejob (5.2.1)
  49 + activesupport (= 5.2.1)
  50 + globalid (>= 0.3.6)
  51 + activemodel (5.2.1)
  52 + activesupport (= 5.2.1)
  53 + activerecord (5.2.1)
  54 + activemodel (= 5.2.1)
  55 + activesupport (= 5.2.1)
  56 + arel (>= 9.0)
  57 + activestorage (5.2.1)
  58 + actionpack (= 5.2.1)
  59 + activerecord (= 5.2.1)
  60 + marcel (~> 0.3.1)
  61 + activesupport (5.2.1)
  62 + concurrent-ruby (~> 1.0, >= 1.0.2)
  63 + i18n (>= 0.7, < 2)
59 minitest (~> 5.1) 64 minitest (~> 5.1)
60 - thread_safe (~> 0.3, >= 0.3.4)  
61 tzinfo (~> 1.1) 65 tzinfo (~> 1.1)
62 - acts_as_list (0.9.5) 66 + acts_as_list (0.9.16)
63 activerecord (>= 3.0) 67 activerecord (>= 3.0)
64 - acts_as_tree (2.7.0) 68 + acts_as_tree (2.8.0)
65 activerecord (>= 3.0.0) 69 activerecord (>= 3.0.0)
66 - arel (6.0.4) 70 + arel (9.0.0)
67 aws-sdk (2.6.32) 71 aws-sdk (2.6.32)
68 aws-sdk-resources (= 2.6.32) 72 aws-sdk-resources (= 2.6.32)
69 aws-sdk-core (2.6.32) 73 aws-sdk-core (2.6.32)
@@ -71,91 +75,90 @@ GEM @@ -71,91 +75,90 @@ GEM
71 jmespath (~> 1.0) 75 jmespath (~> 1.0)
72 aws-sdk-resources (2.6.32) 76 aws-sdk-resources (2.6.32)
73 aws-sdk-core (= 2.6.32) 77 aws-sdk-core (= 2.6.32)
74 - aws-sigv4 (1.0.2) 78 + aws-sigv4 (1.0.3)
75 backport_new_renderer (1.0.0) 79 backport_new_renderer (1.0.0)
76 rails 80 rails
77 - bcrypt (3.1.11)  
78 - builder (3.2.2) 81 + bcrypt (3.1.12)
  82 + builder (3.2.3)
79 concurrent-ruby (1.0.5) 83 concurrent-ruby (1.0.5)
  84 + crass (1.0.4)
80 daemons (1.2.6) 85 daemons (1.2.6)
81 - delayed_job (4.1.4)  
82 - activesupport (>= 3.0, < 5.2)  
83 - delayed_job_active_record (4.1.2)  
84 - activerecord (>= 3.0, < 5.2) 86 + delayed_job (4.1.5)
  87 + activesupport (>= 3.0, < 5.3)
  88 + delayed_job_active_record (4.1.3)
  89 + activerecord (>= 3.0, < 5.3)
85 delayed_job (>= 3.0, < 5) 90 delayed_job (>= 3.0, < 5)
86 - devise (4.4.0) 91 + devise (4.5.0)
87 bcrypt (~> 3.0) 92 bcrypt (~> 3.0)
88 orm_adapter (~> 0.1) 93 orm_adapter (~> 0.1)
89 - railties (>= 4.1.0, < 5.2) 94 + railties (>= 4.1.0, < 6.0)
90 responders 95 responders
91 warden (~> 1.2.3) 96 warden (~> 1.2.3)
92 - diff-lcs (1.2.5)  
93 - erubis (2.7.0) 97 + erubi (1.7.1)
94 execjs (2.7.0) 98 execjs (2.7.0)
95 - factory_girl (4.7.0)  
96 - activesupport (>= 3.0.0)  
97 - factory_girl_rails (4.7.0)  
98 - factory_girl (~> 4.7.0)  
99 - railties (>= 3.0.0)  
100 - ffi (1.9.14) 99 + ffi (1.9.25)
101 globalid (0.4.1) 100 globalid (0.4.1)
102 activesupport (>= 4.2.0) 101 activesupport (>= 4.2.0)
103 - i18n (0.7.0) 102 + i18n (1.1.1)
  103 + concurrent-ruby (~> 1.0)
104 jbuilder (2.7.0) 104 jbuilder (2.7.0)
105 activesupport (>= 4.2.0) 105 activesupport (>= 4.2.0)
106 multi_json (>= 1.2) 106 multi_json (>= 1.2)
107 - jmespath (1.3.1)  
108 - jquery-rails (3.1.2)  
109 - railties (>= 3.0, < 5.0)  
110 - thor (>= 0.14, < 2.0)  
111 - json (1.8.3) 107 + jmespath (1.4.0)
  108 + json (1.8.6)
112 libv8 (3.16.14.19) 109 libv8 (3.16.14.19)
113 - loofah (2.0.3) 110 + loofah (2.2.2)
  111 + crass (~> 1.0.2)
114 nokogiri (>= 1.5.9) 112 nokogiri (>= 1.5.9)
115 - mail (2.7.0) 113 + mail (2.7.1)
116 mini_mime (>= 0.1.1) 114 mini_mime (>= 0.1.1)
117 - mini_mime (1.0.0)  
118 - mini_portile (0.5.3)  
119 - minitest (5.8.4) 115 + marcel (0.3.3)
  116 + mimemagic (~> 0.3.2)
  117 + method_source (0.9.0)
  118 + mimemagic (0.3.2)
  119 + mini_mime (1.0.1)
  120 + mini_portile2 (2.3.0)
  121 + minitest (5.11.3)
120 multi_json (1.13.1) 122 multi_json (1.13.1)
121 - nokogiri (1.6.1)  
122 - mini_portile (~> 0.5.0) 123 + nio4r (2.3.1)
  124 + nokogiri (1.8.5)
  125 + mini_portile2 (~> 2.3.0)
123 orm_adapter (0.5.0) 126 orm_adapter (0.5.0)
124 pg (0.17.1) 127 pg (0.17.1)
125 - rack (1.6.4)  
126 - rack-test (0.6.3)  
127 - rack (>= 1.0)  
128 - rails (4.2.6)  
129 - actionmailer (= 4.2.6)  
130 - actionpack (= 4.2.6)  
131 - actionview (= 4.2.6)  
132 - activejob (= 4.2.6)  
133 - activemodel (= 4.2.6)  
134 - activerecord (= 4.2.6)  
135 - activesupport (= 4.2.6)  
136 - bundler (>= 1.3.0, < 2.0)  
137 - railties (= 4.2.6)  
138 - sprockets-rails  
139 - rails-deprecated_sanitizer (1.0.3)  
140 - activesupport (>= 4.2.0.alpha)  
141 - rails-dom-testing (1.0.7)  
142 - activesupport (>= 4.2.0.beta, < 5.0)  
143 - nokogiri (~> 1.6.0)  
144 - rails-deprecated_sanitizer (>= 1.0.1)  
145 - rails-html-sanitizer (1.0.3)  
146 - loofah (~> 2.0) 128 + rack (2.0.5)
  129 + rack-test (1.1.0)
  130 + rack (>= 1.0, < 3)
  131 + rails (5.2.1)
  132 + actioncable (= 5.2.1)
  133 + actionmailer (= 5.2.1)
  134 + actionpack (= 5.2.1)
  135 + actionview (= 5.2.1)
  136 + activejob (= 5.2.1)
  137 + activemodel (= 5.2.1)
  138 + activerecord (= 5.2.1)
  139 + activestorage (= 5.2.1)
  140 + activesupport (= 5.2.1)
  141 + bundler (>= 1.3.0)
  142 + railties (= 5.2.1)
  143 + sprockets-rails (>= 2.0.0)
  144 + rails-dom-testing (2.0.3)
  145 + activesupport (>= 4.2.0)
  146 + nokogiri (>= 1.6)
  147 + rails-html-sanitizer (1.0.4)
  148 + loofah (~> 2.2, >= 2.2.2)
147 rails_12factor (0.0.3) 149 rails_12factor (0.0.3)
148 rails_serve_static_assets 150 rails_serve_static_assets
149 rails_stdout_logging 151 rails_stdout_logging
150 rails_serve_static_assets (0.0.5) 152 rails_serve_static_assets (0.0.5)
151 rails_stdout_logging (0.0.5) 153 rails_stdout_logging (0.0.5)
152 - railties (4.2.6)  
153 - actionpack (= 4.2.6)  
154 - activesupport (= 4.2.6) 154 + railties (5.2.1)
  155 + actionpack (= 5.2.1)
  156 + activesupport (= 5.2.1)
  157 + method_source
155 rake (>= 0.8.7) 158 rake (>= 0.8.7)
156 - thor (>= 0.18.1, < 2.0)  
157 - rake (11.1.2)  
158 - rb-fsevent (0.10.2) 159 + thor (>= 0.19.0, < 2.0)
  160 + rake (12.3.1)
  161 + rb-fsevent (0.10.3)
159 rb-inotify (0.9.10) 162 rb-inotify (0.9.10)
160 ffi (>= 0.5.0, < 2) 163 ffi (>= 0.5.0, < 2)
161 rdoc (4.3.0) 164 rdoc (4.3.0)
@@ -163,24 +166,7 @@ GEM @@ -163,24 +166,7 @@ GEM
163 responders (2.4.0) 166 responders (2.4.0)
164 actionpack (>= 4.2.0, < 5.3) 167 actionpack (>= 4.2.0, < 5.3)
165 railties (>= 4.2.0, < 5.3) 168 railties (>= 4.2.0, < 5.3)
166 - rspec-core (3.4.4)  
167 - rspec-support (~> 3.4.0)  
168 - rspec-expectations (3.4.0)  
169 - diff-lcs (>= 1.2.0, < 2.0)  
170 - rspec-support (~> 3.4.0)  
171 - rspec-mocks (3.4.1)  
172 - diff-lcs (>= 1.2.0, < 2.0)  
173 - rspec-support (~> 3.4.0)  
174 - rspec-rails (3.4.2)  
175 - actionpack (>= 3.0, < 4.3)  
176 - activesupport (>= 3.0, < 4.3)  
177 - railties (>= 3.0, < 4.3)  
178 - rspec-core (~> 3.4.0)  
179 - rspec-expectations (~> 3.4.0)  
180 - rspec-mocks (~> 3.4.0)  
181 - rspec-support (~> 3.4.0)  
182 - rspec-support (3.4.1)  
183 - sass (3.5.5) 169 + sass (3.6.0)
184 sass-listen (~> 4.0.0) 170 sass-listen (~> 4.0.0)
185 sass-listen (4.0.0) 171 sass-listen (4.0.0)
186 rb-fsevent (~> 0.9, >= 0.9.4) 172 rb-fsevent (~> 0.9, >= 0.9.4)
@@ -194,7 +180,7 @@ GEM @@ -194,7 +180,7 @@ GEM
194 sdoc (0.4.2) 180 sdoc (0.4.2)
195 json (~> 1.7, >= 1.7.7) 181 json (~> 1.7, >= 1.7.7)
196 rdoc (~> 4.0) 182 rdoc (~> 4.0)
197 - sprockets (3.7.1) 183 + sprockets (3.7.2)
198 concurrent-ruby (~> 1.0) 184 concurrent-ruby (~> 1.0)
199 rack (> 1, < 3) 185 rack (> 1, < 3)
200 sprockets-rails (3.2.1) 186 sprockets-rails (3.2.1)
@@ -204,20 +190,24 @@ GEM @@ -204,20 +190,24 @@ GEM
204 therubyracer (0.12.2) 190 therubyracer (0.12.2)
205 libv8 (~> 3.16.14.0) 191 libv8 (~> 3.16.14.0)
206 ref 192 ref
207 - thor (0.19.1)  
208 - thread_safe (0.3.5) 193 + thor (0.20.0)
  194 + thread_safe (0.3.6)
209 tilt (2.0.8) 195 tilt (2.0.8)
210 - tzinfo (1.2.2) 196 + tzinfo (1.2.5)
211 thread_safe (~> 0.1) 197 thread_safe (~> 0.1)
212 - uglifier (4.1.3) 198 + uglifier (4.1.19)
213 execjs (>= 0.3.0, < 3) 199 execjs (>= 0.3.0, < 3)
214 warden (1.2.7) 200 warden (1.2.7)
215 rack (>= 1.0) 201 rack (>= 1.0)
  202 + websocket-driver (0.7.0)
  203 + websocket-extensions (>= 0.1.0)
  204 + websocket-extensions (0.1.3)
216 205
217 PLATFORMS 206 PLATFORMS
218 ruby 207 ruby
219 208
220 DEPENDENCIES 209 DEPENDENCIES
221 - factory_girl_rails  
222 kanjai! 210 kanjai!
223 - rspec-rails 211 +
  212 +BUNDLED WITH
  213 + 1.15.1
@@ -17,15 +17,13 @@ Gem::Specification.new do |s| @@ -17,15 +17,13 @@ Gem::Specification.new do |s|
17 s.files = Dir["{app,config,db,lib}/**/*", "MIT-LICENSE", "Rakefile", "README.rdoc"] 17 s.files = Dir["{app,config,db,lib}/**/*", "MIT-LICENSE", "Rakefile", "README.rdoc"]
18 s.test_files = Dir["test/**/*"] 18 s.test_files = Dir["test/**/*"]
19 19
20 - s.add_dependency "rails", "~> 4.2.4" 20 + s.add_dependency "rails", "~> 5.2"
21 s.add_dependency "sass-rails", "~> 5.0" 21 s.add_dependency "sass-rails", "~> 5.0"
22 22
23 # Use Uglifier as compressor for JavaScript assets 23 # Use Uglifier as compressor for JavaScript assets
24 s.add_dependency 'uglifier', '>= 1.3.0' 24 s.add_dependency 'uglifier', '>= 1.3.0'
25 # See https://github.com/sstephenson/execjs#readme for more supported runtimes 25 # See https://github.com/sstephenson/execjs#readme for more supported runtimes
26 s.add_dependency 'therubyracer', '0.12.2' 26 s.add_dependency 'therubyracer', '0.12.2'
27 -# Use jquery as the JavaScript library  
28 - s.add_dependency 'jquery-rails', '3.1.2'  
29 # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder 27 # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
30 s.add_dependency 'jbuilder', '~> 2.0' 28 s.add_dependency 'jbuilder', '~> 2.0'
31 # bundle exec rake doc:rails generates the API under doc/api. 29 # bundle exec rake doc:rails generates the API under doc/api.
@@ -37,7 +35,6 @@ Gem::Specification.new do |s| @@ -37,7 +35,6 @@ Gem::Specification.new do |s|
37 # Use Unicorn as the app server 35 # Use Unicorn as the app server
38 # gem 'unicorn' 36 # gem 'unicorn'
39 37
40 - s.add_dependency 'nokogiri', '1.6.1'  
41 s.add_dependency 'devise' 38 s.add_dependency 'devise'
42 39
43 # Use Capistrano for deployment 40 # Use Capistrano for deployment
@@ -59,11 +56,6 @@ Gem::Specification.new do |s| @@ -59,11 +56,6 @@ Gem::Specification.new do |s|
59 s.add_dependency 'backport_new_renderer' 56 s.add_dependency 'backport_new_renderer'
60 57
61 58
62 -  
63 -  
64 - s.add_development_dependency 'rspec-rails'  
65 - s.add_development_dependency 'factory_girl_rails'  
66 -  
67 s.add_runtime_dependency 'rails_12factor' 59 s.add_runtime_dependency 'rails_12factor'
68 60
69 end 61 end
1 module Kanjai 1 module Kanjai
2 - VERSION = "0.0.82" 2 + VERSION = "0.0.83"
3 end 3 end