Fix merge conflict.
[arvados.git] / services / api /
2022-08-29 Tom CleggFix merge conflict.
2022-08-25 Tom CleggMerge branch '19269-all-users-writable'
2022-08-25 Tom Clegg19269: Update error text re modifying group role withou...
2022-08-25 Tom Clegg19269: Upgrade user->all_users group membership links.
2022-08-24 Peter AmstutzMerge branch '19413-warning-update' refs #19413
2022-08-22 Tom CleggMerge branch '18205-container-cost'
2022-08-08 Tom Clegg18205: Add container cost accounting fields. 18205-container-cost
2022-08-04 Peter AmstutzMerge branch '19280-cache-loadref' refs #19280
2022-08-01 Tom CleggMerge branch '19281-diagnostics-image'
2022-08-01 Tom CleggMerge branch '19166-gateway-tunnel'
2022-07-28 Lucas Di PentimaMerge branch '19297-inexistent-field-filter-fix'. Close...
2022-07-28 Lucas Di Pentima19297: Fixes error check for edge case of limit=0,... 19297-inexistent-field-filter-fix
2022-07-27 Lucas Di Pentima19297: Raises an error only when no object types have...
2022-07-27 Lucas Di Pentima19297: Adds tests exposing the bug.
2022-07-25 Tom Clegg19166: Merge branch 'main' 19166-gateway-tunnel
2022-07-22 Peter AmstutzMerge branch 'MajewskiKrzysztof/use_api_token_from_conf...
2022-07-22 Tom CleggMerge branch '19249-header-ctrl-chars'
2022-07-22 Lucas Di PentimaMerge branch '19283-salt-webshell-upstream-fix'. Closes...
2022-07-22 Lucas Di PentimaMerge branch '19291-tzinfo-upgrade'. Closes #19291
2022-07-22 Lucas Di Pentima19291: Bumps tzinfo to 1.2.10 19291-tzinfo-upgrade
2022-07-21 Tom CleggMerge branch '19277-local-keep-from-ctr'
2022-07-20 Tom Clegg17344: Merge branch 'main'
2022-07-20 Tom CleggMerge branch '16552-autocert'
2022-07-19 Lucas Di PentimaMerge branch '19278-activerecord-update'. Closes #19278
2022-07-19 Lucas Di Pentima19278: Updates api & wb1 rails to 5.2.8.1 19278-activerecord-update
2022-07-14 Lucas Di PentimaMerge branch '19139-user-creation-fixes'. Closes #19139
2022-07-14 Lucas Di Pentima19139: Adds test confirming that provided owner_uuid... 19139-user-creation-fixes
2022-07-14 Lucas Di Pentima19139: Fixes bug by always setting owner_uuid to the...
2022-07-14 Lucas Di Pentima19139: Adds tests related to user creation.
2022-07-14 Lucas Di PentimaMerge branch '19206-root-user-disabling-fix'. Closes...
2022-07-13 Lucas Di Pentima19206: Avoids disabling or setting system root user... 19206-root-user-disabling-fix
2022-07-13 Lucas Di Pentima19206: Adds test exposing the bug.
2022-07-13 Tom Clegg16552: Merge branch 'main' into 16552-autocert
2022-07-07 Lucas Di PentimaMerge branch '18858-sync-users-fixes'. Closes #18858
2022-07-07 Lucas Di Pentima18858: Removed root & anonymous usernames from fixture...
2022-07-07 Peter AmstutzMerge branch 'keep_web_api_client_upload_method' refs...
2022-07-07 Tom Clegg16552: Merge branch 'main'
2022-07-06 Tom CleggMerge branch '16888-ctr-fed-token'
2022-07-05 Lucas Di PentimaMerge branch '18858-sync-users-tool'. Closes #18858
2022-07-04 Lucas Di Pentima18858: Adds username-based test cases.
2022-06-30 Tom CleggMerge branch '19088-s3-properties-tags'
2022-06-29 Tom CleggMerge branch '16561-listen-url'
2022-06-29 Tom CleggMerge branch '19205-monitor-handler-threads'
2022-06-29 Lucas Di Pentima18858: Fixes fixture to avoid having duplicated emails...
2022-06-29 Lucas Di Pentima18858: Fixes user fixture: usernames can only be alphanums.
2022-06-28 Tom CleggMerge branch '19217-silence-logs'
2022-06-27 Tom Clegg19217: Silence SQL logs during database reset.
2022-06-24 Tom Clegg19166: Set up tunnel for container gateway requests
2022-06-24 Tom CleggMerge branch '18948-update-exit-code-early'
2022-06-24 Tom Clegg18948: Update test.
2022-06-24 Tom Clegg18948: Update container record exit_code as soon as...
2022-06-14 Lucas Di PentimaMerge branch '19193-rails-upgrade'. Closes #19193
2022-06-14 Lucas Di Pentima19193: Pins sprockets gem to version <4.0 to avoid...
2022-06-14 Lucas Di Pentima19193: Upgrades RailsAPI & Workbench1 to address securi...
2022-06-13 Tom CleggMerge branch '19146-can-write-manage'
2022-06-10 Tom Clegg19146: Remove unneeded special case checks, explain...
2022-06-10 Lucas Di PentimaMerge branch '19177-sharing-links-ui-config'. Refs...
2022-06-08 Tom CleggMerge branch '19145-admin-write-frozen'
2022-06-07 Tom Clegg19146: Add can_write/can_manage to users#list, fix...
2022-06-06 Tom Clegg19146: Add can_write and can_manage response fields.
2022-06-06 Tom Clegg19145: Make frozen projects non-writable by admins.
2022-05-21 Tom Clegg15370: Merge branch 'main' into 15370-loopback-dispatch...
2022-05-20 Tom CleggMerge branch '16345-check-version-skew'
2022-05-20 Peter AmstutzMerge branch '19129-wb1-dashboard-speedup' refs #19129
2022-05-20 Tom CleggMerge branch '18983-warn-unused-local-keep'
2022-05-19 Tom CleggMerge branch '19136-freeze-props-whitelist'
2022-05-19 Tom CleggMerge branch '19099-singularity-container-shell'
2022-05-19 Lucas Di PentimaMerge branch '19141-nokogiri-update'. Closes #19141
2022-05-19 Peter AmstutzMerge branch '17004-properties-on-output' refs #17004
2022-05-19 Lucas Di Pentima19141: Updates nokogiri dependencies on railsAPI &...
2022-05-18 Peter Amstutz17004: Move output_properties to progress_attrs
2022-05-13 Peter AmstutzUpdate tests related to make_output_collection
2022-05-13 Peter Amstutz17004: Allow output_properties to override the default...
2022-05-13 Peter Amstutz17004: Work on CWL side
2022-05-13 Peter Amstutz17004: Add API server tests for output_properties
2022-05-13 Peter Amstutz17004: Add migration
2022-05-13 Peter Amstutz17004: Initial API server support for output_properties
2022-05-10 Tom CleggMerge branch '19095-singularity-bugfix'
2022-05-09 Tom CleggMerge branch '18794-config-health'
2022-05-09 Tom Clegg18794: Merge branch 'main'
2022-05-06 Tom CleggMerge branch '18947-keep-balance'
2022-05-06 Ward VandewegeMerge branch '18995-code-cleanup-5'
2022-05-06 Ward Vandewege18995: Merge branch 'main' into 18995-code-cleanup-5
2022-05-05 Tom Clegg18794: Make "touch restart.txt" recipe work when owned...
2022-05-05 Tom Clegg18794: Fix reload_config: don't assume restart.txt...
2022-05-05 Tom Clegg18794: Merge branch 'main'
2022-05-05 Tom Clegg18794: Add version metric to RailsAPI.
2022-05-05 Ward Vandewege18995: add a few missing alt texts to image.
2022-04-27 Tom Clegg18794: Fix routing test.
2022-04-27 Tom CleggMerge branch '18947-githttpd'
2022-04-26 Tom Clegg18794: Don't restart if new config is unreadable or...
2022-04-26 Tom Clegg18794: Don't start config-check thread in packaging...
2022-04-26 Tom Clegg18794: Restart RailsAPI workers when config file changes.
2022-04-26 Tom Clegg18794: Add /metrics endpoint to RailsAPI.
2022-04-19 Peter AmstutzMerge branch '18994-cwl-basename' refs #18994
2022-04-15 Ward Vandewege18995: Merge branch 'main' into 18995-code-cleanup-2
2022-04-15 Ward VandewegeMerge branch '18995-code-cleanup-4'
2022-04-15 Ward Vandewege18995: Merge branch 'main' into 18995-code-cleanup-4
2022-04-15 Tom CleggMerge branch '18992-hpc-local-keepstore'
2022-04-15 Ward Vandewege18995: <html> element should have a language attribute.
next