diff --git a/Gemfile b/Gemfile index bc174f8..21572d0 100644 --- a/Gemfile +++ b/Gemfile @@ -1,5 +1,10 @@ source 'https://rubygems.org' +git_source(:gitlab) do |repo_name| + repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/") + "https://gitlab.com/#{repo_name}.git" +end + # Declare your gem's dependencies in dunlop-ember.gemspec. # Bundler will treat runtime dependencies like base dependencies, and # development dependencies will be added by default to the :development group. @@ -17,7 +22,8 @@ group :development, :test do gem 'rspec-rails' gem 'cancancan' gem 'slim-rails' - gem 'dunlop-core', github: 'companytools/dunlop-core', branch: 'master' + gem 'paperclip', '~> 5.3' + gem 'dunlop-core', gitlab: 'benja-2/dunlop-core', branch: 'master' #gem 'dunlop-core', path: '~/development/rails/components/dunlop-core' gem 'factory_girl_rails' gem 'active_model_serializers' diff --git a/Gemfile.lock b/Gemfile.lock index f8ae23f..6a33203 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,5 +1,5 @@ GIT - remote: git://github.com/companytools/dunlop-core.git + remote: https://gitlab.com/benja-2/dunlop-core.git revision: 2ab9ad0b61aa5cd14528fc00a41de20532cb4f26 branch: master specs: @@ -102,6 +102,7 @@ GEM xpath (~> 3.1) case_transform (0.2) activesupport + climate_control (0.2.0) coderay (1.1.2) coffee-rails (4.2.2) coffee-script (>= 2.2.0) @@ -165,6 +166,9 @@ GEM mimemagic (~> 0.3.2) memoist (0.16.0) method_source (0.9.0) + mime-types (3.1) + mime-types-data (~> 3.2015) + mime-types-data (3.2016.0521) mimemagic (0.3.2) mini_mime (1.0.0) mini_portile2 (2.3.0) @@ -175,6 +179,12 @@ GEM nokogiri (1.8.2) mini_portile2 (~> 2.3.0) orm_adapter (0.5.0) + paperclip (5.3.0) + activemodel (>= 4.2.0) + activesupport (>= 4.2.0) + mime-types + mimemagic (~> 0.3.0) + terrapin (~> 0.6.0) pickadate-rails (3.5.5.0) railties (>= 3.1.0) polyamorous (1.3.3) @@ -294,6 +304,8 @@ GEM activerecord (>= 4.1, < 6.0) state_machines-activemodel (>= 0.5.0) temple (0.8.0) + terrapin (0.6.0) + climate_control (>= 0.0.3, < 1.0) thor (0.20.0) thread_safe (0.3.6) tilt (2.0.8) @@ -321,6 +333,7 @@ DEPENDENCIES dunlop-ember! factory_girl_rails kaminari + paperclip (~> 5.3) pry-doc pry-rails rack-cors