Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

merge #116

Open
wants to merge 3,698 commits into
base: master
Choose a base branch
from
Open

merge #116

wants to merge 3,698 commits into from

Conversation

niejingfa
Copy link

No description provided.

huacnlee and others added 30 commits January 12, 2017 11:20
@huacnlee
Fix ruby-china#842 Markdown List 行之间有换行时，排版乱掉的问题;
4507238
@huacnlee
Reply API 结果增加 Mention 提及来源的话题信息;
38bd439 
ref: ruby-china#846
@huacnlee
Fix 38bd439 typo
6620471
@huacnlee
Only Run CI on 2.4.0 [skip ci]
b7daac2
@huacnlee
@ 自动完成用户名的功能改进，将关注用户匹配的优先放到前面;
c00c7d4
@huacnlee
Remove spec/javascripts 已经很久都没跑过了
f04168d
@huacnlee
用户名 AutoComplete 功能将回帖里面的匹配的优先排到前面;
ce20973
@huacnlee
Fix test
7d5ca10
@deppbot @huacnlee
Bundle Update on 2017-01-17 (ruby-china#851)
e15849c
@huacnlee
Upgrade RuCaptcha 2.0.0.beta4
1f0a9b0
@huacnlee
Merge branch 'master' of github.com:ruby-china/homeland
e22daf1
@huacnlee
RuCaptcha 2.0.0
dd1cb38
@huacnlee
修正评论列表的样式;
912f832
@huacnlee
Upgrade Rubocop
90263a9
@huacnlee
Downgrade a gem verison
9b34484
@huacnlee
1.month is to too long for Memcached
75606c3
@huacnlee
Fix Render and/or redirect were called multiple times in this action
2afb624
@huacnlee
Upgrade RuCaptcha 2.0.1 to fix ruby-china#856
04cf13d
@huacnlee
Version 2.5.2
858f7ee
@huacnlee
用 actions 表来代替 Like, Folllow, Block 等功能之前的 Array 字段存储. (ruby-china#857)
1833182
@huacnlee
Version 2.6.0
839b7a1
@huacnlee
Update README.md
3af8e41
@huacnlee
Fix ruby-china#862 Team 页面无法打开的问题.
905b9b3
@huacnlee
version 2.6.1
a646068
@huacnlee
Fix ruby-china#862 file name type
e698182
@huacnlee
Fix typo again
6cd70e9
@huacnlee
Fix "invalid value for Integer" with :page param.
b72c330 
by mislav/will_paginate#425
@huacnlee
Save more Exception environments.
90b07a4
@huacnlee
Do not puts exception messages [skip ci]
0ebae30
@huacnlee
update_attributes -> update
794bd1e 
http://api.rubyonrails.org/classes/ActiveRecord/Persistence.html#method-i-update_attributes
huacnlee and others added 30 commits June 9, 2017 10:26
@huacnlee
Fix lint
d647a69
@huacnlee
Fix test case
914f1f7
@huacnlee
修正前端 reply-to 无法生效的问题;
6c3d36b
@huacnlee
Version 3.0.4
3fe1fc1
@huacnlee
修正创建新回复以后，文本框没清空的问题
71683a6 
Rails 5.1 form_with 没有给控件生成 id attribute
@deppbot
Bundle Update on 2017-06-10
1754097
@huacnlee
修正升级 Rails 5.1 以后更新打赏二维码界面的错误
af04a16
@huacnlee
Version 3.0.5
62658f6
运行提交
5711668
@lihuazhang
env to request.env to avoid github login failure
c88e7e1 
env to request.env to avoid github login failure
@huacnlee
Merge pull request ruby-china#939 from lihuazhang/patch-2
83302a8 
env to request.env to avoid github login failure
挂载
36eb71b
@larrylv @huacnlee
Bring back navbar and title for oauth pages (ruby-china#941)
1aad64d
@huacnlee
Add a missing close div tag for account.html.erb (ruby-china#943)
4d705c1
@huacnlee
Version 3.0.6
370d6e6
@lonre @huacnlee
更新 Vagrant 开发环境 (ruby-china#945)
d4748c0 
* Fix nokogiri installation error
Error: `zlib is missing; necessary for building libxml2`

* Upgrade vagrant environment
1. Ubuntu precise64 => trusty64
2. Elasticsearch 2.x => 5.x
3. Ruby 2.3 => 2.4
4. JRE 7 => 8
@huacnlee
Remove dotted underscore from abbr tag
26710ca
@huacnlee
Change bg color
4742fe7
@niejingfa
Merge pull request #1 from ruby-china/bundle-update-2017-06-10-183434
793cb36 
Bundle update 2017 06 10 183434
merge
63772c7
merge
883a94b
@jasl
Fix isLogined return false after user signed in
3110eb8
@huacnlee
屏蔽话题对话框改成 remote: true，以修正 iOS App 无法使用的问题.
e905fee
@huacnlee
version 3.0.7
625ee8e
@huacnlee
fix typo (ruby-china#948)
17d3846 
change delete_notifiaction_mentions to delete_notification_mentions
@huacnlee
相关话题的搜索条件修正，采用 more_like_this 新的写法，避免服务器大量 WARN.
c6483f2 
fix ruby-china#949
@huacnlee
Bundle update
13509ab
@niejingfa
Merge branch 'master' into master
b7bbc21
merge
3f302ea
Gemlock
c319639
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.