Skip to content

G
gitlab-ce
Commit 36bbcc6f authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files
Options

Merge pull request #1981 from riyad/update-gems 

Update Gems
parents 51f48392 20189f84
Hide whitespace changes
Inline Side-by-side
Showing with 188 additions and 162 deletions
Gemfile
View file @ 36bbcc6f
...@@ -17,7 +17,7 @@ gem "pg", group: :postgres ...@@ -17,7 +17,7 @@ gem "pg", group: :postgres
# Auth # Auth
gem "devise", "~> 2.1.0" gem "devise", "~> 2.1.0"
gem 'omniauth' gem 'omniauth', "~> 1.1.1"
gem 'omniauth-google-oauth2' gem 'omniauth-google-oauth2'
gem 'omniauth-twitter' gem 'omniauth-twitter'
gem 'omniauth-github' 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:
gem "omniauth-ldap", git: "https://github.com/gitlabhq/omniauth-ldap.git", ref: 'f038dd852d7bd473a557e385d5d7c2fd5dc1dc2e' gem "omniauth-ldap", git: "https://github.com/gitlabhq/omniauth-ldap.git", ref: 'f038dd852d7bd473a557e385d5d7c2fd5dc1dc2e'
gem 'yaml_db', git: "https://github.com/gitlabhq/yaml_db.git", ref: '98e9a5dca43e3fedd3268c76a73af40d1bdf1dfd' gem 'yaml_db', git: "https://github.com/gitlabhq/yaml_db.git", ref: '98e9a5dca43e3fedd3268c76a73af40d1bdf1dfd'
gem 'grack', git: "https://github.com/gitlabhq/grack.git", ref: 'ba46f3b0845c6a09d488ae6abdce6ede37e227e8' gem 'grack', git: "https://github.com/gitlabhq/grack.git", ref: 'ba46f3b0845c6a09d488ae6abdce6ede37e227e8'
gem 'grit_ext', git: "https://github.com/gitlabhq/grit_ext.git", ref: '212fd40bea61f3c6a167223768e7295dc32bbc10' gem 'grit_ext', git: "https://github.com/gitlabhq/grit_ext.git", ref: '212fd40bea61f3c6a167223768e7295dc32bbc10'
# Gitolite client (for work with gitolite-admin repo) # Gitolite client (for work with gitolite-admin repo)
gem "gitolite", '1.1.0' gem "gitolite", '1.1.0'
...@@ -46,13 +46,13 @@ gem "grape", "~> 0.2.1" ...@@ -46,13 +46,13 @@ gem "grape", "~> 0.2.1"
gem "stamp" gem "stamp"
# Pagination # Pagination
gem "kaminari" gem "kaminari", "~> 0.14.1"
# HAML # HAML
gem "haml-rails" gem "haml-rails", "~> 0.3.5"
# Files attachments # Files attachments
gem "carrierwave" gem "carrierwave", "~> 0.7.1"
# Authorization # Authorization
gem "six" gem "six"
...@@ -64,21 +64,21 @@ gem "ffaker" ...@@ -64,21 +64,21 @@ gem "ffaker"
gem "seed-fu" gem "seed-fu"
# Markdown to HTML # Markdown to HTML
gem "redcarpet", "~> 2.1.1" gem "redcarpet", "~> 2.2.2"
gem "github-markup", "~> 0.7.4", require: 'github/markup' gem "github-markup", "~> 0.7.4", require: 'github/markup'
# Servers # Servers
gem "thin", '~> 1.5.0' gem "thin", '~> 1.5.0'
gem "unicorn" gem "unicorn", "~> 4.4.0"
# Issue tags # Issue tags
gem "acts-as-taggable-on", "2.3.1" gem "acts-as-taggable-on", "2.3.3"
# Decorators # Decorators
gem "draper" gem "draper", "~> 0.18.0"
# Background jobs # Background jobs
gem "resque", "~> 1.20.0" gem "resque", "~> 1.23.0"
gem 'resque_mailer' gem 'resque_mailer'
# HTTP requests # HTTP requests
...@@ -87,34 +87,34 @@ gem "httparty" ...@@ -87,34 +87,34 @@ gem "httparty"
# Colored output to console # Colored output to console
gem "colored" gem "colored"
# GITLAB settings # GitLab settings
gem 'settingslogic' gem 'settingslogic'
# Misc # Misc
gem "foreman" gem "foreman"
gem 'gemoji', require: 'emoji/railtie'
gem "git" gem "git"
group :assets do group :assets do
gem "sass-rails", "3.2.5" gem "sass-rails", "~> 3.2.5"
gem "coffee-rails", "3.2.2" gem "coffee-rails", "~> 3.2.2"
gem "uglifier", "1.0.3" gem "uglifier", "~> 1.3.0"
gem "therubyracer" gem "therubyracer"
gem 'chosen-rails' gem 'chosen-rails', "0.9.8"
gem 'jquery-atwho-rails', '0.1.6' gem 'jquery-atwho-rails', "0.1.6"
gem "jquery-rails", "2.0.2" gem "jquery-rails", "2.1.3"
gem "jquery-ui-rails", "0.5.0" gem "jquery-ui-rails", "2.0.2"
gem "modernizr", "2.5.3" gem "modernizr", "2.6.2"
gem "raphael-rails", "1.5.2" gem "raphael-rails", "2.1.0"
gem 'bootstrap-sass', "2.0.4" gem 'bootstrap-sass', "2.0.4"
gem "font-awesome-sass-rails", "~> 2.0.0" gem "font-awesome-sass-rails", "~> 2.0.0"
gem "gemoji", "~> 1.2.1", require: 'emoji/railtie'
end end
group :development do group :development do
gem "annotate", git: "https://github.com/ctran/annotate_models.git" gem "annotate", git: "https://github.com/ctran/annotate_models.git"
gem "letter_opener" gem "letter_opener"
gem 'quiet_assets', '1.0.1' gem 'quiet_assets', '~> 1.0.1'
gem 'rack-mini-profiler' gem 'rack-mini-profiler'
end end
...@@ -144,7 +144,7 @@ end ...@@ -144,7 +144,7 @@ end
group :test do group :test do
gem "simplecov", require: false gem "simplecov", require: false
gem "shoulda-matchers" gem "shoulda-matchers", "1.3.0"
gem 'email_spec' gem 'email_spec'
gem 'resque_spec' gem 'resque_spec'
gem "webmock" gem "webmock"
......
Gemfile.lock
View file @ 36bbcc6f
GIT GIT
remote: https://github.com/ctran/annotate_models.git remote: https://github.com/ctran/annotate_models.git
revision: 18cd39ad01829deba5aa34634b8540d6675ab978 revision: be4e26825b521f0b2d86b181e2dff89901aa9b1e
specs: specs:
annotate (2.4.1.beta1) annotate (2.6.0.beta1)
activerecord (>= 2.3.0)
rake (>= 0.8.7)
GIT GIT
remote: https://github.com/gitlabhq/grack.git remote: https://github.com/gitlabhq/grack.git
...@@ -87,78 +89,79 @@ GEM ...@@ -87,78 +89,79 @@ GEM
activesupport (3.2.9) activesupport (3.2.9)
i18n (~> 0.6) i18n (~> 0.6)
multi_json (~> 1.0) multi_json (~> 1.0)
acts-as-taggable-on (2.3.1) acts-as-taggable-on (2.3.3)
rails (~> 3.0) rails (~> 3.0)
addressable (2.2.8) addressable (2.3.2)
arel (3.0.2) arel (3.0.2)
awesome_print (1.0.2) awesome_print (1.1.0)
backports (2.6.5)
bcrypt-ruby (3.0.1) bcrypt-ruby (3.0.1)
blankslate (2.1.2.4) blankslate (3.1.2)
bootstrap-sass (2.0.4.0) bootstrap-sass (2.0.4.0)
builder (3.0.4) builder (3.0.4)
capybara (1.1.2) capybara (1.1.3)
mime-types (>= 1.16) mime-types (>= 1.16)
nokogiri (>= 1.3.3) nokogiri (>= 1.3.3)
rack (>= 1.0.0) rack (>= 1.0.0)
rack-test (>= 0.5.4) rack-test (>= 0.5.4)
selenium-webdriver (~> 2.0) selenium-webdriver (~> 2.0)
xpath (~> 0.1.4) xpath (~> 0.1.4)
carrierwave (0.6.2) carrierwave (0.7.1)
activemodel (>= 3.2.0) activemodel (>= 3.2.0)
activesupport (>= 3.2.0) activesupport (>= 3.2.0)
charlock_holmes (0.6.9) charlock_holmes (0.6.9)
childprocess (0.3.2) childprocess (0.3.6)
ffi (~> 1.0.6) ffi (~> 1.0, >= 1.0.6)
chosen-rails (0.9.8.3) chosen-rails (0.9.8)
railties (~> 3.0) railties (~> 3.0)
thor (~> 0.14) thor (~> 0.14)
coderay (1.0.6) coderay (1.0.8)
coffee-rails (3.2.2) coffee-rails (3.2.2)
coffee-script (>= 2.2.0) coffee-script (>= 2.2.0)
railties (~> 3.2.0) railties (~> 3.2.0)
coffee-script (2.2.0) coffee-script (2.2.0)
coffee-script-source coffee-script-source
execjs execjs
coffee-script-source (1.3.3) coffee-script-source (1.4.0)
colored (1.2) colored (1.2)
colorize (0.5.8) colorize (0.5.8)
crack (0.3.1) crack (0.3.1)
daemons (1.1.9) daemons (1.1.9)
database_cleaner (0.8.0) database_cleaner (0.9.1)
devise (2.1.2) devise (2.1.2)
bcrypt-ruby (~> 3.0) bcrypt-ruby (~> 3.0)
orm_adapter (~> 0.1) orm_adapter (~> 0.1)
railties (~> 3.1) railties (~> 3.1)
warden (~> 1.2.1) warden (~> 1.2.1)
diff-lcs (1.1.3) diff-lcs (1.1.3)
draper (0.17.0) draper (0.18.0)
actionpack (~> 3.2) actionpack (~> 3.2)
activesupport (~> 3.2) activesupport (~> 3.2)
email_spec (1.2.1) email_spec (1.4.0)
launchy (~> 2.1)
mail (~> 2.2) mail (~> 2.2)
rspec (~> 2.0)
erubis (2.7.0) erubis (2.7.0)
escape_utils (0.2.4) escape_utils (0.2.4)
eventmachine (1.0.0) eventmachine (1.0.0)
execjs (1.4.0) execjs (1.4.0)
multi_json (~> 1.0) multi_json (~> 1.0)
factory_girl (4.0.0) factory_girl (4.1.0)
activesupport (>= 3.0.0) activesupport (>= 3.0.0)
factory_girl_rails (4.0.0) factory_girl_rails (4.1.0)
factory_girl (~> 4.0.0) factory_girl (~> 4.1.0)
railties (>= 3.0.0) railties (>= 3.0.0)
faraday (0.8.4) faraday (0.8.4)
multipart-post (~> 1.1) multipart-post (~> 1.1)
faye-websocket (0.4.6) faye-websocket (0.4.6)
eventmachine (>= 0.12.0) eventmachine (>= 0.12.0)
ffaker (1.14.0) ffaker (1.15.0)
ffi (1.0.11) ffi (1.1.5)
font-awesome-sass-rails (2.0.0.0) font-awesome-sass-rails (2.0.0.0)
railties (>= 3.1.1) railties (>= 3.1.1)
sass-rails (>= 3.1.1) sass-rails (>= 3.1.1)
foreman (0.47.0) foreman (0.60.2)
thor (>= 0.13.6) thor (>= 0.13.6)
gemoji (1.1.1) gemoji (1.2.1)
gherkin-ruby (0.2.1) gherkin-ruby (0.2.1)
git (1.2.5) git (1.2.5)
github-linguist (2.3.4) github-linguist (2.3.4)
...@@ -172,75 +175,82 @@ GEM ...@@ -172,75 +175,82 @@ GEM
gratr19 (~> 0.4.4.1) gratr19 (~> 0.4.4.1)
grit (~> 2.5.0) grit (~> 2.5.0)
hashery (~> 1.5.0) hashery (~> 1.5.0)
grape (0.2.1) grape (0.2.2)
activesupport
hashie (~> 1.2) hashie (~> 1.2)
multi_json multi_json (>= 1.3.2)
multi_xml multi_xml
rack rack
rack-accept
rack-mount rack-mount
virtus
gratr19 (0.4.4.1) gratr19 (0.4.4.1)
growl (1.0.3) growl (1.0.3)
guard (1.3.2) guard (1.5.4)
listen (>= 0.4.2) listen (>= 0.4.2)
lumberjack (>= 1.0.2)
pry (>= 0.9.10)
thor (>= 0.14.6) thor (>= 0.14.6)
guard-rspec (1.2.1) guard-rspec (2.1.2)
guard (>= 1.1) guard (>= 1.1)
rspec (~> 2.11)
guard-spinach (0.0.2) guard-spinach (0.0.2)
guard (>= 1.1) guard (>= 1.1)
spinach spinach
haml (3.1.6) haml (3.1.7)
haml-rails (0.3.4) haml-rails (0.3.5)
actionpack (~> 3.0) actionpack (>= 3.1, < 4.1)
activesupport (~> 3.0) activesupport (>= 3.1, < 4.1)
haml (~> 3.0) haml (~> 3.1)
railties (~> 3.0) railties (>= 3.1, < 4.1)
hashery (1.5.0) hashery (1.5.0)
blankslate blankslate
hashie (1.2.0) hashie (1.2.0)
hike (1.2.1) hike (1.2.1)
http_parser.rb (0.5.3) http_parser.rb (0.5.3)
httparty (0.8.3) httparty (0.9.0)
multi_json (~> 1.0) multi_json (~> 1.0)
multi_xml multi_xml
httpauth (0.1) httpauth (0.2.0)
i18n (0.6.1) i18n (0.6.1)
journey (1.0.4) journey (1.0.4)
jquery-atwho-rails (0.1.6) jquery-atwho-rails (0.1.6)
jquery-rails (2.0.2) jquery-rails (2.1.3)
railties (>= 3.2.0, < 5.0) railties (>= 3.1.0, < 5.0)
thor (~> 0.14) thor (~> 0.14)
jquery-ui-rails (0.5.0) jquery-ui-rails (2.0.2)
jquery-rails jquery-rails
railties (>= 3.1.0) railties (>= 3.1.0)
json (1.7.5) json (1.7.5)
jwt (0.1.5) jwt (0.1.5)
multi_json (>= 1.0) multi_json (>= 1.0)
kaminari (0.14.0) kaminari (0.14.1)
actionpack (>= 3.0.0) actionpack (>= 3.0.0)
activesupport (>= 3.0.0) activesupport (>= 3.0.0)
kgio (2.7.4) kgio (2.7.4)
launchy (2.1.0) launchy (2.1.2)
addressable (~> 2.2.6) addressable (~> 2.3)
letter_opener (0.0.2) letter_opener (1.0.0)
launchy launchy (>= 2.0.4)
libv8 (3.3.10.4) libv8 (3.3.10.4)
libwebsocket (0.1.3) libwebsocket (0.1.6)
addressable websocket
listen (0.5.0) listen (0.5.3)
lumberjack (1.0.2)
mail (2.4.4) mail (2.4.4)
i18n (>= 0.4.0) i18n (>= 0.4.0)
mime-types (~> 1.16) mime-types (~> 1.16)
treetop (~> 1.4.8) treetop (~> 1.4.8)
method_source (0.7.1) method_source (0.8.1)
mime-types (1.19) mime-types (1.19)
modernizr (2.5.3) modernizr (2.6.2)
sprockets (~> 2.0) sprockets (~> 2.0)
multi_json (1.3.7) multi_json (1.3.7)
multi_xml (0.5.1) multi_xml (0.5.1)
multipart-post (1.1.5) multipart-post (1.1.5)
mysql2 (0.3.11) mysql2 (0.3.11)
net-ldap (0.2.2) net-ldap (0.2.2)
nokogiri (1.5.3) nokogiri (1.5.5)
oauth (0.4.7) oauth (0.4.7)
oauth2 (0.8.0) oauth2 (0.8.0)
faraday (~> 0.8) faraday (~> 0.8)
...@@ -248,7 +258,7 @@ GEM ...@@ -248,7 +258,7 @@ GEM
jwt (~> 0.1.4) jwt (~> 0.1.4)
multi_json (~> 1.0) multi_json (~> 1.0)
rack (~> 1.2) rack (~> 1.2)
omniauth (1.1.0) omniauth (1.1.1)
hashie (~> 1.2) hashie (~> 1.2)
rack rack
omniauth-github (1.0.3) omniauth-github (1.0.3)
...@@ -260,14 +270,14 @@ GEM ...@@ -260,14 +270,14 @@ GEM
omniauth-oauth (1.0.1) omniauth-oauth (1.0.1)
oauth oauth
omniauth (~> 1.0) omniauth (~> 1.0)
omniauth-oauth2 (1.1.0) omniauth-oauth2 (1.1.1)
oauth2 (~> 0.8.0) oauth2 (~> 0.8.0)
omniauth (~> 1.0) omniauth (~> 1.0)
omniauth-twitter (0.0.13) omniauth-twitter (0.0.14)
multi_json (~> 1.3) multi_json (~> 1.3)
omniauth-oauth (~> 1.0) omniauth-oauth (~> 1.0)
orm_adapter (0.3.0) orm_adapter (0.4.0)
pg (0.14.0) pg (0.14.1)
poltergeist (1.0.2) poltergeist (1.0.2)
capybara (~> 1.1) capybara (~> 1.1)
childprocess (~> 0.3) childprocess (~> 0.3)
...@@ -276,17 +286,19 @@ GEM ...@@ -276,17 +286,19 @@ GEM
multi_json (~> 1.0) multi_json (~> 1.0)
polyglot (0.3.3) polyglot (0.3.3)
posix-spawn (0.3.6) posix-spawn (0.3.6)
pry (0.9.9.6) pry (0.9.10)
coderay (~> 1.0.5) coderay (~> 1.0.5)
method_source (~> 0.7.1) method_source (~> 0.8)
slop (>= 2.4.4, < 3) slop (~> 3.3.1)
pyu-ruby-sasl (0.0.3.3) pyu-ruby-sasl (0.0.3.3)
quiet_assets (1.0.1) quiet_assets (1.0.1)
railties (~> 3.1) railties (~> 3.1)
rack (1.4.1) rack (1.4.1)
rack-accept (0.4.5)
rack (>= 0.4)
rack-cache (1.2) rack-cache (1.2)
rack (>= 0.4) rack (>= 0.4)
rack-mini-profiler (0.1.9) rack-mini-profiler (0.1.23)
rack (>= 1.1.3) rack (>= 1.1.3)
rack-mount (0.8.3) rack-mount (0.8.3)
rack (>= 1.0.0) rack (>= 1.0.0)
...@@ -314,45 +326,46 @@ GEM ...@@ -314,45 +326,46 @@ GEM
rake (>= 0.8.7) rake (>= 0.8.7)
rdoc (~> 3.4) rdoc (~> 3.4)
thor (>= 0.14.6, < 2.0) thor (>= 0.14.6, < 2.0)
raindrops (0.9.0) raindrops (0.10.0)
rake (10.0.0) rake (10.0.1)
raphael-rails (1.5.2) raphael-rails (2.1.0)
rb-fsevent (0.9.1) rb-fsevent (0.9.2)
rb-inotify (0.8.8) rb-inotify (0.8.8)
ffi (>= 0.5.0) ffi (>= 0.5.0)
rdoc (3.12) rdoc (3.12)
json (~> 1.4) json (~> 1.4)
redcarpet (2.1.1) redcarpet (2.2.2)
redis (2.2.2) redis (3.0.2)
redis-namespace (1.0.3) redis-namespace (1.2.1)
redis (< 3.0.0) redis (~> 3.0.0)
resque (1.20.0) resque (1.23.0)
multi_json (~> 1.0) multi_json (~> 1.0)
redis-namespace (~> 1.0.2) redis-namespace (~> 1.0)
sinatra (>= 0.9.2) sinatra (>= 0.9.2)
vegas (~> 0.1.2) vegas (~> 0.1.2)
resque_mailer (2.0.3) resque_mailer (2.1.0)
actionmailer (>= 3.0.0) actionmailer (~> 3.0)
resque (>= 1.2.3) resque_spec (0.12.5)
resque_spec (0.11.0)
resque (>= 1.19.0) resque (>= 1.19.0)
rspec (>= 2.5.0) rspec (>= 2.5.0)
rspec (2.10.0) rspec (2.12.0)
rspec-core (~> 2.10.0) rspec-core (~> 2.12.0)
rspec-expectations (~> 2.10.0) rspec-expectations (~> 2.12.0)
rspec-mocks (~> 2.10.0) rspec-mocks (~> 2.12.0)
rspec-core (2.10.1) rspec-core (2.12.0)
rspec-expectations (2.10.0) rspec-expectations (2.12.0)
diff-lcs (~> 1.1.3) diff-lcs (~> 1.1.3)
rspec-mocks (2.10.1) rspec-mocks (2.12.0)
rspec-rails (2.10.1) rspec-rails (2.12.0)
actionpack (>= 3.0) actionpack (>= 3.0)
activesupport (>= 3.0) activesupport (>= 3.0)
railties (>= 3.0) railties (>= 3.0)
rspec (~> 2.10.0) rspec-core (~> 2.12.0)
rspec-expectations (~> 2.12.0)
rspec-mocks (~> 2.12.0)
rubyntlm (0.1.1) rubyntlm (0.1.1)
rubyzip (0.9.8) rubyzip (0.9.9)
sass (3.1.19) sass (3.2.3)
sass-rails (3.2.5) sass-rails (3.2.5)
railties (~> 3.2.0) railties (~> 3.2.0)
sass (>= 3.1.10) sass (>= 3.1.10)
...@@ -360,25 +373,24 @@ GEM ...@@ -360,25 +373,24 @@ GEM
seed-fu (2.2.0) seed-fu (2.2.0)
activerecord (~> 3.1) activerecord (~> 3.1)
activesupport (~> 3.1) activesupport (~> 3.1)
selenium-webdriver (2.22.2) selenium-webdriver (2.26.0)
childprocess (>= 0.2.5) childprocess (>= 0.2.5)
ffi (~> 1.0)
libwebsocket (~> 0.1.3) libwebsocket (~> 0.1.3)
multi_json (~> 1.0) multi_json (~> 1.0)
rubyzip rubyzip
settingslogic (2.0.8) settingslogic (2.0.8)
shoulda-matchers (1.3.0) shoulda-matchers (1.3.0)
activesupport (>= 3.0.0) activesupport (>= 3.0.0)
simplecov (0.6.4) simplecov (0.7.1)
multi_json (~> 1.0) multi_json (~> 1.0)
simplecov-html (~> 0.5.3) simplecov-html (~> 0.7.1)
simplecov-html (0.5.3) simplecov-html (0.7.1)
sinatra (1.3.2) sinatra (1.3.3)
rack (~> 1.3, >= 1.3.6) rack (~> 1.3, >= 1.3.6)
rack-protection (~> 1.2) rack-protection (~> 1.2)
tilt (~> 1.3, >= 1.3.3) tilt (~> 1.3, >= 1.3.3)
six (0.2.0) six (0.2.0)
slop (2.4.4) slop (3.3.3)
spinach (0.5.2) spinach (0.5.2)
colorize colorize
gherkin-ruby (~> 0.2.0) gherkin-ruby (~> 0.2.0)
...@@ -392,9 +404,9 @@ GEM ...@@ -392,9 +404,9 @@ GEM
rack (~> 1.0) rack (~> 1.0)
tilt (~> 1.1, != 1.3.0) tilt (~> 1.1, != 1.3.0)
sqlite3 (1.3.6) sqlite3 (1.3.6)
stamp (0.1.6) stamp (0.3.0)
test_after_commit (0.0.1) test_after_commit (0.0.1)
therubyracer (0.10.1) therubyracer (0.10.2)
libv8 (~> 3.3.10) libv8 (~> 3.3.10)
thin (1.5.0) thin (1.5.0)
daemons (>= 1.0.9) daemons (>= 1.0.9)
...@@ -406,20 +418,23 @@ GEM ...@@ -406,20 +418,23 @@ GEM
polyglot polyglot
polyglot (>= 0.3.1) polyglot (>= 0.3.1)
tzinfo (0.3.35) tzinfo (0.3.35)
uglifier (1.0.3) uglifier (1.3.0)
execjs (>= 0.3.0) execjs (>= 0.3.0)
multi_json (>= 1.0.2) multi_json (~> 1.0, >= 1.0.2)
unicorn (4.3.1) unicorn (4.4.0)
kgio (~> 2.6) kgio (~> 2.6)
rack rack
raindrops (~> 0.7) raindrops (~> 0.7)
vegas (0.1.11) vegas (0.1.11)
rack (>= 1.0.0) rack (>= 1.0.0)
virtus (0.5.2)
backports (~> 2.6.1)
warden (1.2.1) warden (1.2.1)
rack (>= 1.0) rack (>= 1.0)
webmock (1.8.7) webmock (1.9.0)
addressable (>= 2.2.7) addressable (>= 2.2.7)
crack (>= 0.1.7) crack (>= 0.1.7)
websocket (1.0.2)
xpath (0.1.4) xpath (0.1.4)
nokogiri (~> 1.3) nokogiri (~> 1.3)
yajl-ruby (1.1.0) yajl-ruby (1.1.0)
...@@ -428,24 +443,24 @@ PLATFORMS ...@@ -428,24 +443,24 @@ PLATFORMS
ruby ruby
DEPENDENCIES DEPENDENCIES
acts-as-taggable-on (= 2.3.1) acts-as-taggable-on (= 2.3.3)
annotate! annotate!
awesome_print awesome_print
bootstrap-sass (= 2.0.4) bootstrap-sass (= 2.0.4)
capybara capybara
carrierwave carrierwave (~> 0.7.1)
chosen-rails chosen-rails (= 0.9.8)
coffee-rails (= 3.2.2) coffee-rails (~> 3.2.2)
colored colored
database_cleaner database_cleaner
devise (~> 2.1.0) devise (~> 2.1.0)
draper draper (~> 0.18.0)
email_spec email_spec
factory_girl_rails factory_girl_rails
ffaker ffaker
font-awesome-sass-rails (~> 2.0.0) font-awesome-sass-rails (~> 2.0.0)
foreman foreman
gemoji gemoji (~> 1.2.1)
git git
github-linguist (~> 2.3.4) github-linguist (~> 2.3.4)
github-markup (~> 0.7.4) github-markup (~> 0.7.4)
...@@ -458,17 +473,17 @@ DEPENDENCIES ...@@ -458,17 +473,17 @@ DEPENDENCIES
growl growl
guard-rspec guard-rspec
guard-spinach guard-spinach
haml-rails haml-rails (~> 0.3.5)
httparty httparty
jquery-atwho-rails (= 0.1.6) jquery-atwho-rails (= 0.1.6)
jquery-rails (= 2.0.2) jquery-rails (= 2.1.3)
jquery-ui-rails (= 0.5.0) jquery-ui-rails (= 2.0.2)
kaminari kaminari (~> 0.14.1)
launchy launchy
letter_opener letter_opener
modernizr (= 2.5.3) modernizr (= 2.6.2)
mysql2 mysql2
omniauth omniauth (~> 1.1.1)
omniauth-github omniauth-github
omniauth-google-oauth2 omniauth-google-oauth2
omniauth-ldap! omniauth-ldap!
...@@ -477,22 +492,22 @@ DEPENDENCIES ...@@ -477,22 +492,22 @@ DEPENDENCIES
poltergeist poltergeist
pry pry
pygments.rb! pygments.rb!
quiet_assets (= 1.0.1) quiet_assets (~> 1.0.1)
rack-mini-profiler rack-mini-profiler
rails (= 3.2.9) rails (= 3.2.9)
rails-dev-tweaks rails-dev-tweaks
raphael-rails (= 1.5.2) raphael-rails (= 2.1.0)
rb-fsevent rb-fsevent
rb-inotify rb-inotify
redcarpet (~> 2.1.1) redcarpet (~> 2.2.2)
resque (~> 1.20.0) resque (~> 1.23.0)
resque_mailer resque_mailer
resque_spec resque_spec
rspec-rails rspec-rails
sass-rails (= 3.2.5) sass-rails (~> 3.2.5)
seed-fu seed-fu
settingslogic settingslogic
shoulda-matchers shoulda-matchers (= 1.3.0)
simplecov simplecov
six six
spinach-rails spinach-rails
...@@ -501,7 +516,7 @@ DEPENDENCIES ...@@ -501,7 +516,7 @@ DEPENDENCIES
test_after_commit test_after_commit
therubyracer therubyracer
thin (~> 1.5.0) thin (~> 1.5.0)
uglifier (= 1.0.3) uglifier (~> 1.3.0)
unicorn unicorn (~> 4.4.0)
webmock webmock
yaml_db! yaml_db!
config/application.rb
View file @ 36bbcc6f
...@@ -4,7 +4,7 @@ require 'rails/all' ...@@ -4,7 +4,7 @@ require 'rails/all'
if defined?(Bundler) if defined?(Bundler)
# If you precompile assets before deploying to production, use this line # If you precompile assets before deploying to production, use this line
# Bundler.require *Rails.groups(:assets => %w(development test)) # Bundler.require(*Rails.groups(:assets => %w(development test)))
# If you want your assets lazily compiled in production, use this line # If you want your assets lazily compiled in production, use this line
Bundler.require(:default, :assets, Rails.env) Bundler.require(:default, :assets, Rails.env)
end end
...@@ -47,6 +47,14 @@ module Gitlab ...@@ -47,6 +47,14 @@ module Gitlab
# Configure sensitive parameters which will be filtered from the log file. # Configure sensitive parameters which will be filtered from the log file.
config.filter_parameters += [:password] config.filter_parameters += [:password]
# Enable escaping HTML in JSON.
config.active_support.escape_html_entities_in_json = true
# Use SQL instead of Active Record's schema dumper when creating the database.
# This is necessary if your schema can't be completely dumped by the schema dumper,
# like if you have constraints or database-specific column types
# config.active_record.schema_format = :sql
# Enforce whitelist mode for mass assignment. # Enforce whitelist mode for mass assignment.
# This will create an empty whitelist of attributes available for mass-assignment for all models # This will create an empty whitelist of attributes available for mass-assignment for all models
# in your app. As such, your models will need to explicitly whitelist or blacklist accessible # in your app. As such, your models will need to explicitly whitelist or blacklist accessible
......
config/environments/development.rb
View file @ 36bbcc6f
...@@ -2,7 +2,7 @@ Gitlab::Application.configure do ...@@ -2,7 +2,7 @@ Gitlab::Application.configure do
# Settings specified here will take precedence over those in config/application.rb # Settings specified here will take precedence over those in config/application.rb
# In the development environment your application's code is reloaded on # In the development environment your application's code is reloaded on
# every request. This slows down response time but is perfect for development # every request. This slows down response time but is perfect for development
# since you don't have to restart the web server when you make code changes. # since you don't have to restart the web server when you make code changes.
config.cache_classes = false config.cache_classes = false
...@@ -22,19 +22,21 @@ Gitlab::Application.configure do ...@@ -22,19 +22,21 @@ Gitlab::Application.configure do
# Only use best-standards-support built into browsers # Only use best-standards-support built into browsers
config.action_dispatch.best_standards_support = :builtin config.action_dispatch.best_standards_support = :builtin
# Raise exception on mass assignment protection for Active Record models
config.active_record.mass_assignment_sanitizer = :strict
# Log the query plan for queries taking more than this (works
# with SQLite, MySQL, and PostgreSQL)
config.active_record.auto_explain_threshold_in_seconds = 0.5
# Do not compress assets # Do not compress assets
config.assets.compress = false config.assets.compress = false
# Expands the lines which load the assets # Expands the lines which load the assets
config.assets.debug = true config.assets.debug = true
config.action_mailer.default_url_options = { :host => 'localhost:3000' } # For having correct urls in mails
config.action_mailer.default_url_options = { host: 'localhost', port: 3000 }
# Open sent mails in browser
config.action_mailer.delivery_method = :letter_opener config.action_mailer.delivery_method = :letter_opener
# Raise exception on mass assignment protection for Active Record models
config.active_record.mass_assignment_sanitizer = :strict
# Log the query plan for queries taking more than this (works
# with SQLite, MySQL, and PostgreSQL)
config.active_record.auto_explain_threshold_in_seconds = 0.5
end end
config/environments/production.rb
View file @ 36bbcc6f
...@@ -20,7 +20,7 @@ Gitlab::Application.configure do ...@@ -20,7 +20,7 @@ Gitlab::Application.configure do
# Generate digests for assets URLs # Generate digests for assets URLs
config.assets.digest = true config.assets.digest = true
# Defaults to Rails.root.join("public/assets") # Defaults to nil and saved in location specified by config.assets.prefix
# config.assets.manifest = YOUR_PATH # config.assets.manifest = YOUR_PATH
# Specifies the header that your server uses for sending files # 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
# See everything in the log (default is :info) # See everything in the log (default is :info)
# config.log_level = :debug # config.log_level = :debug
# Prepend all log lines with the following tags
# config.log_tags = [ :subdomain, :uuid ]
# Use a different logger for distributed setups # Use a different logger for distributed setups
# config.logger = SyslogLogger.new # config.logger = ActiveSupport::TaggedLogging.new(SyslogLogger.new)
# Use a different cache store in production # Use a different cache store in production
config.cache_store = :memory_store config.cache_store = :memory_store
...@@ -58,6 +61,10 @@ Gitlab::Application.configure do ...@@ -58,6 +61,10 @@ Gitlab::Application.configure do
# Send deprecation notices to registered listeners # Send deprecation notices to registered listeners
config.active_support.deprecation = :notify config.active_support.deprecation = :notify
# Log the query plan for queries taking more than this (works
# with SQLite, MySQL, and PostgreSQL)
# config.active_record.auto_explain_threshold_in_seconds = 0.5
config.action_mailer.delivery_method = :sendmail config.action_mailer.delivery_method = :sendmail
# Defaults to: # Defaults to:
# # config.action_mailer.sendmail_settings = { # # config.action_mailer.sendmail_settings = {
......
config/environments/test.rb
View file @ 36bbcc6f
...@@ -2,9 +2,9 @@ Gitlab::Application.configure do ...@@ -2,9 +2,9 @@ Gitlab::Application.configure do
# Settings specified here will take precedence over those in config/application.rb # Settings specified here will take precedence over those in config/application.rb
# The test environment is used exclusively to run your application's # The test environment is used exclusively to run your application's
# test suite. You never need to work with it otherwise. Remember that # test suite. You never need to work with it otherwise. Remember that
# your test database is "scratch space" for the test suite and is wiped # your test database is "scratch space" for the test suite and is wiped
# and recreated between test runs. Don't rely on the data there! # and recreated between test runs. Don't rely on the data there!
config.cache_classes = true config.cache_classes = true
# Configure static asset server for tests with Cache-Control for performance # 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
# ActionMailer::Base.deliveries array. # ActionMailer::Base.deliveries array.
config.action_mailer.delivery_method = :test config.action_mailer.delivery_method = :test
# Use SQL instead of Active Record's schema dumper when creating the test database.
# This is necessary if your schema can't be completely dumped by the schema dumper,
# like if you have constraints or database-specific column types
# config.active_record.schema_format = :sql
# Raise exception on mass assignment protection for Active Record models # Raise exception on mass assignment protection for Active Record models
# config.active_record.mass_assignment_sanitizer = :strict # config.active_record.mass_assignment_sanitizer = :strict
# Print deprecation notices to the stderr # Print deprecation notices to the stderr
config.active_support.deprecation = :stderr config.active_support.deprecation = :stderr
# Allow pass debug_assets=true as a query parameter to load pages with unpackaged assets
config.assets.allow_debugging = true
end end
config/initializers/gemoji.rb 0 → 100644
View file @ 36bbcc6f
# Workaround for https://github.com/github/gemoji/pull/18
Gitlab::Application.config.assets.paths << Emoji.images_path
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7