Merge dev.gitlab.org:gitlab/gitlabhq into upstream-ce
Conflicts: VERSION app/helpers/selects_helper.rb app/models/project.rb app/views/devise/sessions/new.html.haml app/views/groups/_settings_nav.html.haml app/views/layouts/nav/_admin.html.haml app/views/profiles/keys/_key.html.haml app/views/profiles/keys/index.html.haml app/views/profiles/keys/show.html.haml app/views/projects/merge_requests/show/_mr_accept.html.haml config/routes.rb db/schema.rb doc/api/projects.md features/steps/shared/paths.rb
Showing
... | ... | @@ -32,9 +32,12 @@ gem 'omniauth-kerberos' |
gem 'doorkeeper', '2.0.1' | ||
gem "rack-oauth2", "~> 1.0.5" | ||
# Browser detection | ||
gem "browser" | ||
# Extracting information from a git repository | ||
# Provide access to Gitlab::Git library | ||
gem "gitlab_git", '7.0.0.rc12' | ||
gem "gitlab_git", '7.0.0.rc13' | ||
# Ruby/Rack Git Smart-HTTP Server Handler | ||
gem 'gitlab-grack', '~> 2.0.0.pre', require: 'grack' | ||
... | ... | @@ -93,7 +96,7 @@ gem "github-markup" |
gem 'redcarpet', '~> 3.1.2' | ||
gem 'RedCloth' | ||
gem 'rdoc', '~>3.6' | ||
gem 'org-ruby', '= 0.9.9' | ||
gem 'org-ruby', '= 0.9.12' | ||
gem 'creole', '~>0.3.6' | ||
gem 'wikicloth', '=0.8.1' | ||
gem 'asciidoctor', '= 0.1.4' | ||
... | ... |
app/views/devise/confirmations/new.html.haml
100755 → 100644
File mode changed from 100755 to 100644
app/views/devise/passwords/new.html.haml
100755 → 100644
File mode changed from 100755 to 100644
166 KB
25.2 KB
vendor/assets/javascripts/chart-lib.min.js
100755 → 100644
File mode changed from 100755 to 100644