diff options
| author | Stan Hu <stanhu@gmail.com> | 2015-08-10 11:05:37 +0300 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2015-08-10 11:05:37 +0300 |
| commit | 77f37fa9094443abe8e60ebd09a82e94d0a0047b (patch) | |
| tree | b4b412c7a349f7e506bcf11b5d3cc31e791bf0f1 /Gemfile.lock | |
| parent | fb6f8d9198a7dbbd2dabf731ad0c9c8010a3f9f4 (diff) | |
| parent | 17bab5022fffb571a23aa94b73279a90618f1272 (diff) | |
Merge branch 'dropzone-upload-progress' into 'master'
Add dropzone upload progress
This MR adds upload progress in percents to dropzone.
I thought, it can be nice small enhancement :)
See merge request !1125
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index e72b7fe4927..643c513161f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -154,7 +154,7 @@ GEM doorkeeper (2.1.3) railties (>= 3.2) dotenv (0.9.0) - dropzonejs-rails (0.4.14) + dropzonejs-rails (0.7.1) rails (> 3.1) email_spec (1.6.0) launchy (~> 2.1) @@ -373,7 +373,7 @@ GEM mini_portile (0.6.2) minitest (5.3.5) mousetrap-rails (1.4.6) - multi_json (1.11.1) + multi_json (1.11.2) multi_xml (0.5.5) multipart-post (1.2.0) mysql2 (0.3.16) |