Compare commits
merge into: glenux-contrib:fix-null-pointer
glenux-contrib:develop
glenux-contrib:feature/copy-paste
glenux-contrib:feature/uploads-api
glenux-contrib:fix-null-pointer
glenux-contrib:stub-import-for-tests
glenux-contrib:frontendonly
glenux-contrib:add-user-route
glenux-contrib:feature/topic-card-uploads
glenux-contrib:instance/metamapscc
glenux-contrib:rubocop-fixes
glenux-contrib:feature/jit.react
glenux-contrib:feature/refactor.jit
glenux-contrib:master
glenux-contrib:instance/uts
glenux-contrib:rails-5.1
glenux-contrib:homepage.good
glenux-contrib:test-codeclimate
glenux-contrib:feature/pan-zoom-in-url
glenux-contrib:feature/update-backbone-and-socket.io
glenux-contrib:feature/xml-schema-import
glenux-contrib:feature/browser-support
glenux-contrib:feature/new.home
glenux-contrib:feature/convo.algo
glenux-contrib:feature/particles
glenux-contrib:feature/better.select
glenux-contrib:feature/emoji-fixes
glenux-contrib:backup/mailboxer
glenux-contrib:feature/reconstruct
glenux-contrib:feature/limit.delete
glenux-contrib:feature/overhaul-synapse-creation
glenux-contrib:feature/export.streaming
glenux-contrib:feature/thinner-topic-titles
glenux-contrib:feature/update-windows-docs
glenux-contrib:feature/import.export.more.parsers
glenux-contrib:feature/flex.permission.styling
glenux-contrib:instance/synbioleap
glenux-contrib:feature/latest.viewed
glenux-contrib:instance/thevalueweb
glenux-contrib:feature/json
glenux-contrib:feature/extract.front.end
glenux-contrib:v3.6.1
glenux-contrib:v3.6
glenux-contrib:v3.5
glenux-contrib:v3.4.1
glenux-contrib:v3.4
glenux-contrib:3.4
glenux-contrib:v3.3
glenux-contrib:v3.2
glenux-contrib:v3.1
glenux-contrib:v3.0.4
glenux-contrib:v3.0.3
glenux-contrib:3.0.3
glenux-contrib:v3.0.1
glenux-contrib:v3.0
glenux-contrib:v2.9.1
glenux-contrib:v2.9.0
glenux-contrib:v2.8.6
glenux-contrib:v2.8.5
glenux-contrib:v2.8.4
glenux-contrib:v2.8.3
glenux-contrib:v2.8.2
glenux-contrib:v2.8.1
glenux-contrib:v2.7
glenux-contrib:v2.8
glenux-contrib:v2.7.2
glenux-contrib:v2.7.1
glenux-contrib:v2.6
...
pull from: glenux-contrib:develop
glenux-contrib:feature/copy-paste
glenux-contrib:feature/uploads-api
glenux-contrib:develop
glenux-contrib:fix-null-pointer
glenux-contrib:stub-import-for-tests
glenux-contrib:frontendonly
glenux-contrib:add-user-route
glenux-contrib:feature/topic-card-uploads
glenux-contrib:instance/metamapscc
glenux-contrib:rubocop-fixes
glenux-contrib:feature/jit.react
glenux-contrib:feature/refactor.jit
glenux-contrib:master
glenux-contrib:instance/uts
glenux-contrib:rails-5.1
glenux-contrib:homepage.good
glenux-contrib:test-codeclimate
glenux-contrib:feature/pan-zoom-in-url
glenux-contrib:feature/update-backbone-and-socket.io
glenux-contrib:feature/xml-schema-import
glenux-contrib:feature/browser-support
glenux-contrib:feature/new.home
glenux-contrib:feature/convo.algo
glenux-contrib:feature/particles
glenux-contrib:feature/better.select
glenux-contrib:feature/emoji-fixes
glenux-contrib:backup/mailboxer
glenux-contrib:feature/reconstruct
glenux-contrib:feature/limit.delete
glenux-contrib:feature/overhaul-synapse-creation
glenux-contrib:feature/export.streaming
glenux-contrib:feature/thinner-topic-titles
glenux-contrib:feature/update-windows-docs
glenux-contrib:feature/import.export.more.parsers
glenux-contrib:feature/flex.permission.styling
glenux-contrib:instance/synbioleap
glenux-contrib:feature/latest.viewed
glenux-contrib:instance/thevalueweb
glenux-contrib:feature/json
glenux-contrib:feature/extract.front.end
glenux-contrib:v3.6.1
glenux-contrib:v3.6
glenux-contrib:v3.5
glenux-contrib:v3.4.1
glenux-contrib:v3.4
glenux-contrib:3.4
glenux-contrib:v3.3
glenux-contrib:v3.2
glenux-contrib:v3.1
glenux-contrib:v3.0.4
glenux-contrib:v3.0.3
glenux-contrib:3.0.3
glenux-contrib:v3.0.1
glenux-contrib:v3.0
glenux-contrib:v2.9.1
glenux-contrib:v2.9.0
glenux-contrib:v2.8.6
glenux-contrib:v2.8.5
glenux-contrib:v2.8.4
glenux-contrib:v2.8.3
glenux-contrib:v2.8.2
glenux-contrib:v2.8.1
glenux-contrib:v2.7
glenux-contrib:v2.8
glenux-contrib:v2.7.2
glenux-contrib:v2.7.1
glenux-contrib:v2.6
2 commits
fix-null-p
...
develop
| Author | SHA1 | Message | Date | |
|---|---|---|---|---|
Devin Howard
|
98081097b4 |
Revert "update rails dependencies"
Original commit broke the build, since some dependencies have breaking
changes.
This reverts commit
|
||
|
Devin Howard
|
f753392d49 | update rails dependencies |