diff options
| author | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2016-06-10 10:49:07 +0200 |
|---|---|---|
| committer | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2016-06-10 10:49:07 +0200 |
| commit | 51046dd22628cc54e92ca6da016c05762158e8ea (patch) | |
| tree | a9352e9e0be4b74ee2622d85ee93a10e748fb225 /Gemfile.lock | |
| parent | d7e125116124b9c08c27b4a02f4738619db1d2f5 (diff) | |
| parent | cea3cf177c68bb1fa9326d4e88631b7737ae8a98 (diff) | |
| download | gitlab-ce-51046dd22628cc54e92ca6da016c05762158e8ea.tar.gz | |
Merge branch 'master' into refactor/ci-config-add-global-entry
* master: (147 commits)
Minor MR comment fixes.
Update CHANGELOG for 8.8.4 and 8.8.5
Properly quote table name in Rake task for MySQL and PostgreSQL compatibility
Checks based on whether data is loaded not undefined
Checks for undefined when inserting autocomplete into textarea
Ignore frequent emojis in search.
Fixed tests
CHANGELOG
Improved the UX of issue & milestone date picker
Change date format to be non zero padded in order to fix failing test
Update method name for better understanding
Add tests for dates on tooltips
Fix local timeago on user dashboard
Update CHANGELOG
Toggling a task in a description with mentions doesn't creates a Todo
Update CHANGELOG
Fixed failing label subscribe test
Tests update
Updated subscribe icon
Fixed failing tests
...
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 28de59beec7..dfc15700494 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -70,6 +70,21 @@ GEM descendants_tracker (~> 0.0.4) ice_nine (~> 0.11.0) thread_safe (~> 0.3, >= 0.3.1) + azure (0.7.5) + addressable (~> 2.3) + azure-core (~> 0.1) + faraday (~> 0.9) + faraday_middleware (~> 0.10) + json (~> 1.8) + mime-types (>= 1, < 3.0) + nokogiri (~> 1.6) + systemu (~> 2.6) + thor (~> 0.19) + uuid (~> 2.0) + azure-core (0.1.2) + faraday (~> 0.9) + faraday_middleware (~> 0.10) + nokogiri (~> 1.6) babosa (1.0.2) base32 (0.3.2) bcrypt (3.1.11) @@ -213,6 +228,11 @@ GEM fog-json (~> 1.0) fog-xml (~> 0.1) ipaddress (~> 0.8) + fog-azure (0.0.2) + azure (~> 0.6) + fog-core (~> 1.27) + fog-json (~> 1.0) + fog-xml (~> 0.1) fog-core (1.40.0) builder excon (~> 0.49) @@ -856,6 +876,7 @@ DEPENDENCIES flay flog fog-aws (~> 0.9) + fog-azure (~> 0.0) fog-core (~> 1.40) fog-google (~> 0.3) fog-local (~> 0.3) |