Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into upstream-ce
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Conflicts:
app/models/group.rb
app/models/project.rb
features/steps/shared/project.rb
Showing
... | @@ -10,8 +10,6 @@ end | ... | @@ -10,8 +10,6 @@ end |
gem "rails", "~> 4.1.0" | gem "rails", "~> 4.1.0" | ||
gem "protected_attributes" | |||
# Make links from text | # Make links from text | ||
gem 'rails_autolink', '~> 1.1' | gem 'rails_autolink', '~> 1.1' | ||
... | @@ -23,8 +21,8 @@ gem "mysql2", group: :mysql | ... | @@ -23,8 +21,8 @@ gem "mysql2", group: :mysql |
gem "pg", group: :postgres | gem "pg", group: :postgres | ||
# Auth | # Auth | ||
gem "devise", '3.0.4' | gem "devise", '3.2.4' | ||
gem "devise-async", '0.8.0' | gem "devise-async", '0.9.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' | ||
... | @@ -49,7 +47,6 @@ gem "gitlab-linguist", "~> 3.0.0", require: "linguist" | ... | @@ -49,7 +47,6 @@ gem "gitlab-linguist", "~> 3.0.0", require: "linguist" |
# API | # API | ||
gem "grape", "~> 0.6.1" | gem "grape", "~> 0.6.1" | ||
# Replace with rubygems when nesteted entities get released | |||
gem "grape-entity", "~> 0.4.2" | gem "grape-entity", "~> 0.4.2" | ||
gem 'rack-cors', require: 'rack/cors' | gem 'rack-cors', require: 'rack/cors' | ||
... | ... |
doc/raketasks/backup_hrz.png
0 → 100644
21.4 KB
lib/gitlab/config_helper.rb
0 → 100644
lib/gitlab/contributors.rb
0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.