Merge branch 'master' into 13822-nm-delayed-daemon
[arvados.git] / services / api / app / controllers / user_sessions_controller.rb
2018-07-17 Peter AmstutzMerge branch 'master' into 13822-nm-delayed-daemon
2018-05-25 Lucas Di PentimaMerge branch 'master' into 7478-anm-spot-instances
2018-05-23 Fuad MuhicMerge branch '13430-allow-storage-classes'
2018-05-23 Fuad MuhicMerge branch '13453-r-sdk-incorrect-rest-call-fix'
2018-05-22 Ward Vandewege9918: Merge branch 'master' into 9918-index-timeout
2018-05-21 Peter AmstutzMerge branch '12995-wb-merge-acct' refs #12995
2018-05-18 Peter Amstutz12995: Bugfix to support following chained user uuid...
2018-05-11 Ward VandewegeMerge branch 'thehyve/fix-crunch-documentation' Fix...
2018-05-08 Tom CleggMerge branch '12626-merge-accounts'
2018-05-07 Tom Clegg12626: Merge branch 'master' into 12626-merge-accounts
2018-05-07 Tom Clegg12626: Copy omniauth info into auth account, not target...
2018-05-02 Tom Clegg12626: Add arvados/v1/users/merge API.
2017-12-20 Lucas Di PentimaMerge branch 'master' into 12479-wb-structured-vocabulary
2017-12-12 Peter AmstutzMerge branch '12765-workbench-404-trashed' refs #12765
2017-12-11 Tom CleggMerge branch '12167-python-request-id'
2017-12-08 Tom CleggMerge branch '11908-properties-column-json'
2017-12-08 Tom CleggMerge branch '12721-build-package-version'
2017-12-08 Fuad MuhicMerge branch 'master' of git.curoverse.com:arvados...
2017-12-08 Tom CleggMerge branch '11453-federated-tokens'
2017-12-07 Tom Clegg11453: Merge branch 'master' into 11453-federated-tokens
2017-12-04 Tom Clegg11453: Merge branch 'master' into 11453-federated-tokens
2017-11-29 Tom Clegg11453: Merge branch 'master' into 11453-federated-tokens
2017-11-27 Tom CleggMerge branch 'master' into 11453-federated-tokens
2017-11-06 Tom CleggMerge branch 'master' into 11453-federated-tokens
2017-10-30 Tom Clegg11453: Do not generate local tokens for remote users.
2017-07-05 Tom CleggMerge branch '8784-dir-listings'
2017-06-30 Tom CleggMerge branch '11807-yaml-to-json'
2017-06-30 radhikaArvados-DCO-1.1-Signed-off-by: Radhika Chippada <radhik...
2017-06-29 Lucas Di Pentima11789: Merge branch 'master' into 11789-arvput-exclude...
2017-06-29 Tom CleggMerge branch '2411-check-copyright'
2017-06-28 Tom Clegg2411: Add copyright notices to everything.
2017-05-03 radhikaMerge branch 'master' into 10112-workflow-show
2017-05-02 Tom Clegg11308: Merge branch 'master' into 11308-python3
2017-05-02 Lucas Di Pentima11185: Merge branch 'master' into 11185-wb-disable...
2017-05-02 Lucas Di Pentima11579: Merge branch 'master' into 11579-arvput-follow...
2017-05-01 Peter AmstutzMerge branch 'master' into origin-8019-crunchrun-log...
2017-04-28 Peter AmstutzMerge branch '11549-cwl-smarter-mounts' closes #11549
2017-04-27 Tom CleggMerge branch '7709-api-rails4'
2017-04-26 Tom Clegg7709: Merge branch 'master' into 7709-api-rails4
2017-04-25 Tom Clegg7709: Merge branch 'master' into 7709-api-rails4
2017-04-10 Tom Clegg7709: Merge branch 'master' into 7709-api-rails4
2017-03-27 Tom Clegg7709: Upgrade to rails4, fix some of the compatibility...
2016-11-22 Lucas Di Pentima5737: Merge branch 'master' into 5737-ruby231
2016-10-21 Tom CleggMerge branch '10232-non-exclusive-keys' refs #10232
2016-10-21 Tom Clegg10008: Merge branch 'master' into 10008-flaky-token...
2016-10-21 Peter AmstutzMerge branch 'master' into 10194-cwl-version-skew
2016-10-21 Tom CleggMerge branch 'crunch-job_finds_newer_docker_hashes...
2016-10-21 Peter AmstutzMerge branch '10025-arvbox-layers' closes #10025
2016-10-20 Peter AmstutzMerge branch 'master' into 10172-crunch2-container...
2016-10-20 Tom CleggMerge branch '10287-sso-username' refs #10287
2016-10-20 Tom Clegg10287: Perform blacklist and duplicate checks on userna...
2016-10-19 Peter Amstutz10287: When creating a new account, if provided use...
2016-03-11 Tom CleggAdd 'build/' from commit '555b039609a3c8700c27767c255fd...
2016-03-01 Peter AmstutzAdd 'tools/arvbox/' from commit 'd3d368758db1f4a9fa5b89...
2015-09-04 Joshua C. RandallMerge pull request #2 from wtsi-hgi/feature/arv-view
2015-07-31 Tom CleggMerge branch 'git-commit-debug' of https://github.com...
2015-07-31 Tom CleggMerge branch 'crunch-dispatch-docker-bin-env' of https...
2015-07-22 Peter AmstutzMerge branch '6264-cwl-runner' closes #6264
2015-07-14 Peter AmstutzMerge branch 'master' into github-3408-production-datam...
2015-07-14 radhikaMerge branch 'master' into 6219-fuse-performance-testing
2015-07-13 ManojMerge branch 'master' into 6465-optimize-workbench...
2015-07-10 Tom CleggMerge branch '6222-memory-status' refs #6222
2015-07-09 radhikaMerge branch 'master' into 6279-web-shell-client
2015-07-08 Tom CleggMerge branch '6377-dev-startup' refs #6377
2015-07-08 Tom Clegg6377: Support loading omniauth config from application...
2015-03-23 Joshua C. RandallMerge pull request #1 from curoverse/master
2015-02-13 mishazMerge branch 'master' of git.curoverse.com:arvados...
2015-01-26 Phil HodgsonMerge branch 'master' into 4232-slow-pipes-n-jobs
2015-01-16 Peter AmstutzAdd 'apps/arv-web/' from commit 'f9732ad8460d013c2f2836...
2015-01-16 Peter AmstutzMerge branch 'master' into origin-4823-python-sdk-writa...
2015-01-13 Ward VandewegeMerge branch 'master' into 0000-workbench-user-profile...
2015-01-07 Radhika ChippadaMerge branch 'master' into 4523-search-index
2015-01-07 Tom Clegg3021: Merge branch 'master' into 3021-more-phantomjs
2015-01-07 Tim PierceMerge branch '4598-crunch-failure-stats'
2015-01-06 Peter AmstutzMerge branch '4570-multi-auth-method' refs #4570
2015-01-06 Peter AmstutzMerge branch 'master' into 4570-multi-auth-method
2014-12-02 Tim PierceMerge branch '4621-crunch-memory-usage'
2014-12-02 radhikaMerge branch 'master' into 4487-and-4558
2014-12-01 Tom CleggMerge branch '3781-browser-friendly-servers' refs ...
2014-11-26 Tom Clegg3781: Merge branch 'master' into 3781-browser-friendly...
2014-11-26 Tom Clegg3781: Add tests for CORS headers. Turn off CORS headers...
2014-11-26 Tom Clegg3781: Set CORS headers in API responses.
2014-11-21 Peter Amstutz4570: Rename 'auth_method' parameter to 'auth_provider...
2014-11-20 Peter Amstutz4570: Workbench/API server support for multiple authent...
2014-08-27 Tom Clegg3354: Merge branch 'master' into 3354-render-textile
2014-08-26 Tom CleggMerge branch '3627-selectable-projects' closes #3627
2014-08-26 Tom Clegg3149: Merge branch 'master' into 3149-server-side-search
2014-08-26 Tom CleggMerge branch '3149-filter-any' refs #3149
2014-08-26 Tom CleggMerge branch '3660-project-editable' closes #3660
2014-08-26 Tom CleggMerge branch '3171-admin-groups' closes #3171
2014-08-25 Peter AmstutzMerge branch 'master' into 3036-collection-uuids
2014-08-25 Tom Clegg3171: Merge branch 'master' into 3171-group-membership
2014-08-25 Tim PierceMerge branch '3448-keep-put-timestamps'
2014-08-25 Tom CleggMerge branch 'multiple-dispatch' no issue #
2014-08-24 radhikaMerge branch 'master' into 3112-report-bug
2014-08-24 radhikacloses #3153
2014-08-24 radhikaMerge branch 'master' into 3153-auto-setup-user
2014-08-23 radhikaMerge branch 'master' into 3153-auto-setup-user
2014-08-23 radhikaMerge branch '3153-auto-setup-tests' into 3153-auto...
2014-08-23 Tom Clegg3153: Add integration tests.
next