Permalink
Browse files

Up to 1.2.0

  • Loading branch information...
1 parent 96aac5e commit e1b88b870f0867a89b834b22246378d1043b7037 @dzaporozhets dzaporozhets committed Jan 6, 2013
View
@@ -1,3 +1,6 @@
+v1.2.0
+ - Added Github web hook support
+ - Added build schedule
v1.1.0
- Added JSON response for builds status
- Compatible with GitLab v4.0.0
View
@@ -1 +1 @@
-1.1.0
+1.2.0
@@ -202,3 +202,8 @@ fieldset {
.lead {
font-size: 18px;
}
+
+h3 {
+ font-weight: normal;
+ color: #666;
+}
View
@@ -13,7 +13,7 @@ class Project < ActiveRecord::Base
validates_uniqueness_of :name
validates :polling_interval,
- format: { with: /^[1-9]\d{0,7}[s|m|d]$/ },
+ format: { with: /^[1-9]\d{0,7}[m|h|d]$/ },
if: ->(project) { project.polling_interval.present? }
before_validation :set_default_values
@@ -123,7 +123,7 @@ def valid_token? token
end
def set_scheduler
- if self.polling_interval.present?
+ if self.always_build && self.polling_interval.present?
Resque.set_schedule(self.schedule_id, {
:class => 'SchedulerJob',
every: self.polling_interval,
@@ -55,8 +55,12 @@
%br
.field
= f.label :polling_interval, "Build interval"
- = f.text_field :polling_interval, placeholder: '30m'
- %small Ex. 30m means every 30 minutes and 2d - every two days
+ = f.text_field :polling_interval, placeholder: '5h'
+ %ul
+ %li m - minutes
+ %li h - hours
+ %li d - days
+ %p Ex. 30m means every 30 minutes and 2d - every two days
.form-actions
= f.submit 'Save', class: 'btn btn-primary'
= link_to 'Cancel', projects_path, class: 'btn'
@@ -10,16 +10,15 @@
Edit
-
-%br
-%p.lead Copy provided setting to your GitLab instance for close integration
+%p.lead Integration with GitLab and other services
%form.form-horizontal
%fieldset
%legend
GitLab 3.1+
+ %small build on push, integration with Merge Requests, links to GitLab instance
.right
- Copy to GitLab &rarr; Project &rarr; Services
+ %small Copy to GitLab &rarr; Project &rarr; Services
.control-group
= label_tag :url, 'Project URL', class: 'control-label'
@@ -34,11 +33,24 @@
%fieldset
%legend
GitLab 3.0 and earlier
+ %small build on push, links to GitLab commits
.right
- Copy to GitLab &rarr; Project &rarr; Web Hooks
+ %small Copy to GitLab &rarr; Project &rarr; Web Hooks
.control-group
= label_tag :hook_url, 'HTTP POST Hook url', class: 'control-label'
.controls
= text_field_tag :url, build_project_url(@project, token: @project.token), class: 'input-xxlarge', readonly: true
%p.hint Copy this link and add to GitLab web hooks
+ %fieldset
+ %legend
+ github
+ %small build on push
+ .right
+ %small Copy to github &rarr; Project &rarr; Service Hooks &rarr; Web Hooks
+ .control-group
+ = label_tag :hook_url, 'HTTP POST Hook url', class: 'control-label'
+ .controls
+ = text_field_tag :url, build_project_url(@project, token: @project.token), class: 'input-xxlarge', readonly: true
+ %p.hint Copy this link and add to github web hooks
+
@@ -1,5 +1,4 @@
%h3 Projects
-%br
- @projects.each do |project|
.project_box
.title
@@ -5,7 +5,7 @@
.right
= link_to details_project_path(@project), class: 'btn btn-small' do
Details
-
+ &nbsp;
= link_to edit_project_path(@project), class: 'btn btn-small' do
%i.icon-edit.icon-white
Edit
View
@@ -0,0 +1,3 @@
+mkdir -p tmp/pids
+nohup bundle exec rake environment resque:work QUEUE=runner,scheduler_task RAILS_ENV=production PIDFILE=tmp/pids/resque_worker.pid > ./log/resque.log &
+nohup bundle exec rake environment resque:scheduler RAILS_ENV=production PIDFILE=tmp/pids/resque_schedule.pid > ./log/schedule.log &

0 comments on commit e1b88b8

Please sign in to comment.