mirror of
https://github.com/codeninjasllc/discourse.git
synced 2024-11-30 19:08:10 -05:00
Merge pull request #816 from ngpestelos/master
use HTTP URL to check out active_model_serializers
This commit is contained in:
commit
69db4ab967
2 changed files with 8 additions and 8 deletions
2
Gemfile
2
Gemfile
|
@ -1,6 +1,6 @@
|
|||
source 'https://rubygems.org'
|
||||
|
||||
gem 'active_model_serializers', git: 'git://github.com/rails-api/active_model_serializers.git'
|
||||
gem 'active_model_serializers', git: 'https://github.com/rails-api/active_model_serializers.git'
|
||||
|
||||
# we had issues with latest, stick to the rev till we figure this out
|
||||
# PR that makes it all hang together welcome
|
||||
|
|
14
Gemfile.lock
14
Gemfile.lock
|
@ -38,13 +38,6 @@ GIT
|
|||
execjs (>= 1.2)
|
||||
railties (>= 3.1)
|
||||
|
||||
GIT
|
||||
remote: git://github.com/rails-api/active_model_serializers.git
|
||||
revision: 329a38a7ddee4350f96d657256a5f6a277865291
|
||||
specs:
|
||||
active_model_serializers (0.7.0)
|
||||
activemodel (>= 3.0)
|
||||
|
||||
GIT
|
||||
remote: git://github.com/zhangyuan/vestal_versions
|
||||
revision: 0ea75ec4e269b5a9e609639919ade0f36381a446
|
||||
|
@ -53,6 +46,13 @@ GIT
|
|||
activerecord (>= 3.0.0)
|
||||
activesupport (>= 3.0.0)
|
||||
|
||||
GIT
|
||||
remote: https://github.com/rails-api/active_model_serializers.git
|
||||
revision: 7a39966e7ea47eb2f58962b6f0060ff3cbef4e65
|
||||
specs:
|
||||
active_model_serializers (0.7.0)
|
||||
activemodel (>= 3.0)
|
||||
|
||||
PATH
|
||||
remote: vendor/gems/discourse_emoji
|
||||
specs:
|
||||
|
|
Loading…
Reference in a new issue