Commit c6ed4fca authored by Taico Aerts's avatar Taico Aerts
Browse files

Merge branch 'development'

parents 1b509381 e4964d7a
......@@ -12,7 +12,7 @@ gem 'rails', '~> 6.1.0'
# Web server: passenger for production, puma for development (windows)
gem 'passenger', '>= 6.0', require: 'phusion_passenger/rack_handler'
gem 'puma', group: %i[development test]
gem 'puma', '~> 5.0', group: %i[development test]
# Stylesheets: SCSS
gem 'sass-rails'
......
......@@ -9,7 +9,7 @@ GIT
GIT
remote: https://github.com/elastic/elasticsearch-rails
revision: b66fe71cc4b9b10069bf6d39dbbfcc0b117a08a5
revision: dc0efc4d020f41712c190b94b755e600319b0450
branch: main
specs:
elasticsearch-model (7.2.1)
......@@ -20,9 +20,9 @@ GIT
GIT
remote: https://github.com/zdennis/activerecord-import.git
revision: 20c1d3aacdd8454e199c0016c125ddfd4f472d2b
revision: ef08aca875b956c74f0432e78b0fa1559e189eb9
specs:
activerecord-import (1.4.0)
activerecord-import (1.4.1)
activerecord (>= 4.2)
GIT
......@@ -45,42 +45,42 @@ PATH
GEM
remote: https://rubygems.org/
specs:
aasm (5.3.0)
aasm (5.4.0)
concurrent-ruby (~> 1.0)
actioncable (6.1.6.1)
actionpack (= 6.1.6.1)
activesupport (= 6.1.6.1)
actioncable (6.1.7)
actionpack (= 6.1.7)
activesupport (= 6.1.7)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
actionmailbox (6.1.6.1)
actionpack (= 6.1.6.1)
activejob (= 6.1.6.1)
activerecord (= 6.1.6.1)
activestorage (= 6.1.6.1)
activesupport (= 6.1.6.1)
actionmailbox (6.1.7)
actionpack (= 6.1.7)
activejob (= 6.1.7)
activerecord (= 6.1.7)
activestorage (= 6.1.7)
activesupport (= 6.1.7)
mail (>= 2.7.1)
actionmailer (6.1.6.1)
actionpack (= 6.1.6.1)
actionview (= 6.1.6.1)
activejob (= 6.1.6.1)
activesupport (= 6.1.6.1)
actionmailer (6.1.7)
actionpack (= 6.1.7)
actionview (= 6.1.7)
activejob (= 6.1.7)
activesupport (= 6.1.7)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
actionpack (6.1.6.1)
actionview (= 6.1.6.1)
activesupport (= 6.1.6.1)
actionpack (6.1.7)
actionview (= 6.1.7)
activesupport (= 6.1.7)
rack (~> 2.0, >= 2.0.9)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.2.0)
actiontext (6.1.6.1)
actionpack (= 6.1.6.1)
activerecord (= 6.1.6.1)
activestorage (= 6.1.6.1)
activesupport (= 6.1.6.1)
actiontext (6.1.7)
actionpack (= 6.1.7)
activerecord (= 6.1.7)
activestorage (= 6.1.7)
activesupport (= 6.1.7)
nokogiri (>= 1.8.5)
actionview (6.1.6.1)
activesupport (= 6.1.6.1)
actionview (6.1.7)
activesupport (= 6.1.7)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
......@@ -91,29 +91,29 @@ GEM
ruby2_keywords
active_record_union (1.3.0)
activerecord (>= 4.0)
activejob (6.1.6.1)
activesupport (= 6.1.6.1)
activejob (6.1.7)
activesupport (= 6.1.7)
globalid (>= 0.3.6)
activemodel (6.1.6.1)
activesupport (= 6.1.6.1)
activerecord (6.1.6.1)
activemodel (= 6.1.6.1)
activesupport (= 6.1.6.1)
activestorage (6.1.6.1)
actionpack (= 6.1.6.1)
activejob (= 6.1.6.1)
activerecord (= 6.1.6.1)
activesupport (= 6.1.6.1)
activemodel (6.1.7)
activesupport (= 6.1.7)
activerecord (6.1.7)
activemodel (= 6.1.7)
activesupport (= 6.1.7)
activestorage (6.1.7)
actionpack (= 6.1.7)
activejob (= 6.1.7)
activerecord (= 6.1.7)
activesupport (= 6.1.7)
marcel (~> 1.0)
mini_mime (>= 1.1.0)
activesupport (6.1.6.1)
activesupport (6.1.7)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
tzinfo (~> 2.0)
zeitwerk (~> 2.3)
addressable (2.8.0)
public_suffix (>= 2.0.2, < 5.0)
addressable (2.8.1)
public_suffix (>= 2.0.2, < 6.0)
airbrussh (1.4.1)
sshkit (>= 1.6.1, != 1.7.0)
ansi (1.5.0)
......@@ -131,7 +131,7 @@ GEM
bootstrap_form (4.5.0)
actionpack (>= 5.2)
activemodel (>= 5.2)
brakeman (5.2.3)
brakeman (5.3.1)
breadcrumbs_on_rails (4.1.0)
railties (>= 5.0)
builder (3.2.4)
......@@ -140,7 +140,7 @@ GEM
thor (~> 1.0)
byebug (11.1.3)
cancancan (3.4.0)
capistrano (3.17.0)
capistrano (3.17.1)
airbrussh (>= 1.0.0)
i18n
rake (>= 10.0.0)
......@@ -183,7 +183,7 @@ GEM
execjs
coffee-script-source (1.12.2)
concurrent-ruby (1.1.10)
connection_pool (2.2.5)
connection_pool (2.3.0)
crass (1.0.6)
devise (4.8.1)
bcrypt (~> 3.0)
......@@ -204,11 +204,11 @@ GEM
elasticsearch-transport (7.17.1)
faraday (~> 1)
multi_json
erubi (1.10.0)
erubi (1.11.0)
execjs (2.8.1)
faker (2.22.0)
faker (2.23.0)
i18n (>= 1.8.11, < 2)
faraday (1.10.0)
faraday (1.10.2)
faraday-em_http (~> 1.0)
faraday-em_synchrony (~> 1.0)
faraday-excon (~> 1.1)
......@@ -232,9 +232,8 @@ GEM
faraday-rack (1.0.0)
faraday-retry (1.0.3)
ffi (1.15.5)
font-awesome-sass (6.1.2)
font-awesome-sass (6.2.0)
sassc (~> 2.0)
generator (0.0.1)
globalid (1.0.0)
activesupport (>= 5.0)
hashie (5.0.0)
......@@ -271,7 +270,7 @@ GEM
activerecord
kaminari-core (= 1.2.2)
kaminari-core (1.2.2)
kt-paperclip (6.4.1)
kt-paperclip (6.4.2)
activemodel (>= 4.2.0)
activesupport (>= 4.2.0)
mime-types
......@@ -279,7 +278,6 @@ GEM
terrapin (~> 0.6.0)
launchy (2.5.0)
addressable (~> 2.7)
lazy_priority_queue (0.1.1)
letter_opener (1.8.1)
launchy (>= 2.2, < 3)
letter_opener_web (2.0.0)
......@@ -292,7 +290,7 @@ GEM
listen (3.7.1)
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
loofah (2.18.0)
loofah (2.19.0)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
mail (2.7.1)
......@@ -308,62 +306,63 @@ GEM
rake
mini_magick (4.11.0)
mini_mime (1.1.2)
minitest (5.16.2)
minitest (5.16.3)
minitest-reporters (1.5.0)
ansi
builder
minitest (>= 5.0)
ruby-progressbar
mocha (1.14.0)
mocha (1.16.0)
multi_json (1.15.0)
multipart-post (2.2.3)
mysql2 (0.5.4)
net-ldap (0.17.1)
net-scp (3.0.0)
net-ssh (>= 2.6.5, < 7.0.0)
net-ssh (6.1.0)
net-scp (4.0.0)
net-ssh (>= 2.6.5, < 8.0.0)
net-ssh (7.0.1)
nio4r (2.5.8)
nokogiri (1.13.8-x86_64-linux)
nokogiri (1.13.9-x86_64-linux)
racc (~> 1.4)
orm_adapter (0.5.0)
pairing_heap (1.0.0)
paper_trail (12.3.0)
activerecord (>= 5.2)
request_store (~> 1.1)
parallel (1.22.1)
parser (3.1.2.0)
parser (3.1.2.1)
ast (~> 2.4.1)
passenger (6.0.14)
passenger (6.0.15)
rack
rake (>= 0.8.1)
pry (0.14.1)
coderay (~> 1.1)
method_source (~> 1.0)
public_suffix (4.0.7)
puma (5.6.4)
public_suffix (5.0.0)
puma (5.6.5)
nio4r (~> 2.0)
racc (1.6.0)
rack (2.2.4)
rack-test (2.0.2)
rack (>= 1.3)
rails (6.1.6.1)
actioncable (= 6.1.6.1)
actionmailbox (= 6.1.6.1)
actionmailer (= 6.1.6.1)
actionpack (= 6.1.6.1)
actiontext (= 6.1.6.1)
actionview (= 6.1.6.1)
activejob (= 6.1.6.1)
activemodel (= 6.1.6.1)
activerecord (= 6.1.6.1)
activestorage (= 6.1.6.1)
activesupport (= 6.1.6.1)
rails (6.1.7)
actioncable (= 6.1.7)
actionmailbox (= 6.1.7)
actionmailer (= 6.1.7)
actionpack (= 6.1.7)
actiontext (= 6.1.7)
actionview (= 6.1.7)
activejob (= 6.1.7)
activemodel (= 6.1.7)
activerecord (= 6.1.7)
activestorage (= 6.1.7)
activesupport (= 6.1.7)
bundler (>= 1.15.0)
railties (= 6.1.6.1)
railties (= 6.1.7)
sprockets-rails (>= 2.0.0)
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
rails-erd (1.7.1)
rails-erd (1.7.2)
activerecord (>= 4.2)
activesupport (>= 4.2)
choice (~> 0.2.0)
......@@ -372,46 +371,46 @@ GEM
loofah (~> 2.3)
rails-jquery-autocomplete (1.0.5)
rails (>= 3.2)
railties (6.1.6.1)
actionpack (= 6.1.6.1)
activesupport (= 6.1.6.1)
railties (6.1.7)
actionpack (= 6.1.7)
activesupport (= 6.1.7)
method_source
rake (>= 12.2)
thor (~> 1.0)
rainbow (3.1.1)
rake (13.0.6)
rb-fsevent (0.11.1)
rb-fsevent (0.11.2)
rb-inotify (0.10.1)
ffi (~> 1.0)
redcarpet (3.5.1)
regexp_parser (2.5.0)
regexp_parser (2.6.0)
request_store (1.5.1)
rack (>= 1.4)
responders (3.0.1)
actionpack (>= 5.0)
railties (>= 5.0)
rexml (3.2.5)
rgl (0.5.8)
lazy_priority_queue (~> 0.1.0)
rgl (0.5.9)
pairing_heap (>= 0.3.0)
rexml (~> 3.2, >= 3.2.4)
stream (~> 0.5.3)
rolify (6.0.0)
rubocop (1.32.0)
rubocop (1.37.0)
json (~> 2.3)
parallel (~> 1.10)
parser (>= 3.1.0.0)
parser (>= 3.1.2.1)
rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 1.8, < 3.0)
rexml (>= 3.2.5, < 4.0)
rubocop-ast (>= 1.19.1, < 2.0)
rubocop-ast (>= 1.22.0, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 1.4.0, < 3.0)
rubocop-ast (1.19.1)
rubocop-ast (1.22.0)
parser (>= 3.1.1.0)
rubocop-rails (2.15.2)
rubocop-rails (2.16.1)
activesupport (>= 4.2.0)
rack (>= 1.1)
rubocop (>= 1.7.0, < 2.0)
rubocop (>= 1.33.0, < 2.0)
ruby-graphviz (1.2.5)
rexml
ruby-progressbar (1.11.0)
......@@ -437,10 +436,10 @@ GEM
selenium-webdriver (3.142.7)
childprocess (>= 0.5, < 4.0)
rubyzip (>= 1.2.2)
sentry-rails (5.4.1)
sentry-rails (5.5.0)
railties (>= 5.0)
sentry-ruby (~> 5.4.1)
sentry-ruby (5.4.1)
sentry-ruby (~> 5.5.0)
sentry-ruby (5.5.0)
concurrent-ruby (~> 1.0, >= 1.0.2)
simplecov (0.21.2)
docile (~> 1.1)
......@@ -462,12 +461,11 @@ GEM
actionpack (>= 5.2)
activesupport (>= 5.2)
sprockets (>= 3.0.0)
sqlite3 (1.4.4)
sshkit (1.21.2)
sqlite3 (1.5.3-x86_64-linux)
sshkit (1.21.3)
net-scp (>= 1.1.2)
net-ssh (>= 2.8.0)
stream (0.5.4)
generator
stream (0.5.5)
terrapin (0.6.0)
climate_control (>= 0.0.3, < 1.0)
terser (1.1.12)
......@@ -479,7 +477,7 @@ GEM
turbolinks-source (5.2.0)
tzinfo (2.0.5)
concurrent-ruby (~> 1.0)
unicode-display_width (2.2.0)
unicode-display_width (2.3.0)
warden (1.2.9)
rack (>= 2.0.9)
web-console (4.2.0)
......@@ -495,7 +493,7 @@ GEM
zebra-datepicker-rails (1.9.7)
railties (>= 3.0)
sass-rails
zeitwerk (2.6.0)
zeitwerk (2.6.1)
zip-zip (0.3)
rubyzip (>= 1.0.0)
......@@ -554,7 +552,7 @@ DEPENDENCIES
paper_trail (~> 12.1)
passenger (>= 6.0)
pry
puma
puma (~> 5.0)
rails (~> 6.1.0)
rails-erd
rails-jquery-autocomplete
......
......@@ -71,7 +71,7 @@ module Admin
end
def before_filtering(q_result)
return q_result.includes(:experiment_project) if current_user.admin?
return q_result.includes(:user1, :user2, :experiment_project) if current_user.admin?
profile_ids = []
if current_user.coordinator?
......@@ -81,7 +81,7 @@ module Admin
if current_user.teacher?
profile_ids += current_user.teaching_experiment_profiles.ids
end
q_result.where(id: profile_ids).includes(:experiment_project)
q_result.where(id: profile_ids).includes(:user1, :user2, :experiment_project)
end
def experiment_profile_params
......
......@@ -37,7 +37,7 @@ module CourseEditions
end
redirect_to course_edition_url(@course_edition)
else
flash[:danger] = 'Something went wrong during enrolment'
flash.now[:danger] = 'Something went wrong during enrolment'
render 'new'
end
end
......
......@@ -121,7 +121,7 @@ module CourseEditions
flash[:success] = 'Successfully updated the group settings.'
redirect_to_group_overview
else
flash[:danger] = 'An error occurred while changing the group settings.'
flash.now[:danger] = 'An error occurred while changing the group settings.'
render 'edit'
end
end
......
......@@ -36,7 +36,7 @@ class UsersController < ApplicationController
update_programmes
if failure
flash[:danger] = 'Failed to update settings. Please review the changes you made.'
flash.now[:danger] = 'Failed to update settings. Please review the changes you made.'
render 'edit'
else
flash[:success] = 'Successfully updated settings.'
......
......@@ -38,7 +38,7 @@ module ModalsHelper
class: 'btn btn-primary',
data: {
toggle: 'modal',
target: "\##{id}"
target: "##{id}"
}
}.deep_merge(options))
end
......@@ -49,11 +49,11 @@ module ModalsHelper
# @param id [String, Symbol] the id of the modal
# @param options [Hash] html options for the link
def modal_link(text, id, options = {})
link_to text, "\##{id}", {
link_to text, "##{id}", {
class: 'btn btn-primary',
data: {
toggle: 'modal',
target: "\##{id}"
target: "##{id}"
}
}.deep_merge(options)
end
......
......@@ -6,6 +6,9 @@
</div>
<div class="col-md-9 full-height">
<%= render 'table_search', relation: @experiment_profiles,
search_key: :user1_first_name_or_user1_last_name_or_user2_first_name_or_user2_last_name_cont %>
<%= render 'table_header',
relation: @experiment_profiles %>
......
......@@ -6,14 +6,14 @@ namespace :test do
doc = Nokogiri::XML('<testsuites></testsuites>')
# Merge all the reports
Dir.glob(Rails.root.join('test/reports/*.xml')) do |filename|
Rails.root.glob('test/reports/*.xml') do |filename|
# Skip the junit.xml file
next if filename.end_with?('junit.xml')
next if filename.to_s.end_with?('junit.xml')
xml = Nokogiri::XML(File.read(filename)).search('testsuite')
doc.at('testsuites').add_child(xml)
end
File.write(Rails.root.join('test/reports/junit.xml'), doc.to_xml)
Rails.root.join('test/reports/junit.xml').write(doc.to_xml)
end
end
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment