Skip to content

Commit

Permalink
Merge pull request #176 from ONLYOFFICE/release/1.10
Browse files Browse the repository at this point in the history
Make 1.10 release. Latest rails 4 release.
  • Loading branch information
ShockwaveNN authored Dec 5, 2016
2 parents 5803da1 + 248158d commit 2e7f32d
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 15 deletions.
3 changes: 1 addition & 2 deletions Changelog.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
# Change log

## master (unreleased)

## 1.10
### New features
* Ability to download log file from `server_history` page
* Ability to specify host name for started docker container
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ gem 'devise'
gem 'jbuilder', '~> 1.2'
gem 'jquery-rails'
gem 'jquery-ui-rails', '~> 5'
gem 'onlyoffice_digitalocean_wrapper', '~> 0.1', git: 'https://github.com/onlyoffice-testing-robot/onlyoffice_digitalocean_wrapper'
gem 'onlyoffice_digitalocean_wrapper', '0.1'
gem 'onlyoffice_rspec_result_parser', git: 'https://github.com/onlyoffice-testing-robot/onlyoffice_rspec_result_parser'
gem 'pg'
gem 'process_exists'
Expand Down
19 changes: 7 additions & 12 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,12 +1,3 @@
GIT
remote: https://github.com/onlyoffice-testing-robot/onlyoffice_digitalocean_wrapper
revision: 095a3b612386a87d9e34d77a791eefe26f353756
specs:
onlyoffice_digitalocean_wrapper (0.1.0)
activesupport (~> 4)
droplet_kit (~> 2.0.1)
onlyoffice_logger_helper (= 1.0.0)

GIT
remote: https://github.com/onlyoffice-testing-robot/onlyoffice_rspec_result_parser
revision: f159ac712dd1e76fa66f8a3224ba10e223ad4b0c
Expand Down Expand Up @@ -115,17 +106,21 @@ GEM
mime-types-data (~> 3.2015)
mime-types-data (3.2016.0521)
mini_portile2 (2.1.0)
minitest (5.10.0)
minitest (5.10.1)
multi_json (1.12.1)
multipart-post (2.0.0)
nokogiri (1.6.8.1)
mini_portile2 (~> 2.1.0)
onlyoffice_digitalocean_wrapper (0.1.0)
activesupport (~> 4)
droplet_kit (~> 2.0.1)
onlyoffice_logger_helper (= 1.0.0)
onlyoffice_logger_helper (1.0.0)
orm_adapter (0.5.0)
overcommit (0.37.0)
childprocess (~> 0.5.8)
iniparse (~> 1.4)
parser (2.3.3.0)
parser (2.3.3.1)
ast (~> 2.2)
pg (0.19.0)
powerpack (0.1.1)
Expand Down Expand Up @@ -222,7 +217,7 @@ DEPENDENCIES
jbuilder (~> 1.2)
jquery-rails
jquery-ui-rails (~> 5)
onlyoffice_digitalocean_wrapper (~> 0.1)!
onlyoffice_digitalocean_wrapper (= 0.1)
onlyoffice_rspec_result_parser!
overcommit
pg
Expand Down

0 comments on commit 2e7f32d

Please sign in to comment.