gunghogeoduck/osem-fcy
1
0
Fork 0
mirror of https://github.com/openSUSE/osem.git synced 2026-08-13 19:54:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
3442 commits 15 branches 2 tags 50 MiB
Commit graph

3442 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
Henne Vogelsang
7338bc2648
Skip CSRF authenticity 
The way we are handling adding commercials (preload with javascript)
leads to an outdated token otherwise.
 2019-05-24 14:08:23 +02:00
Henne Vogelsang
84b25e3a54
Remove protect_from_forgery 
This is handled in ApplicationController
 2019-05-24 14:07:39 +02:00
Henne Vogelsang
1648d7062a
Merge pull request #2518 from hennevogel/feature/scheudle_qr 
Point to Giggity from the schedule page
 2019-05-24 13:54:16 +02:00
Henne Vogelsang
4dc618810b
Point to Giggity from the schedule page 
Tell users that they can also view schedules in an android app.
 2019-05-24 11:37:03 +02:00
Stephan Kulow
617f1e9eb0
Merge pull request #2519 from Ana06/rails-update-broken 
Update devise_ichain_authenticatable to 0.3.2
 2019-05-23 16:12:14 +02:00
Ana María Martínez Gómez
174c081b80
Update devise_ichain_authenticatable to 0.3.2 
Otherwise instances using ichain authentication (such as
events.opensuse.org) break after the Rails 5.1 update.
 2019-05-23 15:26:57 +02:00
Ana María Martínez Gómez
a8ad134706
Merge pull request #2502 from Ana06/rails-5-1 
WIP Update to Rails 5.1
 2019-05-16 15:42:16 +02:00
Ana María Martínez Gómez
d1180e2767
Use keyword arguments in tests 
Raisl 5.1 removes support for non-keyword arguments in `#process`,
`#get`, `#post`, `#patch`, `#put`, `#delete`, and `#head` for the
`ActionDispatch::IntegrationTest` and `ActionController::TestCase`
classes. This means we have to add `params` everywhere in the controller
tests.
 2019-05-14 14:10:36 +02:00
Ana María Martínez Gómez
b8013661a2
Use render plain instead text 
`render text` is deprecated and it has been remvoed from Rails 5.1.
 2019-05-13 17:15:31 +02:00
Ana María Martínez Gómez
a444627a5e
Update to Rails 5.1 
We need to update to Rails 5.2 because of the security issue:

https://groups.google.com/forum/#!topic/rubyonrails-security/IsQKvDqZdKw

But this is not an easy update, so let's try to update in small steps.
 2019-05-13 17:09:42 +02:00
Ana María Martínez Gómez
0c5aedb2fb
Merge pull request #2499 from openSUSE/depfu/update/paper_trail-10.3.0 
Update paper_trail: 10.2.1 → 10.3.0 (minor)
 2019-05-10 20:27:04 +02:00
Ana María Martínez Gómez
d9fe0f83b0
Merge pull request #2500 from openSUSE/depfu/update/recaptcha-4.14.0 
Update recaptcha: 4.13.2 → 4.14.0 (minor)
 2019-05-10 20:26:44 +02:00
Ana María Martínez Gómez
5ed53bf98f
Merge pull request #2513 from openSUSE/depfu/update/airbrake-9.2.1 
Update airbrake: 9.0.0 → 9.2.1 (minor)
 2019-05-10 20:25:59 +02:00
Ana María Martínez Gómez
c587cf1998
Merge pull request #2515 from Ana06/pre-rails-5-1 
Some prerequisites to update to Rails 5.1
 2019-05-10 20:22:07 +02:00
Henne Vogelsang
9086d5f9bf
Merge pull request #2516 from hennevogel/bugfix/rubocop_tasks 
Only define rubocop tasks in the dev env
 2019-05-08 09:34:18 +02:00
Henne Vogelsang
3f07a8e68c
Only define rubocop tasks in the dev env 
This broke loading the rake tasks in the production environment as we only have
rubocop in development.
 2019-05-07 15:43:25 +02:00
Henne Vogelsang
0b6d18e3d3
Merge pull request #2508 from Ana06/changes 
Document roles:add rake task in update from 1.0
 2019-05-07 12:34:00 +02:00
Ana María Martínez Gómez
7473e889ee
Define ticket_purchases before through association 
In the User model, a has_many :through association
'User#physical_tickets' which goes through 'User#ticket_purchases' was
defined before the through association was defined. This doesn't work in
Rails 5.1.
 2019-05-05 09:40:50 +02:00
Ana María Martínez Gómez
41d6fad7a5
s/redirect_to :back/redirect_back/ 
`redirect_to` has been removed in Rails 5.1 in favor of:

```
redirect_back(fallback_location: root_path)
```
 2019-05-05 09:40:50 +02:00
Ana María Martínez Gómez
ca32024268
s/skip_before_filter/skip_before_action/ 
`skip_before_filter` was deprecated in Rails 4.2 and removed in Rails
5.1 in favor of `skip_before_action`.
 2019-05-05 09:40:49 +02:00
Ana María Martínez Gómez
32764d9498
Create roles when not found in test 
Otherwise the test fails at least some times.
 2019-05-05 09:40:49 +02:00
Ana María Martínez Gómez
a8d2f8caa4
Drop halt_callback_chains_on_return_false 
ActiveSupport.halt_callback_chains_on_return_false= is deprecated and
will be removed in Rails 5.2. Stop using it and return `throw(:abort)`
instead in the callbacks which need it.
 2019-05-05 09:40:49 +02:00
Ana María Martínez Gómez
b3716985f0
Stop using reload argument in associations 
Deprecated force reload argument in association readers is deprecated
and has been removed in Rails 5.1:

09cac8c67a
 2019-05-05 09:40:09 +02:00
Henne Vogelsang
55edd8a571
Change how we start puma 
Puma is integrated with rails server, no need to start it manually.
Takes care of logging etc. We also shouldn't run multiple workers
unless we absolutely want to.
 2019-05-04 21:36:34 +02:00
Ana María Martínez Gómez
e593fbd0d9
Merge pull request #2512 from Ana06/xml 
Fix incorrect format in xml dates
 2019-05-03 10:59:25 +02:00
depfu[bot]
c9f74b2ad7 Update airbrake to version 9.2.1 2019-05-02 17:42:08 +00:00
Ana María Martínez Gómez
0837b34369
Fix incorrect format in xml dates 
Dates where using (some years ago) iso8601 without taking the timezone
into account, as reported in:

https://github.com/openSUSE/osem/issues/1188

When trying to fix the issue, the date was converted to an incorrect
format which took timezone into account in:

73a6e06fd3

Come back to use iso8601 but taking the timezone into account.

Really fixes https://github.com/openSUSE/osem/issues/1188
Fixes https://github.com/openSUSE/osem/issues/2510
 2019-05-02 16:32:54 +02:00
Ana María Martínez Gómez
38d3aa8aa5
Merge pull request #2509 from Ana06/remove-swp 
Remove accidentaly commited files
 2019-04-30 14:43:26 +02:00
Ana María Martínez Gómez
0ad06c6fcb
Remove accidentaly commited files 
They were added by accident in
https://github.com/openSUSE/osem/pull/2505
 2019-04-30 13:55:49 +02:00
Ana María Martínez Gómez
ea8d42be13
Document roles:add rake task in update from 1.0 
It is needed to run `rake roles:add` due to the addition of organization
admins when updating from 1.0. This needs to be documented as it makes
the application crashing.

Fixes https://github.com/openSUSE/osem/issues/2496
 2019-04-30 13:20:09 +02:00
Stella Rouzi
9bdd889e32
Merge pull request #2471 from rahul2240/export 
Fix broken export
 2019-04-29 21:35:55 +03:00
Stella Rouzi
0c52f78b32
Merge pull request #2444 from snpd25/branch1 
fixed error submission of survey form
 2019-04-29 19:29:46 +03:00
Henne Vogelsang
924affb3a5
Merge pull request #2410 from snpd25/master 
Added select-all checkbox in splashpages form
 2019-04-29 18:04:36 +02:00
Henne Vogelsang
6c61b0dea5
Merge pull request #2479 from Ana06/travis 
Run Travis for all branches
 2019-04-29 18:02:56 +02:00
Henne Vogelsang
1ca7160532
Merge pull request #2505 from Ana06/rubocop 
Rubocop improvements
 2019-04-29 18:01:30 +02:00
Henne Vogelsang
d4a9b6a674
Merge pull request #2503 from Ana06/schedule-xml 
Fix xml views
 2019-04-29 18:00:31 +02:00
Ana María Martínez Gómez
33e11e3efa
Regenerate the todo file 
It is a good idea to do this once in a while, so that files that used to
have offenses but don't have them anymore are not excluded and to
decrease the maximums in the metric cops.
 2019-04-29 16:36:15 +02:00
Ana María Martínez Gómez
e31d848e75
Add rake tasks for Rubocop 
To always run rubocop with the same options (specially important when
regenerating the todo file).

It creates the following three tasks:

rake rubocop                     # Run RuboCop on the whole project
rake rubocop:auto_correct        # Auto-correct RuboCop offenses
rake rubocop:auto_gen_config     # Generate .rubocop_todo.yml
 2019-04-29 16:34:49 +02:00
Ana María Martínez Gómez
79b88857b6
Fix xml views 
Adding the html extension to application.haml avoid that the code is
used in the xml views.

Fixes https://github.com/openSUSE/osem/issues/2497
 2019-04-29 15:52:24 +02:00
Ana María Martínez Gómez
ca52d04289
Run Travis for all branches except depfu 
Otherwise when working on a fork Travis doesn't run for the branch you
are working on. Now you can try things out and ensure it works before
sending a PR.

depfu branches keep excluded as it will cause that we run it twice.
 2019-04-29 14:37:52 +02:00
depfu[bot]
c6dd013062 Update recaptcha to version 4.14.0 2019-04-27 13:46:01 +00:00
Ana María Martínez Gómez
3fabb7a1e2
Merge pull request #2493 from openSUSE/depfu/update/font-awesome-rails-4.7.0.5 
Update font-awesome-rails: 4.7.0.4 → 4.7.0.5 (patch)
 2019-04-27 15:43:15 +02:00