summaryrefslogtreecommitdiff
path: root/Gemfile
diff options
context:
space:
mode:
authorRiyad Preukschas <riyad@informatik.uni-bremen.de>2012-11-18 21:51:49 +0100
committerRiyad Preukschas <riyad@informatik.uni-bremen.de>2012-11-18 21:51:53 +0100
commit20189f84eef7b242962242b4a5d929208d561ed2 (patch)
tree3c40f565024c46a105f3e622ab0eed2bb4a979c6 /Gemfile
parent527d223680864a40887674768cf83a4a8626ead9 (diff)
downloadgitlab-ce-20189f84eef7b242962242b4a5d929208d561ed2.tar.gz
Update gems
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile46
1 files changed, 23 insertions, 23 deletions
diff --git a/Gemfile b/Gemfile
index d4cd45cef66..cb09766810f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -17,7 +17,7 @@ gem "pg", group: :postgres
# Auth
gem "devise", "~> 2.1.0"
-gem 'omniauth'
+gem 'omniauth', "~> 1.1.1"
gem 'omniauth-google-oauth2'
gem 'omniauth-twitter'
gem 'omniauth-github'
@@ -27,7 +27,7 @@ gem "grit", git: "https://github.com/gitlabhq/grit.git", ref:
gem "omniauth-ldap", git: "https://github.com/gitlabhq/omniauth-ldap.git", ref: 'f038dd852d7bd473a557e385d5d7c2fd5dc1dc2e'
gem 'yaml_db', git: "https://github.com/gitlabhq/yaml_db.git", ref: '98e9a5dca43e3fedd3268c76a73af40d1bdf1dfd'
gem 'grack', git: "https://github.com/gitlabhq/grack.git", ref: 'ba46f3b0845c6a09d488ae6abdce6ede37e227e8'
-gem 'grit_ext', git: "https://github.com/gitlabhq/grit_ext.git", ref: '212fd40bea61f3c6a167223768e7295dc32bbc10'
+gem 'grit_ext', git: "https://github.com/gitlabhq/grit_ext.git", ref: '212fd40bea61f3c6a167223768e7295dc32bbc10'
# Gitolite client (for work with gitolite-admin repo)
gem "gitolite", '1.1.0'
@@ -46,13 +46,13 @@ gem "grape", "~> 0.2.1"
gem "stamp"
# Pagination
-gem "kaminari"
+gem "kaminari", "~> 0.14.1"
# HAML
-gem "haml-rails"
+gem "haml-rails", "~> 0.3.5"
# Files attachments
-gem "carrierwave"
+gem "carrierwave", "~> 0.7.1"
# Authorization
gem "six"
@@ -64,21 +64,21 @@ gem "ffaker"
gem "seed-fu"
# Markdown to HTML
-gem "redcarpet", "~> 2.1.1"
+gem "redcarpet", "~> 2.2.2"
gem "github-markup", "~> 0.7.4", require: 'github/markup'
# Servers
gem "thin", '~> 1.5.0'
-gem "unicorn"
+gem "unicorn", "~> 4.4.0"
# Issue tags
-gem "acts-as-taggable-on", "2.3.1"
+gem "acts-as-taggable-on", "2.3.3"
# Decorators
-gem "draper"
+gem "draper", "~> 0.18.0"
# Background jobs
-gem "resque", "~> 1.20.0"
+gem "resque", "~> 1.23.0"
gem 'resque_mailer'
# HTTP requests
@@ -87,34 +87,34 @@ gem "httparty"
# Colored output to console
gem "colored"
-# GITLAB settings
+# GitLab settings
gem 'settingslogic'
# Misc
gem "foreman"
-gem 'gemoji', require: 'emoji/railtie'
gem "git"
group :assets do
- gem "sass-rails", "3.2.5"
- gem "coffee-rails", "3.2.2"
- gem "uglifier", "1.0.3"
+ gem "sass-rails", "~> 3.2.5"
+ gem "coffee-rails", "~> 3.2.2"
+ gem "uglifier", "~> 1.3.0"
gem "therubyracer"
- gem 'chosen-rails'
- gem 'jquery-atwho-rails', '0.1.6'
- gem "jquery-rails", "2.0.2"
- gem "jquery-ui-rails", "0.5.0"
- gem "modernizr", "2.5.3"
- gem "raphael-rails", "1.5.2"
+ gem 'chosen-rails', "0.9.8"
+ gem 'jquery-atwho-rails', "0.1.6"
+ gem "jquery-rails", "2.1.3"
+ gem "jquery-ui-rails", "2.0.2"
+ gem "modernizr", "2.6.2"
+ gem "raphael-rails", "2.1.0"
gem 'bootstrap-sass', "2.0.4"
gem "font-awesome-sass-rails", "~> 2.0.0"
+ gem "gemoji", "~> 1.2.1", require: 'emoji/railtie'
end
group :development do
gem "annotate", git: "https://github.com/ctran/annotate_models.git"
gem "letter_opener"
- gem 'quiet_assets', '1.0.1'
+ gem 'quiet_assets', '~> 1.0.1'
gem 'rack-mini-profiler'
end
@@ -144,7 +144,7 @@ end
group :test do
gem "simplecov", require: false
- gem "shoulda-matchers"
+ gem "shoulda-matchers", "1.3.0"
gem 'email_spec'
gem 'resque_spec'
gem "webmock"