diff options
| author | Kazuhiko <kazuhiko@fdiary.net> | 2013-02-26 21:31:45 +0100 |
|---|---|---|
| committer | Kazuhiko <kazuhiko@fdiary.net> | 2013-02-26 21:31:45 +0100 |
| commit | 3b548d925176791958a12324ab27ad457b110068 (patch) | |
| tree | c6c4263473da682b9f8b399c60efc40f050097c8 | |
| parent | c08f19f275182a24fa675c31d630126c75b50af9 (diff) | |
| download | gitlab-ce-3b548d925176791958a12324ab27ad457b110068.tar.gz | |
update grape to 0.3.1 for ruby 2.0 support.
add grape-entity, that is split from grape 0.3.0.
remove usage of deprecated error_format, that is removed in grape 0.2.3.
| -rw-r--r-- | Gemfile | 3 | ||||
| -rw-r--r-- | Gemfile.lock | 7 | ||||
| -rw-r--r-- | lib/api.rb | 1 |
3 files changed, 7 insertions, 4 deletions
@@ -39,7 +39,8 @@ gem "pygments.rb", git: "https://github.com/gitlabhq/pygments.rb.git", branch: gem "github-linguist", "~> 2.3.4" , require: "linguist" # API -gem "grape", "~> 0.2.1" +gem "grape", "~> 0.3.1" +gem "grape-entity", "~> 0.2.0" # Format dates and times # based on human-friendly examples diff --git a/Gemfile.lock b/Gemfile.lock index 3ca39aeae28..93abf857cb8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -182,8 +182,9 @@ GEM pyu-ruby-sasl (~> 0.0.3.1) rubyntlm (~> 0.1.1) gitlab_yaml_db (1.0.0) - grape (0.2.2) + grape (0.3.1) activesupport + grape-entity (~> 0.2.0) hashie (~> 1.2) multi_json (>= 1.3.2) multi_xml @@ -191,6 +192,7 @@ GEM rack-accept rack-mount virtus + grape-entity (0.2.0) growl (1.0.3) guard (1.5.4) listen (>= 0.4.2) @@ -481,7 +483,8 @@ DEPENDENCIES gitlab_omniauth-ldap (= 1.0.2) gitlab_yaml_db (= 1.0.0) grack! - grape (~> 0.2.1) + grape (~> 0.3.1) + grape-entity (~> 0.2.0) grit! grit_ext! growl diff --git a/lib/api.rb b/lib/api.rb index d9dce7c70cc..da31a1519dd 100644 --- a/lib/api.rb +++ b/lib/api.rb @@ -9,7 +9,6 @@ module Gitlab end format :json - error_format :json helpers APIHelpers mount Groups |