diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-04-22 15:08:57 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-04-22 15:08:57 +0300 |
| commit | 2bac3ac75c8f8c3f690ea8ba507c09bd93b00872 (patch) | |
| tree | 957bd6f084f6ce2c9ee59788a0396ae54ddbb119 | |
| parent | c3f2de68b53eb9207ea458d8ada36f99219795d4 (diff) | |
| parent | 1cf07f6ba919ad31bcf503ab121f546c935dde84 (diff) | |
| download | gitlab-ce-2bac3ac75c8f8c3f690ea8ba507c09bd93b00872.tar.gz | |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
| -rw-r--r-- | Gemfile | 4 | ||||
| -rw-r--r-- | Gemfile.lock | 4 |
2 files changed, 4 insertions, 4 deletions
@@ -42,7 +42,7 @@ gem "browser" gem "gitlab_git", '~> 7.1.10' # Ruby/Rack Git Smart-HTTP Server Handler -gem 'gitlab-grack', '~> 2.0.1', require: 'grack' +gem 'gitlab-grack', '~> 2.0.2', require: 'grack' # LDAP Auth gem 'gitlab_omniauth-ldap', '1.2.1', require: "omniauth-ldap" @@ -256,7 +256,7 @@ group :development, :test do gem "spring", '~> 1.3.1' gem "spring-commands-rspec", '1.0.4' gem "spring-commands-spinach", '1.0.0' - + gem "byebug" end diff --git a/Gemfile.lock b/Gemfile.lock index 8f66476ad63..8679da009c2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -199,7 +199,7 @@ GEM gitlab-flowdock-git-hook (0.4.2.2) gitlab-grit (>= 2.4.1) multi_json - gitlab-grack (2.0.1) + gitlab-grack (2.0.2) rack (~> 1.5.1) gitlab-grit (2.7.2) charlock_holmes (~> 0.6) @@ -696,7 +696,7 @@ DEPENDENCIES gemnasium-gitlab-service (~> 0.2) github-markup gitlab-flowdock-git-hook (~> 0.4.2) - gitlab-grack (~> 2.0.1) + gitlab-grack (~> 2.0.2) gitlab-linguist (~> 3.0.1) gitlab_emoji (~> 0.1) gitlab_git (~> 7.1.10) |