Download as
Browse Code »

Commit 36bbcc6fd613dd9d04c877f3b1db06a9d1c3a6fe

Authored by Dmitriy Zaporozhets
2 parents 51f48392 20189f84
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Merge pull request #1981 from riyad/update-gems 

Update Gems
Showing 7 changed files with 188 additions and 162 deletions   Show diff stats
@@ -17,7 +17,7 @@ gem "pg", group: :postgres @@ -17,7 +17,7 @@ gem "pg", group: :postgres
17 17
18 # Auth 18 # Auth
19 gem "devise", "~> 2.1.0" 19 gem "devise", "~> 2.1.0"
20 -gem 'omniauth' 20 +gem 'omniauth', "~> 1.1.1"
21 gem 'omniauth-google-oauth2' 21 gem 'omniauth-google-oauth2'
22 gem 'omniauth-twitter' 22 gem 'omniauth-twitter'
23 gem 'omniauth-github' 23 gem 'omniauth-github'
@@ -27,7 +27,7 @@ gem "grit", git: "https://github.com/gitlabhq/grit.git", ref: @@ -27,7 +27,7 @@ gem "grit", git: "https://github.com/gitlabhq/grit.git", ref:
27 gem "omniauth-ldap", git: "https://github.com/gitlabhq/omniauth-ldap.git", ref: 'f038dd852d7bd473a557e385d5d7c2fd5dc1dc2e' 27 gem "omniauth-ldap", git: "https://github.com/gitlabhq/omniauth-ldap.git", ref: 'f038dd852d7bd473a557e385d5d7c2fd5dc1dc2e'
28 gem 'yaml_db', git: "https://github.com/gitlabhq/yaml_db.git", ref: '98e9a5dca43e3fedd3268c76a73af40d1bdf1dfd' 28 gem 'yaml_db', git: "https://github.com/gitlabhq/yaml_db.git", ref: '98e9a5dca43e3fedd3268c76a73af40d1bdf1dfd'
29 gem 'grack', git: "https://github.com/gitlabhq/grack.git", ref: 'ba46f3b0845c6a09d488ae6abdce6ede37e227e8' 29 gem 'grack', git: "https://github.com/gitlabhq/grack.git", ref: 'ba46f3b0845c6a09d488ae6abdce6ede37e227e8'
30 -gem 'grit_ext', git: "https://github.com/gitlabhq/grit_ext.git", ref: '212fd40bea61f3c6a167223768e7295dc32bbc10' 30 +gem 'grit_ext', git: "https://github.com/gitlabhq/grit_ext.git", ref: '212fd40bea61f3c6a167223768e7295dc32bbc10'
31 31
32 # Gitolite client (for work with gitolite-admin repo) 32 # Gitolite client (for work with gitolite-admin repo)
33 gem "gitolite", '1.1.0' 33 gem "gitolite", '1.1.0'
@@ -46,13 +46,13 @@ gem "grape", "~> 0.2.1" @@ -46,13 +46,13 @@ gem "grape", "~> 0.2.1"
46 gem "stamp" 46 gem "stamp"
47 47
48 # Pagination 48 # Pagination
49 -gem "kaminari" 49 +gem "kaminari", "~> 0.14.1"
50 50
51 # HAML 51 # HAML
52 -gem "haml-rails" 52 +gem "haml-rails", "~> 0.3.5"
53 53
54 # Files attachments 54 # Files attachments
55 -gem "carrierwave" 55 +gem "carrierwave", "~> 0.7.1"
56 56
57 # Authorization 57 # Authorization
58 gem "six" 58 gem "six"
@@ -64,21 +64,21 @@ gem "ffaker" @@ -64,21 +64,21 @@ gem "ffaker"
64 gem "seed-fu" 64 gem "seed-fu"
65 65
66 # Markdown to HTML 66 # Markdown to HTML
67 -gem "redcarpet", "~> 2.1.1" 67 +gem "redcarpet", "~> 2.2.2"
68 gem "github-markup", "~> 0.7.4", require: 'github/markup' 68 gem "github-markup", "~> 0.7.4", require: 'github/markup'
69 69
70 # Servers 70 # Servers
71 gem "thin", '~> 1.5.0' 71 gem "thin", '~> 1.5.0'
72 -gem "unicorn" 72 +gem "unicorn", "~> 4.4.0"
73 73
74 # Issue tags 74 # Issue tags
75 -gem "acts-as-taggable-on", "2.3.1" 75 +gem "acts-as-taggable-on", "2.3.3"
76 76
77 # Decorators 77 # Decorators
78 -gem "draper" 78 +gem "draper", "~> 0.18.0"
79 79
80 # Background jobs 80 # Background jobs
81 -gem "resque", "~> 1.20.0" 81 +gem "resque", "~> 1.23.0"
82 gem 'resque_mailer' 82 gem 'resque_mailer'
83 83
84 # HTTP requests 84 # HTTP requests
@@ -87,34 +87,34 @@ gem "httparty" @@ -87,34 +87,34 @@ gem "httparty"
87 # Colored output to console 87 # Colored output to console
88 gem "colored" 88 gem "colored"
89 89
90 -# GITLAB settings 90 +# GitLab settings
91 gem 'settingslogic' 91 gem 'settingslogic'
92 92
93 # Misc 93 # Misc
94 gem "foreman" 94 gem "foreman"
95 -gem 'gemoji', require: 'emoji/railtie'  
96 gem "git" 95 gem "git"
97 96
98 group :assets do 97 group :assets do
99 - gem "sass-rails", "3.2.5"  
100 - gem "coffee-rails", "3.2.2"  
101 - gem "uglifier", "1.0.3" 98 + gem "sass-rails", "~> 3.2.5"
  99 + gem "coffee-rails", "~> 3.2.2"
  100 + gem "uglifier", "~> 1.3.0"
102 gem "therubyracer" 101 gem "therubyracer"
103 102
104 - gem 'chosen-rails'  
105 - gem 'jquery-atwho-rails', '0.1.6'  
106 - gem "jquery-rails", "2.0.2"  
107 - gem "jquery-ui-rails", "0.5.0"  
108 - gem "modernizr", "2.5.3"  
109 - gem "raphael-rails", "1.5.2" 103 + gem 'chosen-rails', "0.9.8"
  104 + gem 'jquery-atwho-rails', "0.1.6"
  105 + gem "jquery-rails", "2.1.3"
  106 + gem "jquery-ui-rails", "2.0.2"
  107 + gem "modernizr", "2.6.2"
  108 + gem "raphael-rails", "2.1.0"
110 gem 'bootstrap-sass', "2.0.4" 109 gem 'bootstrap-sass', "2.0.4"
111 gem "font-awesome-sass-rails", "~> 2.0.0" 110 gem "font-awesome-sass-rails", "~> 2.0.0"
  111 + gem "gemoji", "~> 1.2.1", require: 'emoji/railtie'
112 end 112 end
113 113
114 group :development do 114 group :development do
115 gem "annotate", git: "https://github.com/ctran/annotate_models.git" 115 gem "annotate", git: "https://github.com/ctran/annotate_models.git"
116 gem "letter_opener" 116 gem "letter_opener"
117 - gem 'quiet_assets', '1.0.1' 117 + gem 'quiet_assets', '~> 1.0.1'
118 gem 'rack-mini-profiler' 118 gem 'rack-mini-profiler'
119 end 119 end
120 120
@@ -144,7 +144,7 @@ end @@ -144,7 +144,7 @@ end
144 144
145 group :test do 145 group :test do
146 gem "simplecov", require: false 146 gem "simplecov", require: false
147 - gem "shoulda-matchers" 147 + gem "shoulda-matchers", "1.3.0"
148 gem 'email_spec' 148 gem 'email_spec'
149 gem 'resque_spec' 149 gem 'resque_spec'
150 gem "webmock" 150 gem "webmock"
1 GIT 1 GIT
2 remote: https://github.com/ctran/annotate_models.git 2 remote: https://github.com/ctran/annotate_models.git
3 - revision: 18cd39ad01829deba5aa34634b8540d6675ab978 3 + revision: be4e26825b521f0b2d86b181e2dff89901aa9b1e
4 specs: 4 specs:
5 - annotate (2.4.1.beta1) 5 + annotate (2.6.0.beta1)
  6 + activerecord (>= 2.3.0)
  7 + rake (>= 0.8.7)
6 8
7 GIT 9 GIT
8 remote: https://github.com/gitlabhq/grack.git 10 remote: https://github.com/gitlabhq/grack.git
@@ -87,78 +89,79 @@ GEM @@ -87,78 +89,79 @@ GEM
87 activesupport (3.2.9) 89 activesupport (3.2.9)
88 i18n (~> 0.6) 90 i18n (~> 0.6)
89 multi_json (~> 1.0) 91 multi_json (~> 1.0)
90 - acts-as-taggable-on (2.3.1) 92 + acts-as-taggable-on (2.3.3)
91 rails (~> 3.0) 93 rails (~> 3.0)
92 - addressable (2.2.8) 94 + addressable (2.3.2)
93 arel (3.0.2) 95 arel (3.0.2)
94 - awesome_print (1.0.2) 96 + awesome_print (1.1.0)
  97 + backports (2.6.5)
95 bcrypt-ruby (3.0.1) 98 bcrypt-ruby (3.0.1)
96 - blankslate (2.1.2.4) 99 + blankslate (3.1.2)
97 bootstrap-sass (2.0.4.0) 100 bootstrap-sass (2.0.4.0)
98 builder (3.0.4) 101 builder (3.0.4)
99 - capybara (1.1.2) 102 + capybara (1.1.3)
100 mime-types (>= 1.16) 103 mime-types (>= 1.16)
101 nokogiri (>= 1.3.3) 104 nokogiri (>= 1.3.3)
102 rack (>= 1.0.0) 105 rack (>= 1.0.0)
103 rack-test (>= 0.5.4) 106 rack-test (>= 0.5.4)
104 selenium-webdriver (~> 2.0) 107 selenium-webdriver (~> 2.0)
105 xpath (~> 0.1.4) 108 xpath (~> 0.1.4)
106 - carrierwave (0.6.2) 109 + carrierwave (0.7.1)
107 activemodel (>= 3.2.0) 110 activemodel (>= 3.2.0)
108 activesupport (>= 3.2.0) 111 activesupport (>= 3.2.0)
109 charlock_holmes (0.6.9) 112 charlock_holmes (0.6.9)
110 - childprocess (0.3.2)  
111 - ffi (~> 1.0.6)  
112 - chosen-rails (0.9.8.3) 113 + childprocess (0.3.6)
  114 + ffi (~> 1.0, >= 1.0.6)
  115 + chosen-rails (0.9.8)
113 railties (~> 3.0) 116 railties (~> 3.0)
114 thor (~> 0.14) 117 thor (~> 0.14)
115 - coderay (1.0.6) 118 + coderay (1.0.8)
116 coffee-rails (3.2.2) 119 coffee-rails (3.2.2)
117 coffee-script (>= 2.2.0) 120 coffee-script (>= 2.2.0)
118 railties (~> 3.2.0) 121 railties (~> 3.2.0)
119 coffee-script (2.2.0) 122 coffee-script (2.2.0)
120 coffee-script-source 123 coffee-script-source
121 execjs 124 execjs
122 - coffee-script-source (1.3.3) 125 + coffee-script-source (1.4.0)
123 colored (1.2) 126 colored (1.2)
124 colorize (0.5.8) 127 colorize (0.5.8)
125 crack (0.3.1) 128 crack (0.3.1)
126 daemons (1.1.9) 129 daemons (1.1.9)
127 - database_cleaner (0.8.0) 130 + database_cleaner (0.9.1)
128 devise (2.1.2) 131 devise (2.1.2)
129 bcrypt-ruby (~> 3.0) 132 bcrypt-ruby (~> 3.0)
130 orm_adapter (~> 0.1) 133 orm_adapter (~> 0.1)
131 railties (~> 3.1) 134 railties (~> 3.1)
132 warden (~> 1.2.1) 135 warden (~> 1.2.1)
133 diff-lcs (1.1.3) 136 diff-lcs (1.1.3)
134 - draper (0.17.0) 137 + draper (0.18.0)
135 actionpack (~> 3.2) 138 actionpack (~> 3.2)
136 activesupport (~> 3.2) 139 activesupport (~> 3.2)
137 - email_spec (1.2.1) 140 + email_spec (1.4.0)
  141 + launchy (~> 2.1)
138 mail (~> 2.2) 142 mail (~> 2.2)
139 - rspec (~> 2.0)  
140 erubis (2.7.0) 143 erubis (2.7.0)
141 escape_utils (0.2.4) 144 escape_utils (0.2.4)
142 eventmachine (1.0.0) 145 eventmachine (1.0.0)
143 execjs (1.4.0) 146 execjs (1.4.0)
144 multi_json (~> 1.0) 147 multi_json (~> 1.0)
145 - factory_girl (4.0.0) 148 + factory_girl (4.1.0)
146 activesupport (>= 3.0.0) 149 activesupport (>= 3.0.0)
147 - factory_girl_rails (4.0.0)  
148 - factory_girl (~> 4.0.0) 150 + factory_girl_rails (4.1.0)
  151 + factory_girl (~> 4.1.0)
149 railties (>= 3.0.0) 152 railties (>= 3.0.0)
150 faraday (0.8.4) 153 faraday (0.8.4)
151 multipart-post (~> 1.1) 154 multipart-post (~> 1.1)
152 faye-websocket (0.4.6) 155 faye-websocket (0.4.6)
153 eventmachine (>= 0.12.0) 156 eventmachine (>= 0.12.0)
154 - ffaker (1.14.0)  
155 - ffi (1.0.11) 157 + ffaker (1.15.0)
  158 + ffi (1.1.5)
156 font-awesome-sass-rails (2.0.0.0) 159 font-awesome-sass-rails (2.0.0.0)
157 railties (>= 3.1.1) 160 railties (>= 3.1.1)
158 sass-rails (>= 3.1.1) 161 sass-rails (>= 3.1.1)
159 - foreman (0.47.0) 162 + foreman (0.60.2)
160 thor (>= 0.13.6) 163 thor (>= 0.13.6)
161 - gemoji (1.1.1) 164 + gemoji (1.2.1)
162 gherkin-ruby (0.2.1) 165 gherkin-ruby (0.2.1)
163 git (1.2.5) 166 git (1.2.5)
164 github-linguist (2.3.4) 167 github-linguist (2.3.4)
@@ -172,75 +175,82 @@ GEM @@ -172,75 +175,82 @@ GEM
172 gratr19 (~> 0.4.4.1) 175 gratr19 (~> 0.4.4.1)
173 grit (~> 2.5.0) 176 grit (~> 2.5.0)
174 hashery (~> 1.5.0) 177 hashery (~> 1.5.0)
175 - grape (0.2.1) 178 + grape (0.2.2)
  179 + activesupport
176 hashie (~> 1.2) 180 hashie (~> 1.2)
177 - multi_json 181 + multi_json (>= 1.3.2)
178 multi_xml 182 multi_xml
179 rack 183 rack
  184 + rack-accept
180 rack-mount 185 rack-mount
  186 + virtus
181 gratr19 (0.4.4.1) 187 gratr19 (0.4.4.1)
182 growl (1.0.3) 188 growl (1.0.3)
183 - guard (1.3.2) 189 + guard (1.5.4)
184 listen (>= 0.4.2) 190 listen (>= 0.4.2)
  191 + lumberjack (>= 1.0.2)
  192 + pry (>= 0.9.10)
185 thor (>= 0.14.6) 193 thor (>= 0.14.6)
186 - guard-rspec (1.2.1) 194 + guard-rspec (2.1.2)
187 guard (>= 1.1) 195 guard (>= 1.1)
  196 + rspec (~> 2.11)
188 guard-spinach (0.0.2) 197 guard-spinach (0.0.2)
189 guard (>= 1.1) 198 guard (>= 1.1)
190 spinach 199 spinach
191 - haml (3.1.6)  
192 - haml-rails (0.3.4)  
193 - actionpack (~> 3.0)  
194 - activesupport (~> 3.0)  
195 - haml (~> 3.0)  
196 - railties (~> 3.0) 200 + haml (3.1.7)
  201 + haml-rails (0.3.5)
  202 + actionpack (>= 3.1, < 4.1)
  203 + activesupport (>= 3.1, < 4.1)
  204 + haml (~> 3.1)
  205 + railties (>= 3.1, < 4.1)
197 hashery (1.5.0) 206 hashery (1.5.0)
198 blankslate 207 blankslate
199 hashie (1.2.0) 208 hashie (1.2.0)
200 hike (1.2.1) 209 hike (1.2.1)
201 http_parser.rb (0.5.3) 210 http_parser.rb (0.5.3)
202 - httparty (0.8.3) 211 + httparty (0.9.0)
203 multi_json (~> 1.0) 212 multi_json (~> 1.0)
204 multi_xml 213 multi_xml
205 - httpauth (0.1) 214 + httpauth (0.2.0)
206 i18n (0.6.1) 215 i18n (0.6.1)
207 journey (1.0.4) 216 journey (1.0.4)
208 jquery-atwho-rails (0.1.6) 217 jquery-atwho-rails (0.1.6)
209 - jquery-rails (2.0.2)  
210 - railties (>= 3.2.0, < 5.0) 218 + jquery-rails (2.1.3)
  219 + railties (>= 3.1.0, < 5.0)
211 thor (~> 0.14) 220 thor (~> 0.14)
212 - jquery-ui-rails (0.5.0) 221 + jquery-ui-rails (2.0.2)
213 jquery-rails 222 jquery-rails
214 railties (>= 3.1.0) 223 railties (>= 3.1.0)
215 json (1.7.5) 224 json (1.7.5)
216 jwt (0.1.5) 225 jwt (0.1.5)
217 multi_json (>= 1.0) 226 multi_json (>= 1.0)
218 - kaminari (0.14.0) 227 + kaminari (0.14.1)
219 actionpack (>= 3.0.0) 228 actionpack (>= 3.0.0)
220 activesupport (>= 3.0.0) 229 activesupport (>= 3.0.0)
221 kgio (2.7.4) 230 kgio (2.7.4)
222 - launchy (2.1.0)  
223 - addressable (~> 2.2.6)  
224 - letter_opener (0.0.2)  
225 - launchy 231 + launchy (2.1.2)
  232 + addressable (~> 2.3)
  233 + letter_opener (1.0.0)
  234 + launchy (>= 2.0.4)
226 libv8 (3.3.10.4) 235 libv8 (3.3.10.4)
227 - libwebsocket (0.1.3)  
228 - addressable  
229 - listen (0.5.0) 236 + libwebsocket (0.1.6)
  237 + websocket
  238 + listen (0.5.3)
  239 + lumberjack (1.0.2)
230 mail (2.4.4) 240 mail (2.4.4)
231 i18n (>= 0.4.0) 241 i18n (>= 0.4.0)
232 mime-types (~> 1.16) 242 mime-types (~> 1.16)
233 treetop (~> 1.4.8) 243 treetop (~> 1.4.8)
234 - method_source (0.7.1) 244 + method_source (0.8.1)
235 mime-types (1.19) 245 mime-types (1.19)
236 - modernizr (2.5.3) 246 + modernizr (2.6.2)
237 sprockets (~> 2.0) 247 sprockets (~> 2.0)
238 multi_json (1.3.7) 248 multi_json (1.3.7)
239 multi_xml (0.5.1) 249 multi_xml (0.5.1)
240 multipart-post (1.1.5) 250 multipart-post (1.1.5)
241 mysql2 (0.3.11) 251 mysql2 (0.3.11)
242 net-ldap (0.2.2) 252 net-ldap (0.2.2)
243 - nokogiri (1.5.3) 253 + nokogiri (1.5.5)
244 oauth (0.4.7) 254 oauth (0.4.7)
245 oauth2 (0.8.0) 255 oauth2 (0.8.0)
246 faraday (~> 0.8) 256 faraday (~> 0.8)
@@ -248,7 +258,7 @@ GEM @@ -248,7 +258,7 @@ GEM
248 jwt (~> 0.1.4) 258 jwt (~> 0.1.4)
249 multi_json (~> 1.0) 259 multi_json (~> 1.0)
250 rack (~> 1.2) 260 rack (~> 1.2)
251 - omniauth (1.1.0) 261 + omniauth (1.1.1)
252 hashie (~> 1.2) 262 hashie (~> 1.2)
253 rack 263 rack
254 omniauth-github (1.0.3) 264 omniauth-github (1.0.3)
@@ -260,14 +270,14 @@ GEM @@ -260,14 +270,14 @@ GEM
260 omniauth-oauth (1.0.1) 270 omniauth-oauth (1.0.1)
261 oauth 271 oauth
262 omniauth (~> 1.0) 272 omniauth (~> 1.0)
263 - omniauth-oauth2 (1.1.0) 273 + omniauth-oauth2 (1.1.1)
264 oauth2 (~> 0.8.0) 274 oauth2 (~> 0.8.0)
265 omniauth (~> 1.0) 275 omniauth (~> 1.0)
266 - omniauth-twitter (0.0.13) 276 + omniauth-twitter (0.0.14)
267 multi_json (~> 1.3) 277 multi_json (~> 1.3)
268 omniauth-oauth (~> 1.0) 278 omniauth-oauth (~> 1.0)
269 - orm_adapter (0.3.0)  
270 - pg (0.14.0) 279 + orm_adapter (0.4.0)
  280 + pg (0.14.1)
271 poltergeist (1.0.2) 281 poltergeist (1.0.2)
272 capybara (~> 1.1) 282 capybara (~> 1.1)
273 childprocess (~> 0.3) 283 childprocess (~> 0.3)
@@ -276,17 +286,19 @@ GEM @@ -276,17 +286,19 @@ GEM
276 multi_json (~> 1.0) 286 multi_json (~> 1.0)
277 polyglot (0.3.3) 287 polyglot (0.3.3)
278 posix-spawn (0.3.6) 288 posix-spawn (0.3.6)
279 - pry (0.9.9.6) 289 + pry (0.9.10)
280 coderay (~> 1.0.5) 290 coderay (~> 1.0.5)
281 - method_source (~> 0.7.1)  
282 - slop (>= 2.4.4, < 3) 291 + method_source (~> 0.8)
  292 + slop (~> 3.3.1)
283 pyu-ruby-sasl (0.0.3.3) 293 pyu-ruby-sasl (0.0.3.3)
284 quiet_assets (1.0.1) 294 quiet_assets (1.0.1)
285 railties (~> 3.1) 295 railties (~> 3.1)
286 rack (1.4.1) 296 rack (1.4.1)
  297 + rack-accept (0.4.5)
  298 + rack (>= 0.4)
287 rack-cache (1.2) 299 rack-cache (1.2)
288 rack (>= 0.4) 300 rack (>= 0.4)
289 - rack-mini-profiler (0.1.9) 301 + rack-mini-profiler (0.1.23)
290 rack (>= 1.1.3) 302 rack (>= 1.1.3)
291 rack-mount (0.8.3) 303 rack-mount (0.8.3)
292 rack (>= 1.0.0) 304 rack (>= 1.0.0)
@@ -314,45 +326,46 @@ GEM @@ -314,45 +326,46 @@ GEM
314 rake (>= 0.8.7) 326 rake (>= 0.8.7)
315 rdoc (~> 3.4) 327 rdoc (~> 3.4)
316 thor (>= 0.14.6, < 2.0) 328 thor (>= 0.14.6, < 2.0)
317 - raindrops (0.9.0)  
318 - rake (10.0.0)  
319 - raphael-rails (1.5.2)  
320 - rb-fsevent (0.9.1) 329 + raindrops (0.10.0)
  330 + rake (10.0.1)
  331 + raphael-rails (2.1.0)
  332 + rb-fsevent (0.9.2)
321 rb-inotify (0.8.8) 333 rb-inotify (0.8.8)
322 ffi (>= 0.5.0) 334 ffi (>= 0.5.0)
323 rdoc (3.12) 335 rdoc (3.12)
324 json (~> 1.4) 336 json (~> 1.4)
325 - redcarpet (2.1.1)  
326 - redis (2.2.2)  
327 - redis-namespace (1.0.3)  
328 - redis (< 3.0.0)  
329 - resque (1.20.0) 337 + redcarpet (2.2.2)
  338 + redis (3.0.2)
  339 + redis-namespace (1.2.1)
  340 + redis (~> 3.0.0)
  341 + resque (1.23.0)
330 multi_json (~> 1.0) 342 multi_json (~> 1.0)
331 - redis-namespace (~> 1.0.2) 343 + redis-namespace (~> 1.0)
332 sinatra (>= 0.9.2) 344 sinatra (>= 0.9.2)
333 vegas (~> 0.1.2) 345 vegas (~> 0.1.2)
334 - resque_mailer (2.0.3)  
335 - actionmailer (>= 3.0.0)  
336 - resque (>= 1.2.3)  
337 - resque_spec (0.11.0) 346 + resque_mailer (2.1.0)
  347 + actionmailer (~> 3.0)
  348 + resque_spec (0.12.5)
338 resque (>= 1.19.0) 349 resque (>= 1.19.0)
339 rspec (>= 2.5.0) 350 rspec (>= 2.5.0)
340 - rspec (2.10.0)  
341 - rspec-core (~> 2.10.0)  
342 - rspec-expectations (~> 2.10.0)  
343 - rspec-mocks (~> 2.10.0)  
344 - rspec-core (2.10.1)  
345 - rspec-expectations (2.10.0) 351 + rspec (2.12.0)
  352 + rspec-core (~> 2.12.0)
  353 + rspec-expectations (~> 2.12.0)
  354 + rspec-mocks (~> 2.12.0)
  355 + rspec-core (2.12.0)
  356 + rspec-expectations (2.12.0)
346 diff-lcs (~> 1.1.3) 357 diff-lcs (~> 1.1.3)
347 - rspec-mocks (2.10.1)  
348 - rspec-rails (2.10.1) 358 + rspec-mocks (2.12.0)
  359 + rspec-rails (2.12.0)
349 actionpack (>= 3.0) 360 actionpack (>= 3.0)
350 activesupport (>= 3.0) 361 activesupport (>= 3.0)
351 railties (>= 3.0) 362 railties (>= 3.0)
352 - rspec (~> 2.10.0) 363 + rspec-core (~> 2.12.0)
  364 + rspec-expectations (~> 2.12.0)
  365 + rspec-mocks (~> 2.12.0)
353 rubyntlm (0.1.1) 366 rubyntlm (0.1.1)
354 - rubyzip (0.9.8)  
355 - sass (3.1.19) 367 + rubyzip (0.9.9)
  368 + sass (3.2.3)
356 sass-rails (3.2.5) 369 sass-rails (3.2.5)
357 railties (~> 3.2.0) 370 railties (~> 3.2.0)
358 sass (>= 3.1.10) 371 sass (>= 3.1.10)
@@ -360,25 +373,24 @@ GEM @@ -360,25 +373,24 @@ GEM
360 seed-fu (2.2.0) 373 seed-fu (2.2.0)
361 activerecord (~> 3.1) 374 activerecord (~> 3.1)
362 activesupport (~> 3.1) 375 activesupport (~> 3.1)
363 - selenium-webdriver (2.22.2) 376 + selenium-webdriver (2.26.0)
364 childprocess (>= 0.2.5) 377 childprocess (>= 0.2.5)
365 - ffi (~> 1.0)  
366 libwebsocket (~> 0.1.3) 378 libwebsocket (~> 0.1.3)
367 multi_json (~> 1.0) 379 multi_json (~> 1.0)
368 rubyzip 380 rubyzip
369 settingslogic (2.0.8) 381 settingslogic (2.0.8)
370 shoulda-matchers (1.3.0) 382 shoulda-matchers (1.3.0)
371 activesupport (>= 3.0.0) 383 activesupport (>= 3.0.0)
372 - simplecov (0.6.4) 384 + simplecov (0.7.1)
373 multi_json (~> 1.0) 385 multi_json (~> 1.0)
374 - simplecov-html (~> 0.5.3)  
375 - simplecov-html (0.5.3)  
376 - sinatra (1.3.2) 386 + simplecov-html (~> 0.7.1)
  387 + simplecov-html (0.7.1)
  388 + sinatra (1.3.3)
377 rack (~> 1.3, >= 1.3.6) 389 rack (~> 1.3, >= 1.3.6)
378 rack-protection (~> 1.2) 390 rack-protection (~> 1.2)
379 tilt (~> 1.3, >= 1.3.3) 391 tilt (~> 1.3, >= 1.3.3)
380 six (0.2.0) 392 six (0.2.0)
381 - slop (2.4.4) 393 + slop (3.3.3)
382 spinach (0.5.2) 394 spinach (0.5.2)
383 colorize 395 colorize
384 gherkin-ruby (~> 0.2.0) 396 gherkin-ruby (~> 0.2.0)
@@ -392,9 +404,9 @@ GEM @@ -392,9 +404,9 @@ GEM
392 rack (~> 1.0) 404 rack (~> 1.0)
393 tilt (~> 1.1, != 1.3.0) 405 tilt (~> 1.1, != 1.3.0)
394 sqlite3 (1.3.6) 406 sqlite3 (1.3.6)
395 - stamp (0.1.6) 407 + stamp (0.3.0)
396 test_after_commit (0.0.1) 408 test_after_commit (0.0.1)
397 - therubyracer (0.10.1) 409 + therubyracer (0.10.2)
398 libv8 (~> 3.3.10) 410 libv8 (~> 3.3.10)
399 thin (1.5.0) 411 thin (1.5.0)
400 daemons (>= 1.0.9) 412 daemons (>= 1.0.9)
@@ -406,20 +418,23 @@ GEM @@ -406,20 +418,23 @@ GEM
406 polyglot 418 polyglot
407 polyglot (>= 0.3.1) 419 polyglot (>= 0.3.1)
408 tzinfo (0.3.35) 420 tzinfo (0.3.35)
409 - uglifier (1.0.3) 421 + uglifier (1.3.0)
410 execjs (>= 0.3.0) 422 execjs (>= 0.3.0)
411 - multi_json (>= 1.0.2)  
412 - unicorn (4.3.1) 423 + multi_json (~> 1.0, >= 1.0.2)
  424 + unicorn (4.4.0)
413 kgio (~> 2.6) 425 kgio (~> 2.6)
414 rack 426 rack
415 raindrops (~> 0.7) 427 raindrops (~> 0.7)
416 vegas (0.1.11) 428 vegas (0.1.11)
417 rack (>= 1.0.0) 429 rack (>= 1.0.0)
  430 + virtus (0.5.2)
  431 + backports (~> 2.6.1)
418 warden (1.2.1) 432 warden (1.2.1)
419 rack (>= 1.0) 433 rack (>= 1.0)
420 - webmock (1.8.7) 434 + webmock (1.9.0)
421 addressable (>= 2.2.7) 435 addressable (>= 2.2.7)
422 crack (>= 0.1.7) 436 crack (>= 0.1.7)
  437 + websocket (1.0.2)
423 xpath (0.1.4) 438 xpath (0.1.4)
424 nokogiri (~> 1.3) 439 nokogiri (~> 1.3)
425 yajl-ruby (1.1.0) 440 yajl-ruby (1.1.0)
@@ -428,24 +443,24 @@ PLATFORMS @@ -428,24 +443,24 @@ PLATFORMS
428 ruby 443 ruby
429 444
430 DEPENDENCIES 445 DEPENDENCIES
431 - acts-as-taggable-on (= 2.3.1) 446 + acts-as-taggable-on (= 2.3.3)
432 annotate! 447 annotate!
433 awesome_print 448 awesome_print
434 bootstrap-sass (= 2.0.4) 449 bootstrap-sass (= 2.0.4)
435 capybara 450 capybara
436 - carrierwave  
437 - chosen-rails  
438 - coffee-rails (= 3.2.2) 451 + carrierwave (~> 0.7.1)
  452 + chosen-rails (= 0.9.8)
  453 + coffee-rails (~> 3.2.2)
439 colored 454 colored
440 database_cleaner 455 database_cleaner
441 devise (~> 2.1.0) 456 devise (~> 2.1.0)
442 - draper 457 + draper (~> 0.18.0)
443 email_spec 458 email_spec
444 factory_girl_rails 459 factory_girl_rails
445 ffaker 460 ffaker
446 font-awesome-sass-rails (~> 2.0.0) 461 font-awesome-sass-rails (~> 2.0.0)
447 foreman 462 foreman
448 - gemoji 463 + gemoji (~> 1.2.1)
449 git 464 git
450 github-linguist (~> 2.3.4) 465 github-linguist (~> 2.3.4)
451 github-markup (~> 0.7.4) 466 github-markup (~> 0.7.4)
@@ -458,17 +473,17 @@ DEPENDENCIES @@ -458,17 +473,17 @@ DEPENDENCIES
458 growl 473 growl
459 guard-rspec 474 guard-rspec
460 guard-spinach 475 guard-spinach
461 - haml-rails 476 + haml-rails (~> 0.3.5)
462 httparty 477 httparty
463 jquery-atwho-rails (= 0.1.6) 478 jquery-atwho-rails (= 0.1.6)
464 - jquery-rails (= 2.0.2)  
465 - jquery-ui-rails (= 0.5.0)  
466 - kaminari 479 + jquery-rails (= 2.1.3)
  480 + jquery-ui-rails (= 2.0.2)
  481 + kaminari (~> 0.14.1)
467 launchy 482 launchy
468 letter_opener 483 letter_opener
469 - modernizr (= 2.5.3) 484 + modernizr (= 2.6.2)
470 mysql2 485 mysql2
471 - omniauth 486 + omniauth (~> 1.1.1)
472 omniauth-github 487 omniauth-github
473 omniauth-google-oauth2 488 omniauth-google-oauth2
474 omniauth-ldap! 489 omniauth-ldap!
@@ -477,22 +492,22 @@ DEPENDENCIES @@ -477,22 +492,22 @@ DEPENDENCIES
477 poltergeist 492 poltergeist
478 pry 493 pry
479 pygments.rb! 494 pygments.rb!
480 - quiet_assets (= 1.0.1) 495 + quiet_assets (~> 1.0.1)
481 rack-mini-profiler 496 rack-mini-profiler
482 rails (= 3.2.9) 497 rails (= 3.2.9)
483 rails-dev-tweaks 498 rails-dev-tweaks
484 - raphael-rails (= 1.5.2) 499 + raphael-rails (= 2.1.0)
485 rb-fsevent 500 rb-fsevent
486 rb-inotify 501 rb-inotify
487 - redcarpet (~> 2.1.1)  
488 - resque (~> 1.20.0) 502 + redcarpet (~> 2.2.2)
  503 + resque (~> 1.23.0)
489 resque_mailer 504 resque_mailer
490 resque_spec 505 resque_spec
491 rspec-rails 506 rspec-rails
492 - sass-rails (= 3.2.5) 507 + sass-rails (~> 3.2.5)
493 seed-fu 508 seed-fu
494 settingslogic 509 settingslogic
495 - shoulda-matchers 510 + shoulda-matchers (= 1.3.0)
496 simplecov 511 simplecov
497 six 512 six
498 spinach-rails 513 spinach-rails
@@ -501,7 +516,7 @@ DEPENDENCIES @@ -501,7 +516,7 @@ DEPENDENCIES
501 test_after_commit 516 test_after_commit
502 therubyracer 517 therubyracer
503 thin (~> 1.5.0) 518 thin (~> 1.5.0)
504 - uglifier (= 1.0.3)  
505 - unicorn 519 + uglifier (~> 1.3.0)
  520 + unicorn (~> 4.4.0)
506 webmock 521 webmock
507 yaml_db! 522 yaml_db!
config/application.rb
  Diff comments   View file @36bbcc6
@@ -4,7 +4,7 @@ require &#39;rails/all&#39; @@ -4,7 +4,7 @@ require &#39;rails/all&#39;
4 4
5 if defined?(Bundler) 5 if defined?(Bundler)
6 # If you precompile assets before deploying to production, use this line 6 # If you precompile assets before deploying to production, use this line
7 - # Bundler.require *Rails.groups(:assets => %w(development test)) 7 + # Bundler.require(*Rails.groups(:assets => %w(development test)))
8 # If you want your assets lazily compiled in production, use this line 8 # If you want your assets lazily compiled in production, use this line
9 Bundler.require(:default, :assets, Rails.env) 9 Bundler.require(:default, :assets, Rails.env)
10 end 10 end
@@ -47,6 +47,14 @@ module Gitlab @@ -47,6 +47,14 @@ module Gitlab
47 # Configure sensitive parameters which will be filtered from the log file. 47 # Configure sensitive parameters which will be filtered from the log file.
48 config.filter_parameters += [:password] 48 config.filter_parameters += [:password]
49 49
  50 + # Enable escaping HTML in JSON.
  51 + config.active_support.escape_html_entities_in_json = true
  52 +
  53 + # Use SQL instead of Active Record's schema dumper when creating the database.
  54 + # This is necessary if your schema can't be completely dumped by the schema dumper,
  55 + # like if you have constraints or database-specific column types
  56 + # config.active_record.schema_format = :sql
  57 +
50 # Enforce whitelist mode for mass assignment. 58 # Enforce whitelist mode for mass assignment.
51 # This will create an empty whitelist of attributes available for mass-assignment for all models 59 # This will create an empty whitelist of attributes available for mass-assignment for all models
52 # in your app. As such, your models will need to explicitly whitelist or blacklist accessible 60 # in your app. As such, your models will need to explicitly whitelist or blacklist accessible
config/environments/development.rb
  Diff comments   View file @36bbcc6
@@ -2,7 +2,7 @@ Gitlab::Application.configure do @@ -2,7 +2,7 @@ Gitlab::Application.configure do
2 # Settings specified here will take precedence over those in config/application.rb 2 # Settings specified here will take precedence over those in config/application.rb
3 3
4 # In the development environment your application's code is reloaded on 4 # In the development environment your application's code is reloaded on
5 - # every request. This slows down response time but is perfect for development 5 + # every request. This slows down response time but is perfect for development
6 # since you don't have to restart the web server when you make code changes. 6 # since you don't have to restart the web server when you make code changes.
7 config.cache_classes = false 7 config.cache_classes = false
8 8
@@ -22,19 +22,21 @@ Gitlab::Application.configure do @@ -22,19 +22,21 @@ Gitlab::Application.configure do
22 # Only use best-standards-support built into browsers 22 # Only use best-standards-support built into browsers
23 config.action_dispatch.best_standards_support = :builtin 23 config.action_dispatch.best_standards_support = :builtin
24 24
  25 + # Raise exception on mass assignment protection for Active Record models
  26 + config.active_record.mass_assignment_sanitizer = :strict
  27 +
  28 + # Log the query plan for queries taking more than this (works
  29 + # with SQLite, MySQL, and PostgreSQL)
  30 + config.active_record.auto_explain_threshold_in_seconds = 0.5
  31 +
25 # Do not compress assets 32 # Do not compress assets
26 config.assets.compress = false 33 config.assets.compress = false
27 34
28 # Expands the lines which load the assets 35 # Expands the lines which load the assets
29 config.assets.debug = true 36 config.assets.debug = true
30 37
31 - config.action_mailer.default_url_options = { :host => 'localhost:3000' } 38 + # For having correct urls in mails
  39 + config.action_mailer.default_url_options = { host: 'localhost', port: 3000 }
  40 + # Open sent mails in browser
32 config.action_mailer.delivery_method = :letter_opener 41 config.action_mailer.delivery_method = :letter_opener
33 -  
34 - # Raise exception on mass assignment protection for Active Record models  
35 - config.active_record.mass_assignment_sanitizer = :strict  
36 -  
37 - # Log the query plan for queries taking more than this (works  
38 - # with SQLite, MySQL, and PostgreSQL)  
39 - config.active_record.auto_explain_threshold_in_seconds = 0.5  
40 end 42 end
config/environments/production.rb
  Diff comments   View file @36bbcc6
@@ -20,7 +20,7 @@ Gitlab::Application.configure do @@ -20,7 +20,7 @@ Gitlab::Application.configure do
20 # Generate digests for assets URLs 20 # Generate digests for assets URLs
21 config.assets.digest = true 21 config.assets.digest = true
22 22
23 - # Defaults to Rails.root.join("public/assets") 23 + # Defaults to nil and saved in location specified by config.assets.prefix
24 # config.assets.manifest = YOUR_PATH 24 # config.assets.manifest = YOUR_PATH
25 25
26 # Specifies the header that your server uses for sending files 26 # Specifies the header that your server uses for sending files
@@ -33,8 +33,11 @@ Gitlab::Application.configure do @@ -33,8 +33,11 @@ Gitlab::Application.configure do
33 # See everything in the log (default is :info) 33 # See everything in the log (default is :info)
34 # config.log_level = :debug 34 # config.log_level = :debug
35 35
  36 + # Prepend all log lines with the following tags
  37 + # config.log_tags = [ :subdomain, :uuid ]
  38 +
36 # Use a different logger for distributed setups 39 # Use a different logger for distributed setups
37 - # config.logger = SyslogLogger.new 40 + # config.logger = ActiveSupport::TaggedLogging.new(SyslogLogger.new)
38 41
39 # Use a different cache store in production 42 # Use a different cache store in production
40 config.cache_store = :memory_store 43 config.cache_store = :memory_store
@@ -58,6 +61,10 @@ Gitlab::Application.configure do @@ -58,6 +61,10 @@ Gitlab::Application.configure do
58 # Send deprecation notices to registered listeners 61 # Send deprecation notices to registered listeners
59 config.active_support.deprecation = :notify 62 config.active_support.deprecation = :notify
60 63
  64 + # Log the query plan for queries taking more than this (works
  65 + # with SQLite, MySQL, and PostgreSQL)
  66 + # config.active_record.auto_explain_threshold_in_seconds = 0.5
  67 +
61 config.action_mailer.delivery_method = :sendmail 68 config.action_mailer.delivery_method = :sendmail
62 # Defaults to: 69 # Defaults to:
63 # # config.action_mailer.sendmail_settings = { 70 # # config.action_mailer.sendmail_settings = {
config/environments/test.rb
  Diff comments   View file @36bbcc6
@@ -2,9 +2,9 @@ Gitlab::Application.configure do @@ -2,9 +2,9 @@ Gitlab::Application.configure do
2 # Settings specified here will take precedence over those in config/application.rb 2 # Settings specified here will take precedence over those in config/application.rb
3 3
4 # The test environment is used exclusively to run your application's 4 # The test environment is used exclusively to run your application's
5 - # test suite. You never need to work with it otherwise. Remember that 5 + # test suite. You never need to work with it otherwise. Remember that
6 # your test database is "scratch space" for the test suite and is wiped 6 # your test database is "scratch space" for the test suite and is wiped
7 - # and recreated between test runs. Don't rely on the data there! 7 + # and recreated between test runs. Don't rely on the data there!
8 config.cache_classes = true 8 config.cache_classes = true
9 9
10 # Configure static asset server for tests with Cache-Control for performance 10 # Configure static asset server for tests with Cache-Control for performance
@@ -29,17 +29,9 @@ Gitlab::Application.configure do @@ -29,17 +29,9 @@ Gitlab::Application.configure do
29 # ActionMailer::Base.deliveries array. 29 # ActionMailer::Base.deliveries array.
30 config.action_mailer.delivery_method = :test 30 config.action_mailer.delivery_method = :test
31 31
32 - # Use SQL instead of Active Record's schema dumper when creating the test database.  
33 - # This is necessary if your schema can't be completely dumped by the schema dumper,  
34 - # like if you have constraints or database-specific column types  
35 - # config.active_record.schema_format = :sql  
36 -  
37 # Raise exception on mass assignment protection for Active Record models 32 # Raise exception on mass assignment protection for Active Record models
38 # config.active_record.mass_assignment_sanitizer = :strict 33 # config.active_record.mass_assignment_sanitizer = :strict
39 34
40 # Print deprecation notices to the stderr 35 # Print deprecation notices to the stderr
41 config.active_support.deprecation = :stderr 36 config.active_support.deprecation = :stderr
42 -  
43 - # Allow pass debug_assets=true as a query parameter to load pages with unpackaged assets  
44 - config.assets.allow_debugging = true  
45 end 37 end
config/initializers/gemoji.rb 0 → 100644
  Diff comments   View file @36bbcc6
@@ -0,0 +1,2 @@ @@ -0,0 +1,2 @@
  1 +# Workaround for https://github.com/github/gemoji/pull/18
  2 +Gitlab::Application.config.assets.paths << Emoji.images_path