Skip to content

Commit

Permalink
Merge pull request #108 from openSUSE/fix_doc
Browse files Browse the repository at this point in the history
Several documentation-related fixes
  • Loading branch information
ancorgs committed Oct 31, 2019
2 parents fa70b64 + acd58ce commit 4483233
Show file tree
Hide file tree
Showing 63 changed files with 11,225 additions and 7,837 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ gem 'rspec-rails', group: [:development, :test]
# Moved out of the development group to avoid an error in every rake execution
# caused by lib/tasks/doc.rake (at least until we figure out a cleaner
# solution)
gem 'yard', '0.8.7.4'
gem 'yard', '~> 0.9.0'
group :development do
gem 'ruby-graphviz'
gem 'state_machines-yard'
Expand Down
10 changes: 5 additions & 5 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ GEM
mimemagic (0.3.3)
mini_mime (1.0.2)
mini_portile2 (2.4.0)
minitest (5.12.2)
minitest (5.13.0)
multi_json (1.14.1)
nio4r (2.5.2)
nokogiri (1.10.4)
Expand Down Expand Up @@ -295,7 +295,7 @@ GEM
ruby-graphviz (1.2.4)
ruby-progressbar (1.10.1)
ruby-rc4 (0.1.5)
ruby_parser (3.14.0)
ruby_parser (3.14.1)
sexp_processor (~> 4.9)
rubyzip (2.0.0)
sass (3.2.19)
Expand Down Expand Up @@ -352,7 +352,7 @@ GEM
thor (0.20.3)
thread_safe (0.3.6)
tilt (1.4.1)
tins (1.21.1)
tins (1.22.0)
ttfunk (1.0.3)
turbolinks (5.2.1)
turbolinks-source (~> 5.2)
Expand All @@ -376,7 +376,7 @@ GEM
sprockets-rails (>= 2.0, < 4.0)
xpath (3.2.0)
nokogiri (~> 1.8)
yard (0.8.7.4)
yard (0.9.20)
yard-activerecord (0.0.16)
yard (>= 0.8.3)

Expand Down Expand Up @@ -436,7 +436,7 @@ DEPENDENCIES
twitter-bootstrap-rails
uglifier (>= 1.3.0)
web-console (~> 2.0)
yard (= 0.8.7.4)
yard (~> 0.9.0)
yard-activerecord

BUNDLED WITH
Expand Down
Binary file modified app/assets/images/Reimbursement_state.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/assets/images/Shipment_state.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/assets/images/TravelSponsorship_state.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 10 additions & 4 deletions doc/DOCKER.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,19 +17,25 @@ straighforward.

cp docker/database.postgresql.yml config/database.yml

3. Build the image:
4. Build the image:

docker-compose build

4. Now you should be able to set up the database:
5. Now you should be able to set up the database:

docker-compose run --rm web rake db:setup

5. (Optional) Run the testsuite to find out whether the application works.
When using the mysql container, this fifth step may require that you have
started the database container some seconds in advance, since the official
mysql and mariadb containers need some time to initialize the system.

docker-compose up --detach db

6. (Optional) Run the testsuite to find out whether the application works.

docker-compose run --rm web xvfb-run -a rake spec

6. And, now, you can start the application:
7. And, now, you can start the application:

docker-compose up

Expand Down
502 changes: 230 additions & 272 deletions doc/html/Ability.html

Large diffs are not rendered by default.

Loading

0 comments on commit 4483233

Please sign in to comment.