Unverified Commit 595dcdcb authored by Mario Rodas's avatar Mario Rodas Committed by GitHub
Browse files

Merge pull request #217866 from glittershark/add-back-rails

parents 0470d19d e7f0b13b
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -229,6 +229,7 @@ in

  gpgme = attrs: {
    buildInputs = [ gpgme ];
    nativeBuildInputs = [ pkg-config ];
    buildFlags = [ "--use-system-libraries" ];
  };

+1 −1
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@ gem 'pry-byebug'
gem 'pry-doc'
gem 'public_suffix'
gem 'puma'
# gem 'rails'  # causes the Bundler resolver to explode, probably due conflict with CocoaPods activesupport requirement
gem 'rails'
gem 'rainbow'
# gem 'rbczmq' deprecated
gem 'rbnacl'
+483 −322

File changed.

Preview size limit exceeded, changes collapsed.