Commit graph

3484 commits

Author SHA1 Message Date
snpd
997dc668e0 Supports talks without speakers
Admins may want to have discussions or any other general activity
that does not have any particular speaker. Thus, speaker validation
is removed.

Closes https://github.com/openSUSE/osem/issues/2520
2019-10-23 14:50:28 +05:30
Ana María Martínez Gómez
fef08bf951
Merge pull request #2580 from openSUSE/depfu/update/nokogiri-1.10.4
🚨 [security] Update nokogiri: 1.10.3 → 1.10.4 (patch)
2019-08-26 11:46:23 -04:00
depfu[bot]
e2b0c9a110 Update nokogiri to version 1.10.4 2019-08-12 07:58:20 +00:00
Ana María Martínez Gómez
86440cb956
Merge pull request #2578 from rahul2240/master-alias
add booth in alias
2019-08-10 18:41:34 +02:00
Ana María Martínez Gómez
5291fc9826
Merge pull request #2579 from openSUSE/depfu/update/mini_magick-4.9.5
Update mini_magick: 4.9.4 → 4.9.5 (patch)
2019-08-10 18:40:40 +02:00
depfu[bot]
2df66ba41f Update mini_magick to version 4.9.5 2019-08-10 16:17:16 +00:00
Rahul
bf7a7932ba add booth in alias
Booth can be replaced with any alias by replacing it in alias.en.yml.
2019-08-10 21:40:25 +05:30
Stella Rouzi
31ade45529
Merge pull request #2562 from rahul2240/update-button
Add render in update method
2019-07-21 18:29:31 +03:00
Stella Rouzi
dfc6776c85
Merge pull request #2561 from rahul2240/active
Update condition to pluck users for booth responsibles
2019-07-21 18:23:01 +03:00
Rahul
49c59f1d7a add render in update method
render edit is added so that error and flash message could trigger after the form is submitted.
2019-07-21 20:43:26 +05:30
Rahul
341128c573 update condition to pluck users for booth responsibles
Earlier we used active scope to pluck users for booth responsibles, that allows all users except those whose last seen are 3 months or more and are their is_disabled field is false but now we allow all users except those with is_disabled field false to be booth responsible.
2019-07-21 20:23:04 +05:30
Stella Rouzi
12f10c7dcd
Merge pull request #2558 from rishabhptr/schema
Update schema.rb formatting
2019-07-21 12:58:18 +03:00
Ana María Martínez Gómez
192ce0ef72
Merge pull request #2554 from openSUSE/depfu/update/jquery-rails-4.3.5
Update jquery-rails: 4.3.3 → 4.3.5 (patch)
2019-07-21 11:47:46 +02:00
Rishabh Singh
85e3184361 Update schema.rb formatting 2019-07-21 15:11:53 +05:30
depfu[bot]
7dfba8ace0 Update jquery-rails to version 4.3.5 2019-07-17 14:21:06 +00:00
Henne Vogelsang
c5ad9525ed
Merge pull request #2551 from esparta/using_polimorfic_for_not_signed_abilities
Improve overall performance on not_signed abilities
2019-07-17 16:20:02 +02:00
Henne Vogelsang
920a5e84a7
Merge pull request #2553 from openSUSE/depfu/update/mini_magick-4.9.4
🚨 [security] Update mini_magick: 4.9.3 → 4.9.4 (patch)
2019-07-17 16:17:20 +02:00
Henne Vogelsang
8eb059276f
Merge pull request #2486 from openSUSE/depfu/update/group/rails-5.2.3
🚨 [security] Upgrade all of rails: 5.0.7.2 → 5.2.3 (minor)
2019-07-17 16:07:53 +02:00
depfu[bot]
20f627798a Update mini_magick to version 4.9.4 2019-07-17 10:14:29 +00:00
Espartaco Palma
6421916784
Avoid the use of :pluck on not_signed abilities
When using :pluck, ActiveRecord trigger the query immediately.
The above is a behavior we probably want to avoid, because
implies a query to the database regarless of the role or
permission.

** Before

    osem_1      | 07:39:11 web.1    | Started GET "/" for 172.20.0.1 at 2019-07-1207:39:11 +0000
    osem_1      | 07:39:11 web.1    |    (0.3ms)  SELECT
    "conferences"."custom_domain" FROM "conferences" WHERE
     ("conferences"."custom_domain" IS NOT NULL) ORDER BY start_date DESC
    osem_1      | 07:39:11 web.1    | Processing by ConferencesController#index as HTML
    osem_1      | 07:39:11 web.1    |    (1.3ms)  SELECT "events"."id" FROM
    "events" WHERE "events"."state" = $ 1  [["state", "confirmed"]]
    osem_1      | 07:39:11 web.1    |   ↳ app/models/ability.rb:39:in `not_signed_in'
    osem_1      | 07:39:11 web.1    |   Rendering layouts/application.html.haml
    osem_1      | 07:39:11 web.1    |   Rendering conferences/index.html.haml within layouts/application

** After

    osem_1      | 07:43:18 web.1    | Started GET "/" for 172.20.0.1 at 2019-07-1207:43:18 +0000
    osem_1      | 07:43:19 web.1    |    (0.2ms)  SELECT
    "conferences"."custom_domain" FROM "conferences" WHERE
     ("conferences"."custom_domain" IS NOT NULL) ORDER BY start_date DESC
    osem_1      | 07:43:19 web.1    | Processing by ConferencesController#index as HTML
    osem_1      | 07:43:19 web.1    |   Rendering layouts/application.html.haml
    osem_1      | 07:43:19 web.1    |   Rendering conferences/index.html.haml  within layouts/application
2019-07-16 22:24:20 -07:00
Ana María Martínez Gómez
eeec3df7aa
Merge pull request #2437 from Ana06/capybara_animation
Disable capybara animation
2019-07-17 00:27:55 +02:00
Ana María Martínez Gómez
9e1b214c60
Disable capybara animation
Turn off jquery animation to avoid tests with animations to fail and make
tests easy to debug.

Co-authored-by: Stephan Kulow <coolo@suse.de>
2019-07-17 00:16:41 +02:00
Ana María Martínez Gómez
014ff1acc3
Use new changed? Rails method
`attribute_changed?` inside of after callbacks has changed his
behaviour. The new return value will reflect the behavior of calling the
method after `save` returned. To maintain the current behavior, I have
`saved_change_to_attribute?` instead.
2019-07-17 00:13:24 +02:00
Ana María Martínez Gómez
085e33f495
Use url instead object in image_tag
Before Rails 5.2, it was possible to pass an uploader object to
`image_tag` and Rails guessed the url. With Rails 5.2 this is not
possible anymore.
2019-07-17 00:13:24 +02:00
Ana María Martínez Gómez
af1d5e4a3b
Do no use string in if conditional
Passing string to be evaluated in :if and :unless conditional options is
not supported. Pass a symbol for an instance method, or a lambda, proc
or block, instead.
2019-07-17 00:13:24 +02:00
depfu[bot]
254d8cb9fd
Update all of rails to version 5.2.3 2019-07-17 00:13:21 +02:00
Henne Vogelsang
e3726c776e
Merge pull request #2548 from Ana06/selenium
Update selenium-webdriver
2019-07-17 00:06:43 +02:00
Henne Vogelsang
c28cb5eac4
Install chromium in base image
Replace google-chrome with it, it has problems with webdrivers
(DevToolsActivePort file doesn't exist) and we like to use open source
anyway...

We also do not need phantomjs anymore since a long time.
2019-07-16 23:59:23 +02:00
Henne Vogelsang
04616a9b24
Switch to webdrivers, chromedriver-helper is no more
While we're at it let's also update capybara.

Co-authored-by: Ana María Martínez Gómez <anamaria@martinezgomez.name>
2019-07-16 23:59:17 +02:00
Henne Vogelsang
e18174a3b3
Update CI to ubuntu xenial and chromium
trusty is rather old, living on the edge baby! Also switch to chromium for
testing, the latest google-chrome version has problems to start with webdrivers
(DevToolsActivePort file doesn't exist).
2019-07-16 23:49:05 +02:00
Ana María Martínez Gómez
9b12830c8f
Merge pull request #2529 from openSUSE/depfu/update/stripe-ruby-mock-2.5.7
Update stripe-ruby-mock: 2.5.6 → 2.5.7 (patch)
2019-06-12 18:10:33 +02:00
Ana María Martínez Gómez
224f0eb76f
Merge pull request #2532 from openSUSE/depfu/update/stripe-4.18.1
Update stripe: 4.11.0 → 4.18.1 (minor)
2019-06-12 17:40:18 +02:00
Ana María Martínez Gómez
56be0953be
Merge pull request #2533 from openSUSE/depfu/update/autoprefixer-rails-9.6.0
Update autoprefixer-rails: 9.5.1 → 9.6.0 (minor)
2019-06-12 17:40:03 +02:00
depfu[bot]
1b8211e61d Update autoprefixer-rails to version 9.6.0 2019-06-06 19:20:58 +00:00
depfu[bot]
461df8891a Update stripe to version 4.18.1 2019-06-06 19:16:30 +00:00
Ana María Martínez Gómez
614068874d
Merge pull request #2530 from openSUSE/depfu/update/chartkick-3.2.0
🚨 [security] Update chartkick: 3.0.2 → 3.2.0 (minor)
2019-06-06 06:13:57 +02:00
depfu[bot]
a955d6a525 Update chartkick to version 3.2.0 2019-06-05 02:07:06 +00:00
depfu[bot]
0d9f0a93fc Update stripe-ruby-mock to version 2.5.7 2019-06-04 15:16:08 +00:00
Ana María Martínez Gómez
02d3a8ec0b
Merge pull request #2526 from openSUSE/depfu/update/airbrake-9.2.2
Update airbrake: 9.2.1 → 9.2.2 (patch)
2019-06-04 17:13:00 +02:00
Ana María Martínez Gómez
f7d7bfb2e2
Merge pull request #2476 from differentreality/url_helpers_in_switch_checkbox
Use helpers instead of URLs in switch checkboxes
2019-06-04 17:12:32 +02:00
depfu[bot]
0834923c78 Update airbrake to version 9.2.2 2019-06-03 07:26:02 +00:00
Ana María Martínez Gómez
47ce659a2f
Merge pull request #2374 from openSUSE/depfu/update/shoulda-matchers-4.0.1
Update shoulda-matchers: 3.1.2 → 4.0.1 (major)
2019-06-03 09:23:52 +02:00
Ana María Martínez Gómez
9303375f7e
Merge pull request #2525 from Ana06/fix_event_registrations
Fix event registatrion for rooms without size
2019-06-01 11:09:42 +02:00
Stella Rouzi
b590bc4145
Use helpers instead of URLs in switch checkboxes
Absolute URLs may be potentially breaking functionality, eg in case of
sub-directory installation.

Fixes https://github.com/openSUSE/osem/issues/2472

Co-authored-by: Ana María Martínez Gómez <anamaria@martinezgomez.name>
2019-05-31 00:24:21 +02:00
Ana María Martínez Gómez
f64cd7323f
Do not use readonly checkboxes to render information
Just render `Yes` or `No` instead of a disabled checkbox with these two
options in the recent users section of conference#index.
2019-05-31 00:24:14 +02:00
Ana María Martínez Gómez
51c8af42ab
Fix event registatrion for rooms without size
If the room size is not set (which is possible as the size is not
mandatory), the events registrations page breaks because of a
comparison of nil with Integer.
2019-05-31 00:12:15 +02:00
Henne Vogelsang
dcd10f170f
Merge pull request #2523 from hennevogel/bugfix/gigitty_link
Bugfix/gigitty link
2019-05-24 15:32:43 +02:00
Henne Vogelsang
e6049adc52
Fix gigitty link
The modal didn't really work on mobiles. On mobiles you also need the schedule
link because it's hard to point your mobile to a QR code on your mobile...
2019-05-24 15:19:37 +02:00
Henne Vogelsang
9df85e5ae4
Delete tmp file 2019-05-24 14:34:07 +02:00
Henne Vogelsang
4e79ba3e81
Merge pull request #2522 from hennevogel/bugfix/csrf_commercials
Bugfix/csrf commercials
2019-05-24 14:31:30 +02:00