Merge commit '79190fe0' into merge-79190fe0-7.3.0-pre
Conflicts: Gemfile README.md VERSION db/schema.rb doc/install/installation.md lib/gitlab/git_access.rb lib/gitlab/ldap/user.rb spec/lib/gitlab/ldap/access_spec.rb
Showing
.travis.yml
deleted
100644 → 0
... | ... | @@ -27,6 +27,7 @@ gem 'omniauth', "~> 1.1.3" |
gem 'omniauth-google-oauth2' | ||
gem 'omniauth-twitter' | ||
gem 'omniauth-github' | ||
gem 'omniauth-shibboleth' | ||
# Extracting information from a git repository | ||
# Provide access to Gitlab::Git library | ||
... | ... | @@ -36,7 +37,7 @@ gem "gitlab_git", '~> 6.0' |
gem 'gitlab-grack', '~> 2.0.0.pre', require: 'grack' | ||
# LDAP Auth | ||
gem 'gitlab_omniauth-ldap', '1.0.4', require: "omniauth-ldap" | ||
gem 'gitlab_omniauth-ldap', '1.1.0', require: "omniauth-ldap" | ||
gem 'net-ldap' | ||
# Git Wiki | ||
... | ... | @@ -83,7 +84,7 @@ gem "seed-fu" |
gem "github-markup" | ||
# Required markup gems by github-markdown | ||
gem 'redcarpet', '~> 2.2.2' | ||
gem 'redcarpet', '~> 3.1.2' | ||
gem 'RedCloth' | ||
gem 'rdoc', '~>3.6' | ||
gem 'org-ruby' | ||
... | ... | @@ -157,6 +158,9 @@ gem "rack-attack" |
# Ace editor | ||
gem 'ace-rails-ap' | ||
# Keyboard shortcuts | ||
gem 'mousetrap-rails' | ||
# Semantic UI Sass for Sidebar | ||
gem 'semantic-ui-sass', '~> 0.16.1.0' | ||
... | ... | @@ -232,7 +236,7 @@ group :development, :test do |
gem 'jasmine', '2.0.2' | ||
gem "spring", '1.1.1' | ||
gem "spring", '1.1.3' | ||
gem "spring-commands-rspec", '1.0.1' | ||
gem "spring-commands-spinach", '1.0.0' | ||
end | ||
... | ... |
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
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.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
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/7.2-to-7.3.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.
features/search.feature
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.
features/steps/search.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.
lib/gitlab/diff/file.rb
0 → 100644
This diff is collapsed.
lib/gitlab/diff/line.rb
0 → 100644
This diff is collapsed.
lib/gitlab/diff/line_code.rb
0 → 100644
This diff is collapsed.
lib/gitlab/diff/parser.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.
lib/gitlab/search_results.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.
Please register or sign in to comment