EDIT / kanjai · Commits

Commit 29fde71b09f469416a25c818ea6b6c32dab6f428

Authored by Karpikau Andrei
1 parent 7727ead5

set new version kanjai

Inline Side-by-side
Showing 5 changed files with 23 additions and 23 deletions
... ... @@ -145,12 +145,12 @@
145 145 <orderEntry type="library" scope="PROVIDED" name="bundler (v1.9.0, rbenv: 2.1.3) [gem]" level="application" />
146 146 <orderEntry type="library" scope="PROVIDED" name="concurrent-ruby (v1.0.2, rbenv: 2.1.3) [gem]" level="application" />
147 147 <orderEntry type="library" scope="PROVIDED" name="daemons (v1.2.3, rbenv: 2.1.3) [gem]" level="application" />
148   - <orderEntry type="library" scope="PROVIDED" name="delayed_job (v4.1.1, rbenv: 2.1.3) [gem]" level="application" />
  148 + <orderEntry type="library" scope="PROVIDED" name="delayed_job (v4.1.2, rbenv: 2.1.3) [gem]" level="application" />
149 149 <orderEntry type="library" scope="PROVIDED" name="delayed_job_active_record (v4.1.1, rbenv: 2.1.3) [gem]" level="application" />
150 150 <orderEntry type="library" scope="PROVIDED" name="devise (v4.1.1, rbenv: 2.1.3) [gem]" level="application" />
151 151 <orderEntry type="library" scope="PROVIDED" name="diff-lcs (v1.2.5, rbenv: 2.1.3) [gem]" level="application" />
152 152 <orderEntry type="library" scope="PROVIDED" name="erubis (v2.7.0, rbenv: 2.1.3) [gem]" level="application" />
153   - <orderEntry type="library" scope="PROVIDED" name="execjs (v2.6.0, rbenv: 2.1.3) [gem]" level="application" />
  153 + <orderEntry type="library" scope="PROVIDED" name="execjs (v2.7.0, rbenv: 2.1.3) [gem]" level="application" />
154 154 <orderEntry type="library" scope="PROVIDED" name="factory_girl (v4.7.0, rbenv: 2.1.3) [gem]" level="application" />
155 155 <orderEntry type="library" scope="PROVIDED" name="factory_girl_rails (v4.7.0, rbenv: 2.1.3) [gem]" level="application" />
156 156 <orderEntry type="library" scope="PROVIDED" name="globalid (v0.3.6, rbenv: 2.1.3) [gem]" level="application" />
... ... @@ -163,11 +163,11 @@
163 163 <orderEntry type="library" scope="PROVIDED" name="libv8 (v3.16.14.15, rbenv: 2.1.3) [gem]" level="application" />
164 164 <orderEntry type="library" scope="PROVIDED" name="loofah (v2.0.3, rbenv: 2.1.3) [gem]" level="application" />
165 165 <orderEntry type="library" scope="PROVIDED" name="mail (v2.6.4, rbenv: 2.1.3) [gem]" level="application" />
166   - <orderEntry type="library" scope="PROVIDED" name="mime-types (v3.0, rbenv: 2.1.3) [gem]" level="application" />
167   - <orderEntry type="library" scope="PROVIDED" name="mime-types-data (v3.2016.0221, rbenv: 2.1.3) [gem]" level="application" />
  166 + <orderEntry type="library" scope="PROVIDED" name="mime-types (v3.1, rbenv: 2.1.3) [gem]" level="application" />
  167 + <orderEntry type="library" scope="PROVIDED" name="mime-types-data (v3.2016.0521, rbenv: 2.1.3) [gem]" level="application" />
168 168 <orderEntry type="library" scope="PROVIDED" name="mini_portile (v0.5.3, rbenv: 2.1.3) [gem]" level="application" />
169 169 <orderEntry type="library" scope="PROVIDED" name="minitest (v5.8.4, rbenv: 2.1.3) [gem]" level="application" />
170   - <orderEntry type="library" scope="PROVIDED" name="multi_json (v1.12.0, rbenv: 2.1.3) [gem]" level="application" />
  170 + <orderEntry type="library" scope="PROVIDED" name="multi_json (v1.12.1, rbenv: 2.1.3) [gem]" level="application" />
171 171 <orderEntry type="library" scope="PROVIDED" name="nokogiri (v1.6.1, rbenv: 2.1.3) [gem]" level="application" />
172 172 <orderEntry type="library" scope="PROVIDED" name="orm_adapter (v0.5.0, rbenv: 2.1.3) [gem]" level="application" />
173 173 <orderEntry type="library" scope="PROVIDED" name="pg (v0.17.1, rbenv: 2.1.3) [gem]" level="application" />
... ... @@ -198,7 +198,7 @@
198 198 <orderEntry type="library" scope="PROVIDED" name="therubyracer (v0.12.2, rbenv: 2.1.3) [gem]" level="application" />
199 199 <orderEntry type="library" scope="PROVIDED" name="thor (v0.19.1, rbenv: 2.1.3) [gem]" level="application" />
200 200 <orderEntry type="library" scope="PROVIDED" name="thread_safe (v0.3.5, rbenv: 2.1.3) [gem]" level="application" />
201   - <orderEntry type="library" scope="PROVIDED" name="tilt (v2.0.2, rbenv: 2.1.3) [gem]" level="application" />
  201 + <orderEntry type="library" scope="PROVIDED" name="tilt (v2.0.5, rbenv: 2.1.3) [gem]" level="application" />
202 202 <orderEntry type="library" scope="PROVIDED" name="tzinfo (v1.2.2, rbenv: 2.1.3) [gem]" level="application" />
203 203 <orderEntry type="library" scope="PROVIDED" name="uglifier (v3.0.0, rbenv: 2.1.3) [gem]" level="application" />
204 204 <orderEntry type="library" scope="PROVIDED" name="warden (v1.2.6, rbenv: 2.1.3) [gem]" level="application" />
... ...
... ... @@ -59,7 +59,7 @@
59 59 <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb">
60 60 <provider selected="true" editor-type-id="text-editor">
61 61 <state vertical-scroll-proportion="-7.4814816" vertical-offset="173" max-vertical-offset="2490">
62   - <caret line="25" column="12" selection-start-line="25" selection-start-column="12" selection-end-line="25" selection-end-column="12" />
  62 + <caret line="25" column="47" selection-start-line="25" selection-start-column="47" selection-end-line="25" selection-end-column="47" />
63 63 <folding />
64 64 </state>
65 65 </provider>
... ... @@ -1119,7 +1119,7 @@
1119 1119 <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb">
1120 1120 <provider selected="true" editor-type-id="text-editor">
1121 1121 <state vertical-scroll-proportion="-7.4814816" vertical-offset="173" max-vertical-offset="2490">
1122   - <caret line="25" column="12" selection-start-line="25" selection-start-column="12" selection-end-line="25" selection-end-column="12" />
  1122 + <caret line="25" column="47" selection-start-line="25" selection-start-column="47" selection-end-line="25" selection-end-column="47" />
1123 1123 <folding />
1124 1124 </state>
1125 1125 </provider>
... ...
1 1 PATH
2 2 remote: .
3 3 specs:
4   - kanjai (0.0.36)
  4 + kanjai (0.0.37)
5 5 acts_as_list
6 6 acts_as_tree
7 7 aws-sdk
... ... @@ -76,12 +76,12 @@ GEM
76 76 builder (3.2.2)
77 77 concurrent-ruby (1.0.2)
78 78 daemons (1.2.3)
79   - delayed_job (4.1.1)
80   - activesupport (>= 3.0, < 5.0)
81   - delayed_job_active_record (4.1.0)
82   - activerecord (>= 3.0, < 5)
  79 + delayed_job (4.1.2)
  80 + activesupport (>= 3.0, < 5.1)
  81 + delayed_job_active_record (4.1.1)
  82 + activerecord (>= 3.0, < 5.1)
83 83 delayed_job (>= 3.0, < 5)
84   - devise (4.1.0)
  84 + devise (4.1.1)
85 85 bcrypt (~> 3.0)
86 86 orm_adapter (~> 0.1)
87 87 railties (>= 4.1.0, < 5.1)
... ... @@ -89,7 +89,7 @@ GEM
89 89 warden (~> 1.2.3)
90 90 diff-lcs (1.2.5)
91 91 erubis (2.7.0)
92   - execjs (2.6.0)
  92 + execjs (2.7.0)
93 93 factory_girl (4.7.0)
94 94 activesupport (>= 3.0.0)
95 95 factory_girl_rails (4.7.0)
... ... @@ -98,7 +98,7 @@ GEM
98 98 globalid (0.3.6)
99 99 activesupport (>= 4.1.0)
100 100 i18n (0.7.0)
101   - jbuilder (2.4.1)
  101 + jbuilder (2.5.0)
102 102 activesupport (>= 3.0.0, < 5.1)
103 103 multi_json (~> 1.2)
104 104 jmespath (1.2.4)
... ... @@ -113,12 +113,12 @@ GEM
113 113 nokogiri (>= 1.5.9)
114 114 mail (2.6.4)
115 115 mime-types (>= 1.16, < 4)
116   - mime-types (3.0)
  116 + mime-types (3.1)
117 117 mime-types-data (~> 3.2015)
118   - mime-types-data (3.2016.0221)
  118 + mime-types-data (3.2016.0521)
119 119 mini_portile (0.5.3)
120 120 minitest (5.8.4)
121   - multi_json (1.12.0)
  121 + multi_json (1.12.1)
122 122 nokogiri (1.6.1)
123 123 mini_portile (~> 0.5.0)
124 124 orm_adapter (0.5.0)
... ... @@ -200,7 +200,7 @@ GEM
200 200 ref
201 201 thor (0.19.1)
202 202 thread_safe (0.3.5)
203   - tilt (2.0.2)
  203 + tilt (2.0.5)
204 204 tzinfo (1.2.2)
205 205 thread_safe (~> 0.1)
206 206 uglifier (3.0.0)
... ...
... ... @@ -23,11 +23,11 @@ module Kanjai
23 23 content_for_render = setTemplateContent(@page_data.page.page_template, layer, @page_data)
24 24 render :text => content_for_render and return
25 25 else
26   - #if stale?(@page_data, public: true)
  26 + if stale?(@page_data, public: false)
27 27 layer = @page_data.page.page_template.get_html_content
28 28 content_for_render = setTemplateContent(@page_data.page.page_template, layer, @page_data)
29 29 render :text => content_for_render and return
30   - #end
  30 + end
31 31 end
32 32 #render :html => content_for_render.html_safe
33 33 else
... ...
1 1 module Kanjai
2   - VERSION = "0.0.37"
  2 + VERSION = "0.0.38"
3 3 end
... ...