Download as
Browse Code »

Commit 904f1fb44b3416befaa7f4769c8dd1381745b2ed

Authored by Victor Costa
2 parents 31323dca aa847970
Exists in master and in 27 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, temp_ratings, tests, tests_fixies

Merge branch 'master' into rails3

Showing 2 changed files with 3 additions and 2 deletions   Show diff stats
Gemfile.lock
  Diff comments   View file @904f1fb
... ... @@ -61,7 +61,7 @@ GEM
61 61 database_cleaner (1.2.0)
62 62 diff-lcs (1.1.3)
63 63 erubis (2.7.0)
64   - eventmachine (1.0.3)
  64 + eventmachine (0.12.11)
65 65 fast_gettext (0.6.8)
66 66 ffi (1.0.11)
67 67 gherkin (2.4.21)
... ... @@ -75,7 +75,7 @@ GEM
75 75 i18n (>= 0.4.0)
76 76 mime-types (~> 1.16)
77 77 treetop (~> 1.4.8)
78   - metaclass (0.0.4)
  78 + metaclass (0.0.1)
79 79 mime-types (1.19)
80 80 mocha (0.11.3)
81 81 metaclass (~> 0.0.1)
... ...
script/quick-start
  Diff comments   View file @904f1fb
... ... @@ -52,6 +52,7 @@ else
52 52 # special case Debian-based systems; in others people will have to install
53 53 # lsb-release by themselves
54 54 if which apt-get >/dev/null 2>&1; then
  55 + sudo apt-get update
55 56 sudo apt-get -y install lsb-release
56 57 else
57 58 complain "E: lsb_release not available! (Try installing the lsb-release package)"
... ...