浏览代码

Updates to show this as an example

Lily Carpenter 10 年之前
父节点
当前提交
364114d1a3
共有 2 个文件被更改,包括 55 次插入44 次删除
  1. 54 43
      twilio/Gemfile.lock
  2. 1 1
      twilio/config/initializers/assets.rb

+ 54 - 43
twilio/Gemfile.lock

@@ -27,63 +27,71 @@ GEM
27 27
       minitest (~> 5.1)
28 28
       thread_safe (~> 0.1)
29 29
       tzinfo (~> 1.1)
30
-    addressable (2.3.6)
31
-    angular-rails-templates (0.1.3)
30
+    addressable (2.3.8)
31
+    angular-rails-templates (0.1.4)
32 32
       railties (>= 3.1)
33 33
       sprockets
34 34
       tilt
35 35
     arel (5.0.1.20140414130214)
36
-    bcrypt (3.1.7)
36
+    bcrypt (3.1.10)
37 37
     builder (3.2.2)
38 38
     coffee-rails (4.0.1)
39 39
       coffee-script (>= 2.2.0)
40 40
       railties (>= 4.0.0, < 5.0)
41
-    coffee-script (2.3.0)
41
+    coffee-script (2.4.1)
42 42
       coffee-script-source
43 43
       execjs
44
-    coffee-script-source (1.8.0)
44
+    coffee-script-source (1.9.1.1)
45 45
     commonjs (0.2.7)
46 46
     crack (0.4.2)
47 47
       safe_yaml (~> 1.0.0)
48 48
     diff-lcs (1.2.5)
49 49
     erubis (2.7.0)
50
-    execjs (2.2.1)
51
-    haml (4.0.5)
50
+    execjs (2.5.2)
51
+    haml (4.0.6)
52 52
       tilt
53
-    haml-rails (0.5.3)
53
+    haml-rails (0.9.0)
54 54
       actionpack (>= 4.0.1)
55 55
       activesupport (>= 4.0.1)
56
-      haml (>= 3.1, < 5.0)
56
+      haml (>= 4.0.6, < 5.0)
57
+      html2haml (>= 1.0.1)
57 58
       railties (>= 4.0.1)
58 59
     hike (1.2.3)
59
-    i18n (0.6.11)
60
-    jbuilder (2.1.3)
60
+    html2haml (2.0.0)
61
+      erubis (~> 2.7.0)
62
+      haml (~> 4.0.0)
63
+      nokogiri (~> 1.6.0)
64
+      ruby_parser (~> 3.5)
65
+    i18n (0.7.0)
66
+    jbuilder (2.2.13)
61 67
       activesupport (>= 3.0.0, < 5)
62 68
       multi_json (~> 1.2)
63
-    jquery-rails (3.1.1)
69
+    jquery-rails (3.1.2)
64 70
       railties (>= 3.0, < 5.0)
65 71
       thor (>= 0.14, < 2.0)
66
-    json (1.8.1)
67
-    jwt (1.0.0)
68
-    less (2.5.1)
72
+    json (1.8.2)
73
+    jwt (1.4.1)
74
+    less (2.6.0)
69 75
       commonjs (~> 0.2.7)
70
-    less-rails (2.5.0)
71
-      actionpack (>= 3.1)
72
-      less (~> 2.5.0)
73
-    libv8 (3.16.14.3)
76
+    less-rails (2.7.0)
77
+      actionpack (>= 4.0)
78
+      less (~> 2.6.0)
79
+      sprockets (> 2, < 4)
80
+      tilt
81
+    libv8 (3.16.14.7)
74 82
     mail (2.5.4)
75 83
       mime-types (~> 1.16)
76 84
       treetop (~> 1.4.8)
77 85
     mime-types (1.25.1)
78
-    mini_portile (0.6.0)
79
-    minitest (5.4.1)
80
-    multi_json (1.10.1)
81
-    nokogiri (1.6.3.1)
82
-      mini_portile (= 0.6.0)
83
-    pg (0.17.1)
86
+    mini_portile (0.6.2)
87
+    minitest (5.6.0)
88
+    multi_json (1.11.0)
89
+    nokogiri (1.6.6.2)
90
+      mini_portile (~> 0.6.0)
91
+    pg (0.18.1)
84 92
     polyglot (0.3.5)
85 93
     rack (1.5.2)
86
-    rack-test (0.6.2)
94
+    rack-test (0.6.3)
87 95
       rack (>= 1.0)
88 96
     rails (4.1.5)
89 97
       actionmailer (= 4.1.5)
@@ -100,8 +108,8 @@ GEM
100 108
       activesupport (= 4.1.5)
101 109
       rake (>= 0.8.7)
102 110
       thor (>= 0.18.1, < 2.0)
103
-    rake (10.3.2)
104
-    rdoc (4.1.1)
111
+    rake (10.4.2)
112
+    rdoc (4.2.0)
105 113
       json (~> 1.4)
106 114
     ref (1.0.5)
107 115
     rspec-core (3.0.4)
@@ -120,40 +128,43 @@ GEM
120 128
       rspec-mocks (~> 3.0.0)
121 129
       rspec-support (~> 3.0.0)
122 130
     rspec-support (3.0.4)
123
-    safe_yaml (1.0.3)
131
+    ruby_parser (3.6.6)
132
+      sexp_processor (~> 4.1)
133
+    safe_yaml (1.0.4)
124 134
     sass (3.2.19)
125
-    sass-rails (4.0.3)
135
+    sass-rails (4.0.5)
126 136
       railties (>= 4.0.0, < 5.0)
127
-      sass (~> 3.2.0)
128
-      sprockets (~> 2.8, <= 2.11.0)
137
+      sass (~> 3.2.2)
138
+      sprockets (~> 2.8, < 3.0)
129 139
       sprockets-rails (~> 2.0)
130 140
     sdoc (0.4.1)
131 141
       json (~> 1.7, >= 1.7.7)
132 142
       rdoc (~> 4.0)
133
-    spring (1.1.3)
134
-    sprockets (2.11.0)
143
+    sexp_processor (4.5.0)
144
+    spring (1.3.4)
145
+    sprockets (2.12.3)
135 146
       hike (~> 1.2)
136 147
       multi_json (~> 1.0)
137 148
       rack (~> 1.0)
138 149
       tilt (~> 1.1, != 1.3.0)
139
-    sprockets-rails (2.1.3)
150
+    sprockets-rails (2.2.4)
140 151
       actionpack (>= 3.0)
141 152
       activesupport (>= 3.0)
142
-      sprockets (~> 2.8)
143
-    therubyracer (0.12.1)
153
+      sprockets (>= 2.8, < 4.0)
154
+    therubyracer (0.12.2)
144 155
       libv8 (~> 3.16.14.0)
145 156
       ref
146 157
     thor (0.19.1)
147
-    thread_safe (0.3.4)
158
+    thread_safe (0.3.5)
148 159
     tilt (1.4.1)
149 160
     treetop (1.4.15)
150 161
       polyglot
151 162
       polyglot (>= 0.3.1)
152
-    turbolinks (2.3.0)
163
+    turbolinks (2.5.3)
153 164
       coffee-rails
154
-    twilio-ruby (3.12.2)
165
+    twilio-ruby (4.0.0)
155 166
       builder (>= 2.1.2)
156
-      jwt (~> 1.0.0)
167
+      jwt (~> 1.0)
157 168
       multi_json (>= 1.3.0)
158 169
     twitter-bootstrap-rails (3.2.0)
159 170
       actionpack (~> 4.1)
@@ -162,10 +173,10 @@ GEM
162 173
       railties (~> 4.1)
163 174
     tzinfo (1.2.2)
164 175
       thread_safe (~> 0.1)
165
-    uglifier (2.5.3)
176
+    uglifier (2.7.1)
166 177
       execjs (>= 0.3.0)
167 178
       json (>= 1.8.0)
168
-    webmock (1.18.0)
179
+    webmock (1.21.0)
169 180
       addressable (>= 2.3.6)
170 181
       crack (>= 0.3.2)
171 182
 

+ 1 - 1
twilio/config/initializers/assets.rb

@@ -5,4 +5,4 @@ Rails.application.config.assets.version = '1.0'
5 5
 
6 6
 # Precompile additional assets.
7 7
 # application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
8
-# Rails.application.config.assets.precompile += %w( search.js )
8
+Rails.application.config.assets.precompile += %w( messages.js )