Merge branch 'master' into logo-white-compress
Conflicts: app/assets/images/logo-black.png app/assets/images/logo-white.png
Showing
This diff is collapsed.
... | @@ -8,15 +8,21 @@ def linux_only(require_as) | ... | @@ -8,15 +8,21 @@ def linux_only(require_as) |
RUBY_PLATFORM.include?('linux') && require_as | RUBY_PLATFORM.include?('linux') && require_as | ||
end | end | ||
gem "rails", "3.2.15" | gem "rails", "~> 4.0.0" | ||
gem "protected_attributes" | |||
gem 'rails-observers' | |||
gem 'actionpack-page_caching' | |||
gem 'actionpack-action_caching' | |||
gem 'activerecord-deprecated_finders' | |||
# Supported DBs | # Supported DBs | ||
gem "mysql2", group: :mysql | gem "mysql2", group: :mysql | ||
gem "pg", group: :postgres | gem "pg", group: :postgres | ||
# Auth | # Auth | ||
gem "devise", '~> 2.2' | gem "devise", '3.0.4' | ||
gem "devise-async" | gem "devise-async", '0.8.0' | ||
gem 'omniauth', "~> 1.1.3" | gem 'omniauth', "~> 1.1.3" | ||
gem 'omniauth-google-oauth2' | gem 'omniauth-google-oauth2' | ||
gem 'omniauth-twitter' | gem 'omniauth-twitter' | ||
... | @@ -24,26 +30,27 @@ gem 'omniauth-github' | ... | @@ -24,26 +30,27 @@ gem 'omniauth-github' |
# Extracting information from a git repository | # Extracting information from a git repository | ||
# Provide access to Gitlab::Git library | # Provide access to Gitlab::Git library | ||
gem "gitlab_git", "~> 3.0.0.rc1" | gem "gitlab_git", "~> 4.0.0" | ||
# Ruby/Rack Git Smart-HTTP Server Handler | # Ruby/Rack Git Smart-HTTP Server Handler | ||
gem 'gitlab-grack', '~> 1.0.1', require: 'grack' | gem 'gitlab-grack', '~> 2.0.0.pre', require: 'grack' | ||
# LDAP Auth | # LDAP Auth | ||
gem 'gitlab_omniauth-ldap', '1.0.3', require: "omniauth-ldap" | gem 'gitlab_omniauth-ldap', '1.0.3', require: "omniauth-ldap" | ||
# Syntax highlighter | # Syntax highlighter | ||
gem "gitlab-pygments.rb", '~> 0.3.2', require: 'pygments.rb' | gem "gitlab-pygments.rb", '~> 0.5.4', require: 'pygments.rb' | ||
# Git Wiki | # Git Wiki | ||
gem "gitlab-gollum-lib", "~> 1.0.1", require: 'gollum-lib' | gem "gitlab-gollum-lib", "~> 1.0.2", require: 'gollum-lib' | ||
# Language detection | # Language detection | ||
gem "github-linguist", require: "linguist" | gem "gitlab-linguist", "~> 2.9.6", require: "linguist" | ||
# API | # API | ||
gem "grape", "~> 0.4.1" | gem "grape", "~> 0.6.1" | ||
gem "grape-entity", "~> 0.3.0" | gem "grape-entity", "~> 0.3.0" | ||
gem 'rack-cors', require: 'rack/cors' | |||
# Format dates and times | # Format dates and times | ||
# based on human-friendly examples | # based on human-friendly examples | ||
... | @@ -72,13 +79,16 @@ gem "seed-fu" | ... | @@ -72,13 +79,16 @@ gem "seed-fu" |
# Markdown to HTML | # Markdown to HTML | ||
gem "redcarpet", "~> 2.2.2" | gem "redcarpet", "~> 2.2.2" | ||
gem "github-markup", "~> 0.7.4", require: 'github/markup' | gem "github-markup", "~> 0.7.4", require: 'github/markup', git: 'https://github.com/gitlabhq/markup.git', ref: '61ade389c1e1c159359338f570d18464a44ddbc4' | ||
# Asciidoc to HTML | # Asciidoc to HTML | ||
gem "asciidoctor" | gem "asciidoctor" | ||
# Application server | # Application server | ||
gem "unicorn", '~> 4.6.3', group: :unicorn | group :unicorn do | ||
gem "unicorn", '~> 4.6.3' | |||
gem 'unicorn-worker-killer' | |||
end | |||
# State machine | # State machine | ||
gem "state_machine" | gem "state_machine" | ||
... | @@ -127,26 +137,24 @@ gem "sanitize" | ... | @@ -127,26 +137,24 @@ gem "sanitize" |
# Protect against bruteforcing | # Protect against bruteforcing | ||
gem "rack-attack" | gem "rack-attack" | ||
group :assets do | gem "sass-rails" | ||
gem "sass-rails" | gem "coffee-rails" | ||
gem "coffee-rails" | gem "uglifier" | ||
gem "uglifier" | gem "therubyracer" | ||
gem "therubyracer" | gem 'turbolinks' | ||
gem 'turbolinks' | gem 'jquery-turbolinks' | ||
gem 'jquery-turbolinks' | |||
gem 'chosen-rails', "1.0.1" | |||
gem 'chosen-rails', "1.0.0" | gem 'select2-rails' | ||
gem 'select2-rails' | gem 'jquery-atwho-rails', "~> 0.3.3" | ||
gem 'jquery-atwho-rails', "0.3.0" | gem "jquery-rails", "2.1.3" | ||
gem "jquery-rails", "2.1.3" | gem "jquery-ui-rails", "2.0.2" | ||
gem "jquery-ui-rails", "2.0.2" | gem "modernizr", "2.6.2" | ||
gem "modernizr", "2.6.2" | gem "raphael-rails", "~> 2.1.2" | ||
gem "raphael-rails", "~> 2.1.2" | gem 'bootstrap-sass', '~> 3.0' | ||
gem 'bootstrap-sass' | gem "font-awesome-rails", '~> 3.2' | ||
gem "font-awesome-rails" | gem "gemoji", "~> 1.3.0" | ||
gem "gemoji", "~> 1.2.1", require: 'emoji/railtie' | gem "gon", '~> 5.0.0' | ||
gem "gon" | |||
end | |||
group :development do | group :development do | ||
gem "annotate", "~> 2.6.0.beta2" | gem "annotate", "~> 2.6.0.beta2" | ||
... | @@ -169,7 +177,7 @@ end | ... | @@ -169,7 +177,7 @@ end |
group :development, :test do | group :development, :test do | ||
gem 'coveralls', require: false | gem 'coveralls', require: false | ||
gem 'rails-dev-tweaks' | # gem 'rails-dev-tweaks' | ||
gem 'spinach-rails' | gem 'spinach-rails' | ||
gem "rspec-rails" | gem "rspec-rails" | ||
gem "capybara" | gem "capybara" | ||
... | @@ -198,7 +206,7 @@ group :development, :test do | ... | @@ -198,7 +206,7 @@ group :development, :test do |
gem 'poltergeist', '~> 1.4.1' | gem 'poltergeist', '~> 1.4.1' | ||
gem 'spork', '~> 1.0rc' | gem 'spork', '~> 1.0rc' | ||
gem 'jasmine' | gem 'jasmine', '2.0.0.rc5' | ||
end | end | ||
group :test do | group :test do | ||
... | ... |
This diff is collapsed.
This diff is collapsed.
| W: | H:
| W: | H:
| W: | H:
| W: | H:
| W: | H:
| W: | H:
This diff is collapsed.
This diff is collapsed.
File moved
File moved
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
app/helpers/icons_helper.rb
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
File moved
This diff is collapsed.
This diff is collapsed.
File moved
This diff is collapsed.
File moved
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
doc/release/security.md
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
doc/update/5.1-to-5.4.md
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
doc/update/6.0-to-6.4.md
0 → 100644
This diff is collapsed.
This diff is collapsed.
doc/update/6.2-to-6.3.md
0 → 100644
This diff is collapsed.
doc/update/6.3-to-6.4.md
0 → 100644
This diff is collapsed.
This diff is collapsed.
doc/update/ruby.md
0 → 100644
This diff is collapsed.
doc/update/upgrader.md
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
lib/api/files.rb
0 → 100644
This diff is collapsed.
This diff is collapsed.
lib/api/namespaces.rb
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
lib/gitlab/upgrader.rb
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
script/upgrade.rb
0 → 100644
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.