Merge branch 'develop'
This commit is contained in:
		
						commit
						d81cb5fcb7
					
				
							
								
								
									
										66
									
								
								Gemfile.lock
									
									
									
									
									
								
							
							
						
						
									
										66
									
								
								Gemfile.lock
									
									
									
									
									
								
							@ -8,55 +8,52 @@ PATH
 | 
			
		||||
GEM
 | 
			
		||||
  remote: https://rubygems.org/
 | 
			
		||||
  specs:
 | 
			
		||||
    addressable (2.3.8)
 | 
			
		||||
    ast (2.0.0)
 | 
			
		||||
    addressable (2.4.0)
 | 
			
		||||
    ast (2.2.0)
 | 
			
		||||
    astrolabe (1.3.1)
 | 
			
		||||
      parser (~> 2.2)
 | 
			
		||||
    codeclimate-test-reporter (0.4.7)
 | 
			
		||||
    codeclimate-test-reporter (0.4.8)
 | 
			
		||||
      simplecov (>= 0.7.1, < 1.0.0)
 | 
			
		||||
    colorize (0.7.7)
 | 
			
		||||
    coveralls (0.8.2)
 | 
			
		||||
    coveralls (0.8.10)
 | 
			
		||||
      json (~> 1.8)
 | 
			
		||||
      rest-client (>= 1.6.8, < 2)
 | 
			
		||||
      simplecov (~> 0.10.0)
 | 
			
		||||
      simplecov (~> 0.11.0)
 | 
			
		||||
      term-ansicolor (~> 1.3)
 | 
			
		||||
      thor (~> 0.19.1)
 | 
			
		||||
      tins (~> 1.6.0)
 | 
			
		||||
    descendants_tracker (0.0.4)
 | 
			
		||||
      thread_safe (~> 0.3, >= 0.3.1)
 | 
			
		||||
    diff-lcs (1.2.5)
 | 
			
		||||
    docile (1.1.5)
 | 
			
		||||
    domain_name (0.5.24)
 | 
			
		||||
    domain_name (0.5.25)
 | 
			
		||||
      unf (>= 0.0.5, < 1.0.0)
 | 
			
		||||
    faraday (0.9.1)
 | 
			
		||||
    faraday (0.9.2)
 | 
			
		||||
      multipart-post (>= 1.2, < 3)
 | 
			
		||||
    github_api (0.12.4)
 | 
			
		||||
      addressable (~> 2.3)
 | 
			
		||||
    github_api (0.13.1)
 | 
			
		||||
      addressable (~> 2.4.0)
 | 
			
		||||
      descendants_tracker (~> 0.0.4)
 | 
			
		||||
      faraday (~> 0.8, < 0.10)
 | 
			
		||||
      hashie (>= 3.4)
 | 
			
		||||
      multi_json (>= 1.7.5, < 2.0)
 | 
			
		||||
      nokogiri (~> 1.6.6)
 | 
			
		||||
      oauth2
 | 
			
		||||
    hashie (3.4.2)
 | 
			
		||||
    hashie (3.4.3)
 | 
			
		||||
    http-cookie (1.0.2)
 | 
			
		||||
      domain_name (~> 0.5)
 | 
			
		||||
    json (1.8.3)
 | 
			
		||||
    jwt (1.5.1)
 | 
			
		||||
    mime-types (2.6.1)
 | 
			
		||||
    mini_portile (0.6.2)
 | 
			
		||||
    jwt (1.5.2)
 | 
			
		||||
    mime-types (2.99)
 | 
			
		||||
    multi_json (1.11.2)
 | 
			
		||||
    multi_xml (0.5.5)
 | 
			
		||||
    multipart-post (2.0.0)
 | 
			
		||||
    netrc (0.10.3)
 | 
			
		||||
    nokogiri (1.6.6.4)
 | 
			
		||||
      mini_portile (~> 0.6.0)
 | 
			
		||||
    netrc (0.11.0)
 | 
			
		||||
    oauth2 (1.0.0)
 | 
			
		||||
      faraday (>= 0.8, < 0.10)
 | 
			
		||||
      jwt (~> 1.0)
 | 
			
		||||
      multi_json (~> 1.3)
 | 
			
		||||
      multi_xml (~> 0.5)
 | 
			
		||||
      rack (~> 1.2)
 | 
			
		||||
    parser (2.2.2.6)
 | 
			
		||||
    parser (2.2.3.0)
 | 
			
		||||
      ast (>= 1.1, < 3.0)
 | 
			
		||||
    powerpack (0.1.1)
 | 
			
		||||
    rack (1.6.4)
 | 
			
		||||
@ -66,27 +63,28 @@ GEM
 | 
			
		||||
      http-cookie (>= 1.0.2, < 2.0)
 | 
			
		||||
      mime-types (>= 1.16, < 3.0)
 | 
			
		||||
      netrc (~> 0.7)
 | 
			
		||||
    rspec (3.3.0)
 | 
			
		||||
      rspec-core (~> 3.3.0)
 | 
			
		||||
      rspec-expectations (~> 3.3.0)
 | 
			
		||||
      rspec-mocks (~> 3.3.0)
 | 
			
		||||
    rspec-core (3.3.2)
 | 
			
		||||
      rspec-support (~> 3.3.0)
 | 
			
		||||
    rspec-expectations (3.3.1)
 | 
			
		||||
    rspec (3.4.0)
 | 
			
		||||
      rspec-core (~> 3.4.0)
 | 
			
		||||
      rspec-expectations (~> 3.4.0)
 | 
			
		||||
      rspec-mocks (~> 3.4.0)
 | 
			
		||||
    rspec-core (3.4.1)
 | 
			
		||||
      rspec-support (~> 3.4.0)
 | 
			
		||||
    rspec-expectations (3.4.0)
 | 
			
		||||
      diff-lcs (>= 1.2.0, < 2.0)
 | 
			
		||||
      rspec-support (~> 3.3.0)
 | 
			
		||||
    rspec-mocks (3.3.2)
 | 
			
		||||
      rspec-support (~> 3.4.0)
 | 
			
		||||
    rspec-mocks (3.4.0)
 | 
			
		||||
      diff-lcs (>= 1.2.0, < 2.0)
 | 
			
		||||
      rspec-support (~> 3.3.0)
 | 
			
		||||
    rspec-support (3.3.0)
 | 
			
		||||
    rubocop (0.32.1)
 | 
			
		||||
      rspec-support (~> 3.4.0)
 | 
			
		||||
    rspec-support (3.4.1)
 | 
			
		||||
    rubocop (0.35.1)
 | 
			
		||||
      astrolabe (~> 1.3)
 | 
			
		||||
      parser (>= 2.2.2.5, < 3.0)
 | 
			
		||||
      parser (>= 2.2.3.0, < 3.0)
 | 
			
		||||
      powerpack (~> 0.1)
 | 
			
		||||
      rainbow (>= 1.99.1, < 3.0)
 | 
			
		||||
      ruby-progressbar (~> 1.4)
 | 
			
		||||
      ruby-progressbar (~> 1.7)
 | 
			
		||||
      tins (<= 1.6.0)
 | 
			
		||||
    ruby-progressbar (1.7.5)
 | 
			
		||||
    simplecov (0.10.0)
 | 
			
		||||
    simplecov (0.11.1)
 | 
			
		||||
      docile (~> 1.1.0)
 | 
			
		||||
      json (~> 1.8)
 | 
			
		||||
      simplecov-html (~> 0.10.0)
 | 
			
		||||
@ -95,7 +93,7 @@ GEM
 | 
			
		||||
      tins (~> 1.0)
 | 
			
		||||
    thor (0.19.1)
 | 
			
		||||
    thread_safe (0.3.5)
 | 
			
		||||
    tins (1.5.4)
 | 
			
		||||
    tins (1.6.0)
 | 
			
		||||
    unf (0.1.4)
 | 
			
		||||
      unf_ext
 | 
			
		||||
    unf_ext (0.0.7.1)
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user