Commit
601aaddf98d6a67062610fbf9ce30e2e1c76bc29
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 'git-version' into 'master'
Use git information in Noosfero::VERSION
the commit message is self-explanatory
See merge request !435
| @@ -2,3 +2,7 @@ module Noosfero |
| @@ -2,3 +2,7 @@ module Noosfero |
2
| PROJECT = 'noosfero' |
2
| PROJECT = 'noosfero' |
3
| VERSION = '1.0' |
3
| VERSION = '1.0' |
4
| end |
4
| end |
| |
5
| + |
| |
6
| +if File.exist?(File.join(Rails.root, '.git')) |
| |
7
| + Noosfero::VERSION.clear << Dir.chdir(Rails.root) { `git describe --tags`.strip } |
| |
8
| +end |