diff options
| author | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-02-25 23:36:03 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-02-25 23:36:03 +0000 |
| commit | 0d884ff2b1beae085050fe6729bd88783891fc71 (patch) | |
| tree | a6b623a0dd9de7e8c540a6c547829c2415912d41 /Gemfile.lock | |
| parent | a52529f9b6258b2ae2793930096c3fcbe40078f3 (diff) | |
| parent | 43f1ab9c12630e85861003c424da43314c2768a8 (diff) | |
| download | gitlab-ce-0d884ff2b1beae085050fe6729bd88783891fc71.tar.gz | |
Merge branch 'extend_markdown_upload' into 'master'
Generalizes image upload in drag and drop in markdown to all files
From https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/265 by Hannes Rosenögger.
- [x] Rebase on master when !1553 is merged in
See merge request !1530
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 6949d14b185..467ef1c7c3d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -65,6 +65,9 @@ GEM sass (>= 3.2.19) browser (0.7.2) builder (3.2.2) + byebug (3.2.0) + columnize (~> 0.8) + debugger-linecache (~> 1.2) cal-heatmap-rails (0.0.1) capybara (2.2.1) mime-types (>= 1.16) @@ -92,6 +95,7 @@ GEM coffee-script-source (1.6.3) colored (1.2) colorize (0.5.8) + columnize (0.9.0) connection_pool (2.1.0) coveralls (0.7.0) multi_json (~> 1.3) @@ -107,6 +111,7 @@ GEM daemons (1.1.9) database_cleaner (1.3.0) debug_inspector (0.0.2) + debugger-linecache (1.2.0) default_value_for (3.0.0) activerecord (>= 3.2.0, < 5.0) descendants_tracker (0.0.3) @@ -647,6 +652,7 @@ DEPENDENCIES binding_of_caller bootstrap-sass (~> 3.0) browser + byebug cal-heatmap-rails (~> 0.0.1) capybara (~> 2.2.1) carrierwave |