Commit
d7ee1f554a30afa8b45e6a5f769e996dc8c0d24b
Exists in
staging
and in
39 other branches
all_pending_tasks_api, api-articles-period, api_roles, caching-rails4, captcha_serpro_plugin, comments_permissions, 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_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, user_mention, webfinger_server
rails4: don't force a sass version
|
| @@ -33,7 +33,6 @@ gem 'rack-contrib' |
| @@ -33,7 +33,6 @@ gem 'rack-contrib' |
|
33
| # asset pipeline |
33
| # asset pipeline |
|
34
| gem 'uglifier', '>= 1.0.3' |
34
| gem 'uglifier', '>= 1.0.3' |
|
35
| gem 'sass-rails' |
35
| gem 'sass-rails' |
|
36
| -gem 'sass', '~> 3.1.19' |
| |
|
37
| |
36
| |
|
38
| # gems to enable rails3 behaviour |
37
| # gems to enable rails3 behaviour |
|
39
| gem 'protected_attributes' |
38
| gem 'protected_attributes' |
