Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
  • 4 commits
  • 4 files changed
  • 0 comments
  • 1 contributor
6  .hgignore
@@ -2,7 +2,7 @@
2 2
 (^|/)\.(bundle|DS_Store)$
3 3
 ^\.redcar$
4 4
 ^db/.*\.sqlite3$
5  
-^(log|tmp)/
  5
+^(log|tmp)(/|$)
6 6
 ^config/(newrelic\.yml|database\.yml|unicorn\.rb|local_config\.rb)$
7 7
 ^public/system/photos/
8 8
 ^[^/]+\.war
@@ -14,5 +14,5 @@
14 14
 ^public/sitemap(\d+|_index)\.xml\.gz$
15 15
 ^public/robots.txt$
16 16
 (^|/)\.rbx/
17  
-^public/assets/
18  
-^vendor/bundle/
  17
+^public/assets(/|$)
  18
+^vendor/bundle(/|$)
2  Gemfile
... ...
@@ -1,6 +1,6 @@
1 1
 source 'https://rubygems.org'
2 2
 
3  
-gem 'rails', '3.2.9'
  3
+gem 'rails', '3.2.10'
4 4
 gem 'jquery-rails'
5 5
 
6 6
 # Bundle edge Rails instead:
70  Gemfile.lock
... ...
@@ -1,12 +1,12 @@
1 1
 GEM
2 2
   remote: https://rubygems.org/
3 3
   specs:
4  
-    actionmailer (3.2.9)
5  
-      actionpack (= 3.2.9)
  4
+    actionmailer (3.2.10)
  5
+      actionpack (= 3.2.10)
6 6
       mail (~> 2.4.4)
7  
-    actionpack (3.2.9)
8  
-      activemodel (= 3.2.9)
9  
-      activesupport (= 3.2.9)
  7
+    actionpack (3.2.10)
  8
+      activemodel (= 3.2.10)
  9
+      activesupport (= 3.2.10)
10 10
       builder (~> 3.0.0)
11 11
       erubis (~> 2.7.0)
12 12
       journey (~> 1.0.4)
@@ -14,22 +14,22 @@ GEM
14 14
       rack-cache (~> 1.2)
15 15
       rack-test (~> 0.6.1)
16 16
       sprockets (~> 2.2.1)
17  
-    activemodel (3.2.9)
18  
-      activesupport (= 3.2.9)
  17
+    activemodel (3.2.10)
  18
+      activesupport (= 3.2.10)
19 19
       builder (~> 3.0.0)
20  
-    activerecord (3.2.9)
21  
-      activemodel (= 3.2.9)
22  
-      activesupport (= 3.2.9)
  20
+    activerecord (3.2.10)
  21
+      activemodel (= 3.2.10)
  22
+      activesupport (= 3.2.10)
23 23
       arel (~> 3.0.2)
24 24
       tzinfo (~> 0.3.29)
25  
-    activerecord-jdbc-adapter (1.2.2.1)
26  
-    activerecord-jdbcmysql-adapter (1.2.2.1)
27  
-      activerecord-jdbc-adapter (~> 1.2.2.1)
  25
+    activerecord-jdbc-adapter (1.2.5)
  26
+    activerecord-jdbcmysql-adapter (1.2.5)
  27
+      activerecord-jdbc-adapter (~> 1.2.5)
28 28
       jdbc-mysql (~> 5.1.0)
29  
-    activeresource (3.2.9)
30  
-      activemodel (= 3.2.9)
31  
-      activesupport (= 3.2.9)
32  
-    activesupport (3.2.9)
  29
+    activeresource (3.2.10)
  30
+      activemodel (= 3.2.10)
  31
+      activesupport (= 3.2.10)
  32
+    activesupport (3.2.10)
33 33
       i18n (~> 0.6)
34 34
       multi_json (~> 1.0)
35 35
     anjlab-bootstrap-rails (2.2.2.0)
@@ -46,12 +46,12 @@ GEM
46 46
     jdbc-mysql (5.1.22)
47 47
     journey (1.0.4)
48 48
     jquery-rails (2.1.4)
49  
-      railties (< 5.0, >= 3.0)
50  
-      thor (< 2.0, >= 0.14)
  49
+      railties (>= 3.0, < 5.0)
  50
+      thor (>= 0.14, < 2.0)
51 51
     jruby-openssl (0.8.2)
52 52
       bouncy-castle-java (>= 1.5.0146.1)
53  
-    json (1.7.5)
54  
-    json (1.7.5-java)
  53
+    json (1.7.6)
  54
+    json (1.7.6-java)
55 55
     kgio (2.7.4)
56 56
     mail (2.4.4)
57 57
       i18n (>= 0.4.0)
@@ -73,21 +73,21 @@ GEM
73 73
       rack
74 74
     rack-test (0.6.2)
75 75
       rack (>= 1.0)
76  
-    rails (3.2.9)
77  
-      actionmailer (= 3.2.9)
78  
-      actionpack (= 3.2.9)
79  
-      activerecord (= 3.2.9)
80  
-      activeresource (= 3.2.9)
81  
-      activesupport (= 3.2.9)
  76
+    rails (3.2.10)
  77
+      actionmailer (= 3.2.10)
  78
+      actionpack (= 3.2.10)
  79
+      activerecord (= 3.2.10)
  80
+      activeresource (= 3.2.10)
  81
+      activesupport (= 3.2.10)
82 82
       bundler (~> 1.0)
83  
-      railties (= 3.2.9)
84  
-    railties (3.2.9)
85  
-      actionpack (= 3.2.9)
86  
-      activesupport (= 3.2.9)
  83
+      railties (= 3.2.10)
  84
+    railties (3.2.10)
  85
+      actionpack (= 3.2.10)
  86
+      activesupport (= 3.2.10)
87 87
       rack-ssl (~> 1.3.2)
88 88
       rake (>= 0.8.7)
89 89
       rdoc (~> 3.4)
90  
-      thor (< 2.0, >= 0.14.6)
  90
+      thor (>= 0.14.6, < 2.0)
91 91
     raindrops (0.10.0)
92 92
     rake (10.0.3)
93 93
     rdoc (3.12)
@@ -101,7 +101,7 @@ GEM
101 101
       hike (~> 1.2)
102 102
       multi_json (~> 1.0)
103 103
       rack (~> 1.0)
104  
-      tilt (!= 1.3.0, ~> 1.1)
  104
+      tilt (~> 1.1, != 1.3.0)
105 105
     therubyrhino (2.0.2)
106 106
       therubyrhino_jar (>= 1.7.3)
107 107
     therubyrhino_jar (1.7.4)
@@ -113,7 +113,7 @@ GEM
113 113
     tzinfo (0.3.35)
114 114
     uglifier (1.3.0)
115 115
       execjs (>= 0.3.0)
116  
-      multi_json (>= 1.0.2, ~> 1.0)
  116
+      multi_json (~> 1.0, >= 1.0.2)
117 117
     unicorn (4.5.0)
118 118
       kgio (~> 2.6)
119 119
       rack
@@ -131,7 +131,7 @@ DEPENDENCIES
131 131
   mysql2
132 132
   newrelic_rpm
133 133
   puma
134  
-  rails (= 3.2.9)
  134
+  rails (= 3.2.10)
135 135
   sass-rails (~> 3.2.3)
136 136
   therubyrhino
137 137
   uglifier (>= 1.0.3)
0  tmp/.hgkeep
No changes.

No commit comments for this range

Something went wrong with that request. Please try again.