Commit b6fc0310316eb61f68551a3b37f340b0fb4d0b20
1 parent
6d2e6416
Exists in
master
and in
4 other branches
Update Gemfile with 1.9 syntax. Define ref for forks
Showing
2 changed files
with
15 additions
and
13 deletions
Show diff stats
Gemfile
| ... | ... | @@ -11,9 +11,9 @@ end |
| 11 | 11 | gem "rails", "3.2.8" |
| 12 | 12 | |
| 13 | 13 | # Supported DBs |
| 14 | -gem "sqlite3", :group => :sqlite | |
| 15 | -gem "mysql2", :group => :mysql | |
| 16 | -gem "pg", :group => :postgres | |
| 14 | +gem "sqlite3", group: :sqlite | |
| 15 | +gem "mysql2", group: :mysql | |
| 16 | +gem "pg", group: :postgres | |
| 17 | 17 | |
| 18 | 18 | # Auth |
| 19 | 19 | gem "devise", "~> 2.1.0" |
| ... | ... | @@ -23,10 +23,10 @@ gem 'omniauth-twitter' |
| 23 | 23 | gem 'omniauth-github' |
| 24 | 24 | |
| 25 | 25 | # GITLAB patched libs |
| 26 | -gem "grit", :git => "https://github.com/gitlabhq/grit.git", :ref => "7f35cb98ff17d534a07e3ce6ec3d580f67402837" | |
| 27 | -gem "omniauth-ldap", :git => "https://github.com/gitlabhq/omniauth-ldap.git", :ref => "f038dd852d7bd473a557e385d5d7c2fd5dc1dc2e" | |
| 28 | -gem 'yaml_db', :git => "https://github.com/gitlabhq/yaml_db.git" | |
| 29 | -gem 'grack', :git => "https://github.com/gitlabhq/grack.git" | |
| 26 | +gem "grit", git: "https://github.com/gitlabhq/grit.git", ref: '7f35cb98ff17d534a07e3ce6ec3d580f67402837' | |
| 27 | +gem "omniauth-ldap", git: "https://github.com/gitlabhq/omniauth-ldap.git", ref: 'f038dd852d7bd473a557e385d5d7c2fd5dc1dc2e' | |
| 28 | +gem 'yaml_db', git: "https://github.com/gitlabhq/yaml_db.git", ref: '98e9a5dca43e3fedd3268c76a73af40d1bdf1dfd' | |
| 29 | +gem 'grack', git: "https://github.com/gitlabhq/grack.git", ref: 'ba46f3b0845c6a09d488ae6abdce6ede37e227e8' | |
| 30 | 30 | |
| 31 | 31 | # Gitolite client (for work with gitolite-admin repo) |
| 32 | 32 | gem "gitolite", '1.1.0' |
| ... | ... | @@ -35,7 +35,7 @@ gem "gitolite", '1.1.0' |
| 35 | 35 | gem "pygments.rb", "0.3.1" |
| 36 | 36 | |
| 37 | 37 | # Language detection |
| 38 | -gem "github-linguist", "~> 2.3.4" , :require => "linguist" | |
| 38 | +gem "github-linguist", "~> 2.3.4" , require: "linguist" | |
| 39 | 39 | |
| 40 | 40 | # API |
| 41 | 41 | gem "grape", "~> 0.2.1" |
| ... | ... | @@ -115,7 +115,7 @@ end |
| 115 | 115 | |
| 116 | 116 | group :development do |
| 117 | 117 | gem "letter_opener" |
| 118 | - gem "annotate", :git => "https://github.com/ctran/annotate_models.git" | |
| 118 | + gem "annotate", git: "https://github.com/ctran/annotate_models.git" | |
| 119 | 119 | gem 'rack-mini-profiler' |
| 120 | 120 | end |
| 121 | 121 | |
| ... | ... | @@ -137,13 +137,13 @@ group :development, :test do |
| 137 | 137 | gem 'guard-spinach' |
| 138 | 138 | |
| 139 | 139 | # Notification |
| 140 | - gem 'rb-fsevent', :require => darwin_only('rb-fsevent') | |
| 141 | - gem 'growl', :require => darwin_only('growl') | |
| 142 | - gem 'rb-inotify', :require => linux_only('rb-inotify') | |
| 140 | + gem 'rb-fsevent', require: darwin_only('rb-fsevent') | |
| 141 | + gem 'growl', require: darwin_only('growl') | |
| 142 | + gem 'rb-inotify', require: linux_only('rb-inotify') | |
| 143 | 143 | end |
| 144 | 144 | |
| 145 | 145 | group :test do |
| 146 | - gem "simplecov", :require => false | |
| 146 | + gem "simplecov", require: false | |
| 147 | 147 | gem "shoulda-matchers" |
| 148 | 148 | gem 'email_spec' |
| 149 | 149 | gem 'resque_spec' | ... | ... |
Gemfile.lock
| ... | ... | @@ -7,6 +7,7 @@ GIT |
| 7 | 7 | GIT |
| 8 | 8 | remote: https://github.com/gitlabhq/grack.git |
| 9 | 9 | revision: ba46f3b0845c6a09d488ae6abdce6ede37e227e8 |
| 10 | + ref: ba46f3b0845c6a09d488ae6abdce6ede37e227e8 | |
| 10 | 11 | specs: |
| 11 | 12 | grack (1.0.0) |
| 12 | 13 | rack (~> 1.4.1) |
| ... | ... | @@ -35,6 +36,7 @@ GIT |
| 35 | 36 | GIT |
| 36 | 37 | remote: https://github.com/gitlabhq/yaml_db.git |
| 37 | 38 | revision: 98e9a5dca43e3fedd3268c76a73af40d1bdf1dfd |
| 39 | + ref: 98e9a5dca43e3fedd3268c76a73af40d1bdf1dfd | |
| 38 | 40 | specs: |
| 39 | 41 | yaml_db (0.2.2) |
| 40 | 42 | ... | ... |