Download as
Browse Code »

Commit b6fc0310316eb61f68551a3b37f340b0fb4d0b20

Authored by Dmitriy Zaporozhets
1 parent 6d2e6416
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Update Gemfile with 1.9 syntax. Define ref for forks

Showing 2 changed files with 15 additions and 13 deletions   Show diff stats
@@ -11,9 +11,9 @@ end @@ -11,9 +11,9 @@ end
11 gem "rails", "3.2.8" 11 gem "rails", "3.2.8"
12 12
13 # Supported DBs 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 # Auth 18 # Auth
19 gem "devise", "~> 2.1.0" 19 gem "devise", "~> 2.1.0"
@@ -23,10 +23,10 @@ gem 'omniauth-twitter' @@ -23,10 +23,10 @@ gem 'omniauth-twitter'
23 gem 'omniauth-github' 23 gem 'omniauth-github'
24 24
25 # GITLAB patched libs 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 # Gitolite client (for work with gitolite-admin repo) 31 # Gitolite client (for work with gitolite-admin repo)
32 gem "gitolite", '1.1.0' 32 gem "gitolite", '1.1.0'
@@ -35,7 +35,7 @@ gem "gitolite", '1.1.0' @@ -35,7 +35,7 @@ gem "gitolite", '1.1.0'
35 gem "pygments.rb", "0.3.1" 35 gem "pygments.rb", "0.3.1"
36 36
37 # Language detection 37 # Language detection
38 -gem "github-linguist", "~> 2.3.4" , :require => "linguist" 38 +gem "github-linguist", "~> 2.3.4" , require: "linguist"
39 39
40 # API 40 # API
41 gem "grape", "~> 0.2.1" 41 gem "grape", "~> 0.2.1"
@@ -115,7 +115,7 @@ end @@ -115,7 +115,7 @@ end
115 115
116 group :development do 116 group :development do
117 gem "letter_opener" 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 gem 'rack-mini-profiler' 119 gem 'rack-mini-profiler'
120 end 120 end
121 121
@@ -137,13 +137,13 @@ group :development, :test do @@ -137,13 +137,13 @@ group :development, :test do
137 gem 'guard-spinach' 137 gem 'guard-spinach'
138 138
139 # Notification 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 end 143 end
144 144
145 group :test do 145 group :test do
146 - gem "simplecov", :require => false 146 + gem "simplecov", require: false
147 gem "shoulda-matchers" 147 gem "shoulda-matchers"
148 gem 'email_spec' 148 gem 'email_spec'
149 gem 'resque_spec' 149 gem 'resque_spec'
@@ -7,6 +7,7 @@ GIT @@ -7,6 +7,7 @@ GIT
7 GIT 7 GIT
8 remote: https://github.com/gitlabhq/grack.git 8 remote: https://github.com/gitlabhq/grack.git
9 revision: ba46f3b0845c6a09d488ae6abdce6ede37e227e8 9 revision: ba46f3b0845c6a09d488ae6abdce6ede37e227e8
  10 + ref: ba46f3b0845c6a09d488ae6abdce6ede37e227e8
10 specs: 11 specs:
11 grack (1.0.0) 12 grack (1.0.0)
12 rack (~> 1.4.1) 13 rack (~> 1.4.1)
@@ -35,6 +36,7 @@ GIT @@ -35,6 +36,7 @@ GIT
35 GIT 36 GIT
36 remote: https://github.com/gitlabhq/yaml_db.git 37 remote: https://github.com/gitlabhq/yaml_db.git
37 revision: 98e9a5dca43e3fedd3268c76a73af40d1bdf1dfd 38 revision: 98e9a5dca43e3fedd3268c76a73af40d1bdf1dfd
  39 + ref: 98e9a5dca43e3fedd3268c76a73af40d1bdf1dfd
38 specs: 40 specs:
39 yaml_db (0.2.2) 41 yaml_db (0.2.2)
40 42