Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee
Signed-off-by:
Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Conflicts:
app/helpers/tab_helper.rb
app/models/merge_request.rb
app/views/layouts/nav/_project_settings.html.haml
app/views/projects/merge_requests/show/_mr_accept.html.haml
doc/api/groups.md
Showing
... | ... | @@ -30,7 +30,7 @@ gem 'rqrcode-rails3' |
gem 'attr_encrypted', '1.3.4' | ||
# Browser detection | ||
gem "browser" | ||
gem "browser", '~> 0.8.0' | ||
# Extracting information from a git repository | ||
# Provide access to Gitlab::Git library | ||
... | ... | @@ -82,7 +82,7 @@ gem "carrierwave" |
gem 'dropzonejs-rails' | ||
# for aws storage | ||
gem "fog", "~> 1.14" | ||
gem "fog", "~> 1.25.0" | ||
gem "unf" | ||
# Authorization | ||
... | ... | @@ -257,10 +257,10 @@ group :development, :test do |
end | ||
group :test do | ||
gem "simplecov", require: false | ||
gem "shoulda-matchers", "~> 2.7.0" | ||
gem 'simplecov', require: false | ||
gem 'shoulda-matchers', '~> 2.8.0', require: false | ||
gem 'email_spec' | ||
gem "webmock" | ||
gem 'webmock', '~> 1.21.0' | ||
gem 'test_after_commit' | ||
end | ||
... | ... |
![app/assets/images/authbuttons/google_64.png](https://lab.nexedi.com/nexedi/gitlab-ce/-/raw/7bf9dcafd3947006ed5636caa94cf941eb8acefb/app/assets/images/authbuttons/google_64.png)
![app/assets/images/authbuttons/twitter_64.png](https://lab.nexedi.com/nexedi/gitlab-ce/-/raw/7bf9dcafd3947006ed5636caa94cf941eb8acefb/app/assets/images/authbuttons/twitter_64.png)
File moved
67.2 KB
24 KB
87.9 KB
61 KB
29.4 KB
16.1 KB
45.5 KB
15.7 KB
File moved
File moved
File moved
File moved
File moved
File moved
File moved
spec/support/coverage.rb
0 → 100644
spec/support/webmock.rb
0 → 100644