Merge branch 'develop' of git.znuny.com:zammad/zammad into develop
This commit is contained in:
commit
575f15273d
1 changed files with 17 additions and 0 deletions
17
Gemfile.lock
17
Gemfile.lock
|
@ -98,8 +98,18 @@ GEM
|
|||
execjs (2.7.0)
|
||||
faraday (0.9.2)
|
||||
multipart-post (>= 1.2, < 3)
|
||||
faraday-http-cache (1.3.1)
|
||||
faraday (~> 0.8)
|
||||
ffi (1.9.14)
|
||||
formatador (0.2.5)
|
||||
github_changelog_generator (1.14.1)
|
||||
activesupport
|
||||
faraday-http-cache
|
||||
multi_json
|
||||
octokit (~> 4.0)
|
||||
rainbow (>= 2.1)
|
||||
rake (>= 10.0)
|
||||
retriable (~> 2.1)
|
||||
globalid (0.3.7)
|
||||
activesupport (>= 4.1.0)
|
||||
guard (2.14.0)
|
||||
|
@ -176,6 +186,8 @@ GEM
|
|||
multi_json (~> 1.3)
|
||||
multi_xml (~> 0.5)
|
||||
rack (>= 1.2, < 3)
|
||||
octokit (4.4.1)
|
||||
sawyer (~> 0.7.0, >= 0.5.3)
|
||||
omniauth (1.3.1)
|
||||
hashie (>= 1.2, < 4)
|
||||
rack (>= 1.0, < 3)
|
||||
|
@ -256,6 +268,7 @@ GEM
|
|||
rb-inotify (0.9.7)
|
||||
ffi (>= 0.5.0)
|
||||
ref (2.0.0)
|
||||
retriable (2.1.0)
|
||||
rubocop (0.42.0)
|
||||
parser (>= 2.3.1.1, < 3.0)
|
||||
powerpack (~> 0.1)
|
||||
|
@ -272,6 +285,9 @@ GEM
|
|||
sprockets (>= 2.8, < 4.0)
|
||||
sprockets-rails (>= 2.0, < 4.0)
|
||||
tilt (>= 1.1, < 3)
|
||||
sawyer (0.7.0)
|
||||
addressable (>= 2.3.5, < 2.5)
|
||||
faraday (~> 0.8, < 0.10)
|
||||
scrub_rb (1.0.1)
|
||||
selenium-webdriver (2.53.4)
|
||||
childprocess (~> 0.5)
|
||||
|
@ -355,6 +371,7 @@ DEPENDENCIES
|
|||
email_verifier
|
||||
eventmachine
|
||||
execjs
|
||||
github_changelog_generator
|
||||
guard
|
||||
guard-livereload
|
||||
htmlentities
|
||||
|
|
Loading…
Reference in a new issue