Update Gemfile with 1.9 syntax. Define ref for forks
This commit is contained in:
parent
6d2e64164a
commit
b6fc031031
26
Gemfile
26
Gemfile
|
@ -11,9 +11,9 @@ end
|
||||||
gem "rails", "3.2.8"
|
gem "rails", "3.2.8"
|
||||||
|
|
||||||
# Supported DBs
|
# Supported DBs
|
||||||
gem "sqlite3", :group => :sqlite
|
gem "sqlite3", group: :sqlite
|
||||||
gem "mysql2", :group => :mysql
|
gem "mysql2", group: :mysql
|
||||||
gem "pg", :group => :postgres
|
gem "pg", group: :postgres
|
||||||
|
|
||||||
# Auth
|
# Auth
|
||||||
gem "devise", "~> 2.1.0"
|
gem "devise", "~> 2.1.0"
|
||||||
|
@ -23,10 +23,10 @@ gem 'omniauth-twitter'
|
||||||
gem 'omniauth-github'
|
gem 'omniauth-github'
|
||||||
|
|
||||||
# GITLAB patched libs
|
# GITLAB patched libs
|
||||||
gem "grit", :git => "https://github.com/gitlabhq/grit.git", :ref => "7f35cb98ff17d534a07e3ce6ec3d580f67402837"
|
gem "grit", git: "https://github.com/gitlabhq/grit.git", ref: '7f35cb98ff17d534a07e3ce6ec3d580f67402837'
|
||||||
gem "omniauth-ldap", :git => "https://github.com/gitlabhq/omniauth-ldap.git", :ref => "f038dd852d7bd473a557e385d5d7c2fd5dc1dc2e"
|
gem "omniauth-ldap", git: "https://github.com/gitlabhq/omniauth-ldap.git", ref: 'f038dd852d7bd473a557e385d5d7c2fd5dc1dc2e'
|
||||||
gem 'yaml_db', :git => "https://github.com/gitlabhq/yaml_db.git"
|
gem 'yaml_db', git: "https://github.com/gitlabhq/yaml_db.git", ref: '98e9a5dca43e3fedd3268c76a73af40d1bdf1dfd'
|
||||||
gem 'grack', :git => "https://github.com/gitlabhq/grack.git"
|
gem 'grack', git: "https://github.com/gitlabhq/grack.git", ref: 'ba46f3b0845c6a09d488ae6abdce6ede37e227e8'
|
||||||
|
|
||||||
# Gitolite client (for work with gitolite-admin repo)
|
# Gitolite client (for work with gitolite-admin repo)
|
||||||
gem "gitolite", '1.1.0'
|
gem "gitolite", '1.1.0'
|
||||||
|
@ -35,7 +35,7 @@ gem "gitolite", '1.1.0'
|
||||||
gem "pygments.rb", "0.3.1"
|
gem "pygments.rb", "0.3.1"
|
||||||
|
|
||||||
# Language detection
|
# Language detection
|
||||||
gem "github-linguist", "~> 2.3.4" , :require => "linguist"
|
gem "github-linguist", "~> 2.3.4" , require: "linguist"
|
||||||
|
|
||||||
# API
|
# API
|
||||||
gem "grape", "~> 0.2.1"
|
gem "grape", "~> 0.2.1"
|
||||||
|
@ -115,7 +115,7 @@ end
|
||||||
|
|
||||||
group :development do
|
group :development do
|
||||||
gem "letter_opener"
|
gem "letter_opener"
|
||||||
gem "annotate", :git => "https://github.com/ctran/annotate_models.git"
|
gem "annotate", git: "https://github.com/ctran/annotate_models.git"
|
||||||
gem 'rack-mini-profiler'
|
gem 'rack-mini-profiler'
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -137,13 +137,13 @@ group :development, :test do
|
||||||
gem 'guard-spinach'
|
gem 'guard-spinach'
|
||||||
|
|
||||||
# Notification
|
# Notification
|
||||||
gem 'rb-fsevent', :require => darwin_only('rb-fsevent')
|
gem 'rb-fsevent', require: darwin_only('rb-fsevent')
|
||||||
gem 'growl', :require => darwin_only('growl')
|
gem 'growl', require: darwin_only('growl')
|
||||||
gem 'rb-inotify', :require => linux_only('rb-inotify')
|
gem 'rb-inotify', require: linux_only('rb-inotify')
|
||||||
end
|
end
|
||||||
|
|
||||||
group :test do
|
group :test do
|
||||||
gem "simplecov", :require => false
|
gem "simplecov", require: false
|
||||||
gem "shoulda-matchers"
|
gem "shoulda-matchers"
|
||||||
gem 'email_spec'
|
gem 'email_spec'
|
||||||
gem 'resque_spec'
|
gem 'resque_spec'
|
||||||
|
|
|
@ -7,6 +7,7 @@ GIT
|
||||||
GIT
|
GIT
|
||||||
remote: https://github.com/gitlabhq/grack.git
|
remote: https://github.com/gitlabhq/grack.git
|
||||||
revision: ba46f3b0845c6a09d488ae6abdce6ede37e227e8
|
revision: ba46f3b0845c6a09d488ae6abdce6ede37e227e8
|
||||||
|
ref: ba46f3b0845c6a09d488ae6abdce6ede37e227e8
|
||||||
specs:
|
specs:
|
||||||
grack (1.0.0)
|
grack (1.0.0)
|
||||||
rack (~> 1.4.1)
|
rack (~> 1.4.1)
|
||||||
|
@ -35,6 +36,7 @@ GIT
|
||||||
GIT
|
GIT
|
||||||
remote: https://github.com/gitlabhq/yaml_db.git
|
remote: https://github.com/gitlabhq/yaml_db.git
|
||||||
revision: 98e9a5dca43e3fedd3268c76a73af40d1bdf1dfd
|
revision: 98e9a5dca43e3fedd3268c76a73af40d1bdf1dfd
|
||||||
|
ref: 98e9a5dca43e3fedd3268c76a73af40d1bdf1dfd
|
||||||
specs:
|
specs:
|
||||||
yaml_db (0.2.2)
|
yaml_db (0.2.2)
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue