gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #1050 from hennevogel/one

Browse source 
More cherry picked commits for 1.1
This commit is contained in:
Henne Vogelsang 2016-06-30 12:44:22 +02:00 • committed by GitHub
commit 7b64dca766
3 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/models/program.rb
View file

@ -27,7 +27,7 @@ class Program < ActiveRecord::Base
end end
def scheduled def scheduled
where.not(start_time: nil) where.not(start_time: nil).where.not(room: nil)
end end
def highlights def highlights

2
config/deploy.rb
View file

@ -7,7 +7,7 @@ set :port, 2214
set :user, 'osem' set :user, 'osem'
set :deploy_to, '/srv/www/vhosts/opensuse.org/events' set :deploy_to, '/srv/www/vhosts/opensuse.org/events'
set :repository, 'https://github.com/openSUSE/osem.git' set :repository, 'https://github.com/openSUSE/osem.git'
set :revision, 'one' set :branch, 'one'
# Manually create these paths in shared/ (eg: shared/config/database.yml) in your server. # Manually create these paths in shared/ (eg: shared/config/database.yml) in your server.
# They will be linked in the 'deploy:link_shared_paths' step. # They will be linked in the 'deploy:link_shared_paths' step.

4
spec/controllers/conference_controller_spec.rb
View file

@ -1,7 +1,9 @@
require 'spec_helper' require 'spec_helper'
describe ConferenceController do describe ConferenceController do
let(:conference) { create(:full_conference, splashpage: create(:splashpage, public: true)) } let(:conference) { create(:conference, splashpage: create(:splashpage, public: true), venue: create(:venue)) }
let!(:cfp) { create(:cfp, program: conference.program) }
let(:room) { create(:room, venue: conference.venue) }
describe 'GET #index' do describe 'GET #index' do
it 'Response code is 200' do it 'Response code is 200' do