Commit ed4fbcf6b004bacfe9ad3c99296d543921c477ed
Merge branch 'master' into fix_project_access_notification
Too many changes.
To preserve performance only 100 of 953 files displayed.
@@ -9,6 +9,8 @@ branches: | @@ -9,6 +9,8 @@ branches: | ||
9 | - 'master' | 9 | - 'master' |
10 | rvm: | 10 | rvm: |
11 | - 1.9.3 | 11 | - 1.9.3 |
12 | +services: | ||
13 | + - mysql | ||
12 | before_script: | 14 | before_script: |
13 | - "cp config/database.yml.$DB config/database.yml" | 15 | - "cp config/database.yml.$DB config/database.yml" |
14 | - "cp config/gitlab.yml.example config/gitlab.yml" | 16 | - "cp config/gitlab.yml.example config/gitlab.yml" |
@@ -323,7 +323,7 @@ GEM | @@ -323,7 +323,7 @@ GEM | ||
323 | multi_json (~> 1.0) | 323 | multi_json (~> 1.0) |
324 | rubyzip | 324 | rubyzip |
325 | settingslogic (2.0.8) | 325 | settingslogic (2.0.8) |
326 | - shoulda-matchers (1.1.0) | 326 | + shoulda-matchers (1.3.0) |
327 | activesupport (>= 3.0.0) | 327 | activesupport (>= 3.0.0) |
328 | simplecov (0.6.4) | 328 | simplecov (0.6.4) |
329 | multi_json (~> 1.0) | 329 | multi_json (~> 1.0) |
5.01 KB
4.95 KB
3.22 KB
3.61 KB
4.64 KB
4.04 KB
3.08 KB
3.77 KB
4.15 KB
4.37 KB
4.62 KB
3.41 KB
4.63 KB
6.9 KB
5.33 KB
3.62 KB
4.37 KB
6.52 KB
3.01 KB
4.92 KB
2.78 KB
5.5 KB
4.98 KB
4.24 KB
3.11 KB
3.1 KB
3.53 KB
2.94 KB
2.87 KB
3.13 KB
3.44 KB
3.44 KB
2.97 KB
3.26 KB
3.26 KB
2.95 KB
3.63 KB
3 KB
3.46 KB
3.12 KB
3.15 KB
3.16 KB
1.37 KB
4.71 KB
6.59 KB
2.87 KB
5.9 KB
3.98 KB
2.95 KB
5.78 KB
4.36 KB
3.87 KB
2.9 KB
3.42 KB
2.25 KB
1.79 KB
4.56 KB
3.82 KB
1.35 KB
5.45 KB
2.4 KB
4.15 KB
5.89 KB
6.24 KB
3.13 KB
2.72 KB
3.72 KB
5.43 KB
5.95 KB
6.44 KB
5.13 KB
2.7 KB
4.75 KB
5.6 KB
6.33 KB
4.61 KB
3.8 KB
4.76 KB
5.28 KB
2.31 KB
3.79 KB
2.3 KB
1.3 KB
4.13 KB
3.66 KB
4.97 KB
3.99 KB
4 KB
5.07 KB
4.73 KB
3.74 KB
5.09 KB
5.91 KB
4.59 KB
3.09 KB
6.39 KB
3.25 KB