From 0877123a180e054797bf86af187d58832c8b7d66 Mon Sep 17 00:00:00 2001 From: alanlong <547533434@qq.com> Date: Sun, 4 Jan 2015 16:49:18 +0800 Subject: [PATCH] Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh Conflicts: public/stylesheets/application.css public/stylesheets/scm.css test/fixtures/activities.yml test/fixtures/course_infos.yml test/fixtures/course_statuses.yml test/fixtures/schools.yml test/fixtures/user_extensions.yml test/functional/applied_project_controller_test.rb test/functional/apply_project_masters_controller_test.rb test/functional/attachment_type_edit_controller_test.rb test/functional/contestnotifications_controller_test.rb test/functional/forums_controller_test.rb test/functional/memos_controller_test.rb test/functional/no_uses_controller_test.rb test/functional/notificationcomments_controller_test.rb test/functional/open_source_projects_controller_test.rb test/functional/softapplications_controller_test.rb test/functional/test_controller_test.rb test/functional/web_footer_companies_controller_test.rb test/unit/attachmentstype_test.rb test/unit/contest_notification_test.rb test/unit/contesting_softapplication_test.rb test/unit/contestnotification_test.rb test/unit/course_group_test.rb test/unit/course_infos_test.rb test/unit/course_status_test.rb test/unit/forum_test.rb test/unit/helpers/applied_project_helper_test.rb test/unit/helpers/apply_project_masters_helper_test.rb test/unit/helpers/attachment_type_edit_helper_test.rb test/unit/helpers/contestnotifications_helper_test.rb test/unit/helpers/courses_helper_test.rb test/unit/helpers/forums_helper_test.rb test/unit/helpers/memos_helper_test.rb test/unit/helpers/no_uses_helper_test.rb test/unit/helpers/notificationcomments_helper_test.rb test/unit/helpers/open_source_projects_helper_test.rb test/unit/helpers/school_helper_test.rb test/unit/helpers/softapplications_helper_test.rb test/unit/helpers/stores_helper_test.rb test/unit/helpers/test_helper_test.rb test/unit/helpers/zipdown_helper_test.rb test/unit/join_in_contest_test.rb test/unit/journal_reply_test.rb test/unit/memo_test.rb test/unit/no_use_test.rb test/unit/notificationcomments_test.rb test/unit/open_source_project_test.rb test/unit/option_number_test.rb test/unit/project_score_test.rb test/unit/relative_memo_test.rb test/unit/school_test.rb test/unit/softapplication_test.rb test/unit/user_score_details_test.rb test/unit/web_footer_company_test.rb test/unit/web_footer_oranizer_test.rb --- Gemfile.lock | 188 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 188 insertions(+) create mode 100644 Gemfile.lock diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 000000000..e52990e2a --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,188 @@ +PATH + remote: lib/better_errors + specs: + better_errors (1.1.0) + coderay (>= 1.0.0) + erubis (>= 2.6.6) + +PATH + remote: lib/rack-mini-profiler + specs: + rack-mini-profiler (0.9.1) + rack (>= 1.1.3) + +PATH + remote: lib/seems_rateable + specs: + seems_rateable (1.0.13) + jquery-rails + rails + +GEM + remote: https://rubygems.org/ + specs: + actionmailer (3.2.13) + actionpack (= 3.2.13) + mail (~> 2.5.3) + actionpack (3.2.13) + activemodel (= 3.2.13) + activesupport (= 3.2.13) + builder (~> 3.0.0) + erubis (~> 2.7.0) + journey (~> 1.0.4) + rack (~> 1.4.5) + rack-cache (~> 1.2) + rack-test (~> 0.6.1) + sprockets (~> 2.2.1) + activemodel (3.2.13) + activesupport (= 3.2.13) + builder (~> 3.0.0) + activerecord (3.2.13) + activemodel (= 3.2.13) + activesupport (= 3.2.13) + arel (~> 3.0.2) + tzinfo (~> 0.3.29) + activeresource (3.2.13) + activemodel (= 3.2.13) + activesupport (= 3.2.13) + activesupport (3.2.13) + i18n (= 0.6.1) + multi_json (~> 1.0) + acts-as-taggable-on (2.4.1) + rails (>= 3, < 5) + arel (3.0.2) + builder (3.0.0) + capybara (2.0.3) + mime-types (>= 1.16) + nokogiri (>= 1.3.3) + rack (>= 1.0.0) + rack-test (>= 0.5.4) + selenium-webdriver (~> 2.0) + xpath (~> 1.0.0) + childprocess (0.5.3) + ffi (~> 1.0, >= 1.0.11) + coderay (1.0.9) + coffee-rails (3.2.2) + coffee-script (>= 2.2.0) + railties (~> 3.2.0) + coffee-script (2.2.0) + coffee-script-source + execjs + coffee-script-source (1.7.0) + erubis (2.7.0) + execjs (2.0.2) + fastercsv (1.5.0) + ffi (1.9.3-x86-mingw32) + hike (1.2.3) + i18n (0.6.1) + journey (1.0.4) + jquery-rails (2.0.3) + railties (>= 3.1.0, < 5.0) + thor (~> 0.14) + json (1.8.0) + mail (2.5.4) + mime-types (~> 1.16) + treetop (~> 1.4.8) + metaclass (0.0.4) + mime-types (1.23) + mocha (0.13.3) + metaclass (~> 0.0.1) + multi_json (1.7.6) + mysql2 (0.3.11-x86-mingw32) + net-ldap (0.3.1) + nokogiri (1.5.11-x86-mingw32) + polyglot (0.3.3) + rack (1.4.5) + rack-cache (1.2) + rack (>= 0.4) + rack-openid (1.3.1) + rack (>= 1.1.0) + ruby-openid (>= 2.1.8) + rack-ssl (1.3.3) + rack + rack-test (0.6.2) + rack (>= 1.0) + rails (3.2.13) + actionmailer (= 3.2.13) + actionpack (= 3.2.13) + activerecord (= 3.2.13) + activeresource (= 3.2.13) + activesupport (= 3.2.13) + bundler (~> 1.0) + railties (= 3.2.13) + railties (3.2.13) + actionpack (= 3.2.13) + activesupport (= 3.2.13) + rack-ssl (~> 1.3.2) + rake (>= 0.8.7) + rdoc (~> 3.4) + thor (>= 0.14.6, < 2.0) + rake (10.3.2) + rdoc (3.12.2) + json (~> 1.4) + rmagick (2.13.2) + ruby-openid (2.1.8) + rubyzip (1.1.4) + sass (3.2.14) + sass-rails (3.2.6) + railties (~> 3.2.0) + sass (>= 3.1.10) + tilt (~> 1.3) + selenium-webdriver (2.42.0) + childprocess (>= 0.5.0) + multi_json (~> 1.0) + rubyzip (~> 1.0) + websocket (~> 1.0.4) + shoulda (3.5.0) + shoulda-context (~> 1.0, >= 1.0.1) + shoulda-matchers (>= 1.4.1, < 3.0) + shoulda-context (1.2.1) + shoulda-matchers (2.6.1) + activesupport (>= 3.0.0) + sprockets (2.2.2) + hike (~> 1.2) + multi_json (~> 1.0) + rack (~> 1.0) + tilt (~> 1.1, != 1.3.0) + thor (0.18.1) + tilt (1.4.1) + treetop (1.4.14) + polyglot + polyglot (>= 0.3.1) + tzinfo (0.3.37) + uglifier (2.4.0) + execjs (>= 0.3.0) + json (>= 1.8.0) + websocket (1.0.7) + xpath (1.0.0) + nokogiri (~> 1.3) + +PLATFORMS + x86-mingw32 + +DEPENDENCIES + activerecord-jdbc-adapter (= 1.2.5) + activerecord-jdbcmysql-adapter + acts-as-taggable-on (= 2.4.1) + better_errors! + builder (= 3.0.0) + capybara (~> 2.0.0) + coderay (~> 1.0.6) + coffee-rails (~> 3.2.1) + fastercsv (~> 1.5.0) + i18n (~> 0.6.0) + jquery-rails (~> 2.0.2) + mocha (~> 0.13.3) + mysql2 (= 0.3.11) + net-ldap (~> 0.3.1) + nokogiri (< 1.6.0) + rack-mini-profiler! + rack-openid + rails (= 3.2.13) + rmagick (>= 2.0.0) + ruby-openid (~> 2.1.4) + sass-rails (~> 3.2.3) + seems_rateable! + shoulda (> 3.3.2) + therubyracer + uglifier (>= 1.0.3)