mirror of
https://github.com/codeninjasllc/discourse.git
synced 2024-12-17 19:12:37 -05:00
upgrade pg to version 0.18, may fix encoding issue
This commit is contained in:
parent
e20078a9dc
commit
e089f699c1
3 changed files with 5 additions and 11 deletions
10
Gemfile
10
Gemfile
|
@ -142,15 +142,7 @@ gem 'omniauth-github-discourse', require: 'omniauth-github'
|
|||
gem 'omniauth-oauth2', require: false
|
||||
gem 'omniauth-google-oauth2'
|
||||
gem 'oj'
|
||||
|
||||
if rails_master?
|
||||
# native casting
|
||||
gem 'pg', '0.18.0.pre20141117110243'
|
||||
else
|
||||
# while resolving https://groups.google.com/forum/#!topic/ruby-pg/5_ylGmog1S4
|
||||
gem 'pg', '0.15.1'
|
||||
end
|
||||
|
||||
gem 'pg'
|
||||
gem 'pry-rails', require: false
|
||||
gem 'rake'
|
||||
|
||||
|
|
|
@ -279,7 +279,7 @@ GEM
|
|||
openid-redis-store (0.0.2)
|
||||
redis
|
||||
ruby-openid
|
||||
pg (0.15.1)
|
||||
pg (0.18.0)
|
||||
polyglot (0.3.5)
|
||||
progress (3.0.1)
|
||||
pry (0.10.1)
|
||||
|
@ -503,7 +503,7 @@ DEPENDENCIES
|
|||
omniauth-twitter
|
||||
onebox
|
||||
openid-redis-store
|
||||
pg (= 0.15.1)
|
||||
pg
|
||||
pry-nav
|
||||
pry-rails
|
||||
puma
|
||||
|
|
|
@ -6,6 +6,8 @@ export default Ember.Component.extend({
|
|||
|
||||
_observeHideCategory: function(){
|
||||
this.addObserver('hideCategory', this.rerender);
|
||||
this.addObserver('order', this.rerender);
|
||||
this.addObserver('ascending', this.rerender);
|
||||
}.on('init'),
|
||||
|
||||
toggleInTitle: function(){
|
||||
|
|
Loading…
Reference in a new issue