Commit
733087eb1d8ab20f11d7f4730cdbd5acd51018ee
Exists in
staging
and in
42 other branches
all_pending_tasks_api, api-articles-period, api_roles, caching-rails4, captcha_serpro_plugin, comments_permissions, content-manager-hostspot, elasticsearch, elasticsearch_api, elasticsearch_categories, elasticsearch_filter, elasticsearch_sort, elasticsearch_to_merge, elasticsearch_view, environment-exposes-api, export-comment-api, export-comment-paragraph, export_data, external_followers, federation-webfinger, federation_followers, federation_followers_backend, federation_oauth_provider, federation_webfinger, fix_event_date_issue, fix_notification_email, fix_string_downcase_and_upcase, follower_permition, json_cookie_serializer, login-captcha, master, master_profile_followers, oauth_external_login, oauth_login, private-scraps, private-scraps-rebase, production, production-vendorized, profile_api_improvements, tasks_keep_filter_params, user_mention, webfinger_server
Merge branch 'master' into rails3
|
| @@ -0,0 +1,3 @@ |
| @@ -0,0 +1,3 @@ |
|
| |
1
| +--ignore-dir=log |
|
| |
2
| +--ignore-dir=tmp |
|
| |
3
| +--ignore-dir=pkg |
|
| @@ -11,7 +11,7 @@ |
| @@ -11,7 +11,7 @@ |
|
11
| # |
11
| # |
|
12
| # It's strongly recommended to check this file into your version control system. |
12
| # It's strongly recommended to check this file into your version control system. |
|
13
| |
13
| |
|
14
| -ActiveRecord::Schema.define(:version => 20140605222753) do |
14
| +ActiveRecord::Schema.define(:version => 20140724134601) do |
|
15
| |
15
| |
|
16
| create_table "abuse_reports", :force => true do |t| |
16
| create_table "abuse_reports", :force => true do |t| |
|
17
| t.integer "reporter_id" |
17
| t.integer "reporter_id" |
