\ No newline at end of file
diff --git a/app/views/layouts/_syllabus_base_info.html.erb b/app/views/layouts/_syllabus_base_info.html.erb
index 335dc3335..22139b550 100644
--- a/app/views/layouts/_syllabus_base_info.html.erb
+++ b/app/views/layouts/_syllabus_base_info.html.erb
@@ -5,27 +5,27 @@
@@ -60,16 +60,16 @@
<% if all_count > (page.to_i+1) * 10%>
-
+
<% end%>
\ No newline at end of file
+
\ No newline at end of file
diff --git a/app/views/users/_user_homework_detail.html.erb b/app/views/users/_user_homework_detail.html.erb
index 990a193cc..3f73f3b9d 100644
--- a/app/views/users/_user_homework_detail.html.erb
+++ b/app/views/users/_user_homework_detail.html.erb
@@ -146,9 +146,9 @@
-
diff --git a/config/initializers/configuration.yml b/config/initializers/configuration.yml
new file mode 100644
index 000000000..38cb9b927
--- /dev/null
+++ b/config/initializers/configuration.yml
@@ -0,0 +1,241 @@
+# = Redmine configuration file
+#
+# Each environment has it's own configuration options. If you are only
+# running in production, only the production block needs to be configured.
+# Environment specific configuration options override the default ones.
+#
+# Note that this file needs to be a valid YAML file.
+# DO NOT USE TABS! Use 2 spaces instead of tabs for identation.
+#
+# == Outgoing email settings (email_delivery setting)
+#
+# === Common configurations
+#
+# ==== Sendmail command
+#
+# production:
+# email_delivery:
+# delivery_method: :sendmail
+#
+# ==== Simple SMTP server at localhost
+#
+# production:
+# email_delivery:
+# delivery_method: :smtp
+# smtp_settings:
+# address: smtp.163.com
+# port: 25
+#
+# ==== SMTP server at example.com using LOGIN authentication and checking HELO for foo.com
+#
+# production:
+# email_delivery:
+# delivery_method: :smtp
+# smtp_settings:
+# address: smtp.gmail.com
+# port: 587
+# authentication: :login
+# domain: 'foo.com'
+# user_name: senluowanxiangt@gmail.com
+# password: 1913TXBja
+#
+# ==== SMTP server at example.com using PLAIN authentication
+#
+# production:
+# email_delivery:
+# delivery_method: :smtp
+# smtp_settings:
+# address: smtp.gmail.com
+# port: 587
+# authentication: :plain
+# domain: 'example.com'
+# user_name: senluowanxiangt@gmail.com
+# password: 1913TXBja
+#
+# ==== SMTP server at using TLS (GMail)
+#
+# This might require some additional configuration. See the guides at:
+# http://www.redmine.org/projects/redmine/wiki/EmailConfiguration
+#
+# production:
+# email_delivery:
+# delivery_method: :smtp
+# smtp_settings:
+# enable_starttls_auto: true
+# address: smtp.gmail.com
+# port: 587
+# domain: "smtp.gmail.com" # 'your.domain.com' for GoogleApps
+# authentication: :plain
+# user_name: senluowanxiangt@gmail.com
+# password: 1913TXBja
+#
+#
+# === More configuration options
+#
+# See the "Configuration options" at the following website for a list of the
+# full options allowed:
+#
+# http://wiki.rubyonrails.org/rails/pages/HowToSendEmailsWithActionMailer
+
+
+
+default:
+ email_delivery:
+ delivery_method: :smtp
+ smtp_settings:
+ address: mail.trustie.net
+ port: 25
+ domain: mail.trustie.net
+ authentication: :login
+ user_name: "mail@trustie.net"
+ password: "loong2010"
+
+ # Absolute path to the directory where attachments are stored.
+ # The default is the 'files' directory in your Redmine instance.
+ # Your Redmine instance needs to have write permission on this
+ # directory.
+ # Examples:
+ # attachments_storage_path: /var/redmine/files
+ # attachments_storage_path: D:/redmine/files
+ attachments_storage_path:
+
+ # Configuration of the autologin cookie.
+ # autologin_cookie_name: the name of the cookie (default: autologin)
+ # autologin_cookie_path: the cookie path (default: /)
+ # autologin_cookie_secure: true sets the cookie secure flag (default: false)
+ autologin_cookie_name: "autologin_trustie"
+ autologin_cookie_path:
+ autologin_cookie_secure:
+
+ # Configuration of SCM executable command.
+ #
+ # Absolute path (e.g. /usr/local/bin/hg) or command name (e.g. hg.exe, bzr.exe)
+ # On Windows + CRuby, *.cmd, *.bat (e.g. hg.cmd, bzr.bat) does not work.
+ #
+ # On Windows + JRuby 1.6.2, path which contains spaces does not work.
+ # For example, "C:\Program Files\TortoiseHg\hg.exe".
+ # If you want to this feature, you need to install to the path which does not contains spaces.
+ # For example, "C:\TortoiseHg\hg.exe".
+ #
+ # Examples:
+ # scm_subversion_command: svn # (default: svn)
+ # scm_mercurial_command: C:\Program Files\TortoiseHg\hg.exe # (default: hg)
+ # scm_git_command: /usr/local/bin/git # (default: git)
+ # scm_cvs_command: cvs # (default: cvs)
+ # scm_bazaar_command: bzr.exe # (default: bzr)
+ # scm_darcs_command: darcs-1.0.9-i386-linux # (default: darcs)
+ #
+ scm_subversion_command:
+ scm_mercurial_command:
+ scm_git_command:
+ scm_cvs_command:
+ scm_bazaar_command:
+ scm_darcs_command:
+
+ # Absolute path to the SCM commands errors (stderr) log file.
+ # The default is to log in the 'log' directory of your Redmine instance.
+ # Example:
+ # scm_stderr_log_file: /var/log/redmine_scm_stderr.log
+ scm_stderr_log_file:
+
+ # Key used to encrypt sensitive data in the database (SCM and LDAP passwords).
+ # If you don't want to enable data encryption, just leave it blank.
+ # WARNING: losing/changing this key will make encrypted data unreadable.
+ #
+ # If you want to encrypt existing passwords in your database:
+ # * set the cipher key here in your configuration file
+ # * encrypt data using 'rake db:encrypt RAILS_ENV=production'
+ #
+ # If you have encrypted data and want to change this key, you have to:
+ # * decrypt data using 'rake db:decrypt RAILS_ENV=production' first
+ # * change the cipher key here in your configuration file
+ # * encrypt data using 'rake db:encrypt RAILS_ENV=production'
+ database_cipher_key:
+
+ # Set this to false to disable plugins' assets mirroring on startup.
+ # You can use `rake redmine:plugins:assets` to manually mirror assets
+ # to public/plugin_assets when you install/upgrade a Redmine plugin.
+ #
+ #mirror_plugins_assets_on_startup: false
+
+ # Your secret key for verifying cookie session data integrity. If you
+ # change this key, all old sessions will become invalid! Make sure the
+ # secret is at least 30 characters and all random, no regular words or
+ # you'll be exposed to dictionary attacks.
+ #
+ # If you have a load-balancing Redmine cluster, you have to use the
+ # same secret token on each machine.
+ #secret_token: 'change it to a long random string'
+
+ # Absolute path (e.g. /usr/bin/convert, c:/im/convert.exe) to
+ # the ImageMagick's `convert` binary. Used to generate attachment thumbnails.
+ imagemagick_convert_command: '/home/pdl/redmine-2.3.2-0/common/bin/convert'
+
+ # Configuration of RMagcik font.
+ #
+ # Redmine uses RMagcik in order to export gantt png.
+ # You don't need this setting if you don't install RMagcik.
+ #
+ # In CJK (Chinese, Japanese and Korean),
+ # in order to show CJK characters correctly,
+ # you need to set this configuration.
+ #
+ # Because there is no standard font across platforms in CJK,
+ # you need to set a font installed in your server.
+ #
+ # This setting is not necessary in non CJK.
+ #
+ # Examples for Japanese:
+ # Windows:
+ # rmagick_font_path: C:\windows\fonts\msgothic.ttc
+ # Linux:
+ # rmagick_font_path: /usr/share/fonts/ipa-mincho/ipam.ttf
+ #
+ rmagick_font_path:
+
+ # Maximum number of simultaneous AJAX uploads
+ #max_concurrent_ajax_uploads: 2
+ #pic_types: "bmp,jpeg,jpg,png,gif"
+
+ repository_root_path: '/tmp/htdocs'
+ judge_server: 'http://judge.trustie.net/'
+
+ # Gitlab url
+ gitlab_address: 'https://git.trustie.net'
+ # Sonar url
+ sonar_address: 'http://sonar.trustie.net'
+ #Jenkins url
+ jenkins_address: 'http://jenins.trustie.net'
+ jenkins_username: 'temp'
+ jenkins_password: '123123'
+
+# specific configuration options for production environment
+# that overrides the default ones
+production:
+ # CJK support
+ rmagick_font_path: /usr/share/fonts/ipa-mincho/ipam.ttf
+ judge_server: 'http://192.168.80.21:8080/'
+ repository_root_path: '/home/pdl/redmine-2.3.2-0/apache2/htdocs'
+ cookie_domain: ".trustie.net"
+ email_delivery:
+ delivery_method: :smtp
+ smtp_settings:
+ address: mail.trustie.net
+ port: 25
+ domain: mail.trustie.net
+ authentication: :login
+ user_name: "mail@trustie.net"
+ password: "loong2010"
+
+# specific configuration options for development environment
+# that overrides the default ones
+development:
+ email_delivery:
+ delivery_method: :smtp
+ smtp_settings:
+ address: mail.trustie.net
+ port: 25
+ domain: mail.trustie.net
+ authentication: :login
+ user_name: "mail@trustie.net"
+ password: "loong2010"
diff --git a/db/migrate/20160810080942_add_commit_time_to_student_work.rb b/db/migrate/20160810080942_add_commit_time_to_student_work.rb
new file mode 100644
index 000000000..2301d7db8
--- /dev/null
+++ b/db/migrate/20160810080942_add_commit_time_to_student_work.rb
@@ -0,0 +1,16 @@
+class AddCommitTimeToStudentWork < ActiveRecord::Migration
+ def change
+ add_column :student_works, :commit_time, :datetime
+
+ count = StudentWork.all.count / 30 + 2
+ transaction do
+ for i in 1 ... count do i
+ StudentWork.page(i).per(30).each do |work|
+ if work.work_status != 0
+ work.update_column("commit_time", work.created_at)
+ end
+ end
+ end
+ end
+ end
+end
diff --git a/lib/gitlab-cli/lib/gitlab/client/merge_requests.rb b/lib/gitlab-cli/lib/gitlab/client/merge_requests.rb
index b6a9ed051..0ac95b391 100644
--- a/lib/gitlab-cli/lib/gitlab/client/merge_requests.rb
+++ b/lib/gitlab-cli/lib/gitlab/client/merge_requests.rb
@@ -64,8 +64,8 @@ class Gitlab::Client
# @option options [Integer] :assignee_id The ID of a user to assign merge request.
# @option options [String] :state_event New state (close|reopen|merge).
# @return [Gitlab::ObjectifiedHash] Information about updated merge request.
- def update_merge_request(project, id, options={})
- put("/projects/#{project}/merge_request/#{id}", :body => options)
+ def update_merge_request(project, id, gid, options={})
+ put("/projects/#{project}/merge_request/#{id}?user_id=#{gid}", :body => options)
end
# Adds a comment to a merge request.
diff --git a/public/javascripts/application.js b/public/javascripts/application.js
index 632e4ab49..504fea3cb 100644
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -1552,7 +1552,10 @@ function pop_box_new(value, Width, Height){
document.onmousemove = null;
}
- new Drag("popupWrap");
+ $(".sy_popup_con").mousedown(function(event){
+ event.stopPropagation();
+ new Drag("popupWrap");
+ });
}
// 公共提示弹框样式