projects
/
arvados.git
/ history
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first
⋅
prev
⋅
next
18004: Fixes a couple of race condition bugs related to caching remote users.
[arvados.git]
/
services
/
api
/
app
/
controllers
/
user_sessions_controller.rb
2018-05-11
Ward Vandewege
Merge branch 'thehyve/fix-crunch-documentation' Fix...
blob
|
commitdiff
|
raw
2018-05-08
Tom Clegg
Merge branch '12626-merge-accounts'
blob
|
commitdiff
|
raw
2018-05-07
Tom Clegg
12626: Merge branch 'master' into 12626-merge-accounts
blob
|
commitdiff
|
raw
2018-05-07
Tom Clegg
12626: Copy omniauth info into auth account, not target...
blob
|
commitdiff
|
raw
2018-05-02
Tom Clegg
12626: Add arvados/v1/users/merge API.
blob
|
commitdiff
|
raw
|
diff to current
2017-12-20
Lucas Di Pentima
Merge branch 'master' into 12479-wb-structured-vocabulary
blob
|
commitdiff
|
raw
|
diff to current
2017-12-12
Peter Amstutz
Merge branch '12765-workbench-404-trashed' refs #12765
blob
|
commitdiff
|
raw
|
diff to current
2017-12-11
Tom Clegg
Merge branch '12167-python-request-id'
blob
|
commitdiff
|
raw
|
diff to current
2017-12-08
Tom Clegg
Merge branch '11908-properties-column-json'
blob
|
commitdiff
|
raw
|
diff to current
2017-12-08
Tom Clegg
Merge branch '12721-build-package-version'
blob
|
commitdiff
|
raw
|
diff to current
2017-12-08
Fuad Muhic
Merge branch 'master' of git.curoverse.com:arvados...
blob
|
commitdiff
|
raw
|
diff to current
2017-12-08
Tom Clegg
Merge branch '11453-federated-tokens'
blob
|
commitdiff
|
raw
|
diff to current
2017-12-07
Tom Clegg
11453: Merge branch 'master' into 11453-federated-tokens
blob
|
commitdiff
|
raw
|
diff to current
2017-12-04
Tom Clegg
11453: Merge branch 'master' into 11453-federated-tokens
blob
|
commitdiff
|
raw
|
diff to current
2017-11-29
Tom Clegg
11453: Merge branch 'master' into 11453-federated-tokens
blob
|
commitdiff
|
raw
|
diff to current
2017-11-27
Tom Clegg
Merge branch 'master' into 11453-federated-tokens
blob
|
commitdiff
|
raw
|
diff to current
2017-11-06
Tom Clegg
Merge branch 'master' into 11453-federated-tokens
blob
|
commitdiff
|
raw
|
diff to current
2017-10-30
Tom Clegg
11453: Do not generate local tokens for remote users.
blob
|
commitdiff
|
raw
|
diff to current
2017-07-05
Tom Clegg
Merge branch '8784-dir-listings'
blob
|
commitdiff
|
raw
|
diff to current
2017-06-30
Tom Clegg
Merge branch '11807-yaml-to-json'
blob
|
commitdiff
|
raw
|
diff to current
2017-06-30
radhika
Arvados-DCO-1.1-Signed-off-by: Radhika Chippada <radhik...
blob
|
commitdiff
|
raw
|
diff to current
2017-06-29
Lucas Di Pentima
11789: Merge branch 'master' into 11789-arvput-exclude...
blob
|
commitdiff
|
raw
|
diff to current
2017-06-29
Tom Clegg
Merge branch '2411-check-copyright'
blob
|
commitdiff
|
raw
|
diff to current
2017-06-28
Tom Clegg
2411: Add copyright notices to everything.
blob
|
commitdiff
|
raw
|
diff to current
2017-05-03
radhika
Merge branch 'master' into 10112-workflow-show
blob
|
commitdiff
|
raw
|
diff to current
2017-05-02
Tom Clegg
11308: Merge branch 'master' into 11308-python3
blob
|
commitdiff
|
raw
|
diff to current
2017-05-02
Lucas Di Pentima
11185: Merge branch 'master' into 11185-wb-disable...
blob
|
commitdiff
|
raw
|
diff to current
2017-05-02
Lucas Di Pentima
11579: Merge branch 'master' into 11579-arvput-follow...
blob
|
commitdiff
|
raw
|
diff to current
2017-05-01
Peter Amstutz
Merge branch 'master' into origin-8019-crunchrun-log...
blob
|
commitdiff
|
raw
|
diff to current
2017-04-28
Peter Amstutz
Merge branch '11549-cwl-smarter-mounts' closes #11549
blob
|
commitdiff
|
raw
|
diff to current
2017-04-27
Tom Clegg
Merge branch '7709-api-rails4'
blob
|
commitdiff
|
raw
|
diff to current
2017-04-26
Tom Clegg
7709: Merge branch 'master' into 7709-api-rails4
blob
|
commitdiff
|
raw
|
diff to current
2017-04-25
Tom Clegg
7709: Merge branch 'master' into 7709-api-rails4
blob
|
commitdiff
|
raw
|
diff to current
2017-04-10
Tom Clegg
7709: Merge branch 'master' into 7709-api-rails4
blob
|
commitdiff
|
raw
|
diff to current
2017-03-27
Tom Clegg
7709: Upgrade to rails4, fix some of the compatibility...
blob
|
commitdiff
|
raw
|
diff to current
2016-11-22
Lucas Di Pentima
5737: Merge branch 'master' into 5737-ruby231
blob
|
commitdiff
|
raw
|
diff to current
2016-10-21
Tom Clegg
Merge branch '10232-non-exclusive-keys' refs #10232
blob
|
commitdiff
|
raw
|
diff to current
2016-10-21
Tom Clegg
10008: Merge branch 'master' into 10008-flaky-token...
blob
|
commitdiff
|
raw
|
diff to current
2016-10-21
Peter Amstutz
Merge branch 'master' into 10194-cwl-version-skew
blob
|
commitdiff
|
raw
|
diff to current
2016-10-21
Tom Clegg
Merge branch 'crunch-job_finds_newer_docker_hashes...
blob
|
commitdiff
|
raw
|
diff to current
2016-10-21
Peter Amstutz
Merge branch '10025-arvbox-layers' closes #10025
blob
|
commitdiff
|
raw
|
diff to current
2016-10-20
Peter Amstutz
Merge branch 'master' into 10172-crunch2-container...
blob
|
commitdiff
|
raw
|
diff to current
2016-10-20
Tom Clegg
Merge branch '10287-sso-username' refs #10287
blob
|
commitdiff
|
raw
|
diff to current
2016-10-20
Tom Clegg
10287: Perform blacklist and duplicate checks on userna...
blob
|
commitdiff
|
raw
|
diff to current
2016-10-19
Peter Amstutz
10287: When creating a new account, if provided use...
blob
|
commitdiff
|
raw
|
diff to current
2016-03-11
Tom Clegg
Add 'build/' from commit '555b039609a3c8700c27767c255fd...
blob
|
commitdiff
|
raw
|
diff to current
2016-03-01
Peter Amstutz
Add 'tools/arvbox/' from commit 'd3d368758db1f4a9fa5b89...
blob
|
commitdiff
|
raw
|
diff to current
2015-09-04
Joshua C. Randall
Merge pull request #2 from wtsi-hgi/feature/arv-view
blob
|
commitdiff
|
raw
|
diff to current
2015-07-31
Tom Clegg
Merge branch 'git-commit-debug' of https://github.com...
blob
|
commitdiff
|
raw
|
diff to current
2015-07-31
Tom Clegg
Merge branch 'crunch-dispatch-docker-bin-env' of https...
blob
|
commitdiff
|
raw
|
diff to current
2015-07-22
Peter Amstutz
Merge branch '6264-cwl-runner' closes #6264
blob
|
commitdiff
|
raw
|
diff to current
2015-07-14
Peter Amstutz
Merge branch 'master' into github-3408-production-datam...
blob
|
commitdiff
|
raw
|
diff to current
2015-07-14
radhika
Merge branch 'master' into 6219-fuse-performance-testing
blob
|
commitdiff
|
raw
|
diff to current
2015-07-13
Manoj
Merge branch 'master' into 6465-optimize-workbench...
blob
|
commitdiff
|
raw
|
diff to current
2015-07-10
Tom Clegg
Merge branch '6222-memory-status' refs #6222
blob
|
commitdiff
|
raw
|
diff to current
2015-07-09
radhika
Merge branch 'master' into 6279-web-shell-client
blob
|
commitdiff
|
raw
|
diff to current
2015-07-08
Tom Clegg
Merge branch '6377-dev-startup' refs #6377
blob
|
commitdiff
|
raw
|
diff to current
2015-07-08
Tom Clegg
6377: Support loading omniauth config from application...
blob
|
commitdiff
|
raw
|
diff to current
2015-03-23
Joshua C. Randall
Merge pull request #1 from curoverse/master
blob
|
commitdiff
|
raw
|
diff to current
2015-02-13
mishaz
Merge branch 'master' of git.curoverse.com:arvados...
blob
|
commitdiff
|
raw
|
diff to current
2015-01-26
Phil Hodgson
Merge branch 'master' into 4232-slow-pipes-n-jobs
blob
|
commitdiff
|
raw
|
diff to current
2015-01-16
Peter Amstutz
Add 'apps/arv-web/' from commit 'f9732ad8460d013c2f2836...
blob
|
commitdiff
|
raw
|
diff to current
2015-01-16
Peter Amstutz
Merge branch 'master' into origin-4823-python-sdk-writa...
blob
|
commitdiff
|
raw
|
diff to current
2015-01-13
Ward Vandewege
Merge branch 'master' into 0000-workbench-user-profile...
blob
|
commitdiff
|
raw
|
diff to current
2015-01-07
Radhika Chippada
Merge branch 'master' into 4523-search-index
blob
|
commitdiff
|
raw
|
diff to current
2015-01-07
Tom Clegg
3021: Merge branch 'master' into 3021-more-phantomjs
blob
|
commitdiff
|
raw
|
diff to current
2015-01-07
Tim Pierce
Merge branch '4598-crunch-failure-stats'
blob
|
commitdiff
|
raw
|
diff to current
2015-01-06
Peter Amstutz
Merge branch '4570-multi-auth-method' refs #4570
blob
|
commitdiff
|
raw
|
diff to current
2015-01-06
Peter Amstutz
Merge branch 'master' into 4570-multi-auth-method
blob
|
commitdiff
|
raw
|
diff to current
2014-12-02
Tim Pierce
Merge branch '4621-crunch-memory-usage'
blob
|
commitdiff
|
raw
|
diff to current
2014-12-02
radhika
Merge branch 'master' into 4487-and-4558
blob
|
commitdiff
|
raw
|
diff to current
2014-12-01
Tom Clegg
Merge branch '3781-browser-friendly-servers' refs ...
blob
|
commitdiff
|
raw
|
diff to current
2014-11-26
Tom Clegg
3781: Merge branch 'master' into 3781-browser-friendly...
blob
|
commitdiff
|
raw
|
diff to current
2014-11-26
Tom Clegg
3781: Add tests for CORS headers. Turn off CORS headers...
blob
|
commitdiff
|
raw
|
diff to current
2014-11-26
Tom Clegg
3781: Set CORS headers in API responses.
blob
|
commitdiff
|
raw
|
diff to current
2014-11-21
Peter Amstutz
4570: Rename 'auth_method' parameter to 'auth_provider...
blob
|
commitdiff
|
raw
|
diff to current
2014-11-20
Peter Amstutz
4570: Workbench/API server support for multiple authent...
blob
|
commitdiff
|
raw
|
diff to current
2014-08-27
Tom Clegg
3354: Merge branch 'master' into 3354-render-textile
blob
|
commitdiff
|
raw
|
diff to current
2014-08-26
Tom Clegg
Merge branch '3627-selectable-projects' closes #3627
blob
|
commitdiff
|
raw
|
diff to current
2014-08-26
Tom Clegg
3149: Merge branch 'master' into 3149-server-side-search
blob
|
commitdiff
|
raw
|
diff to current
2014-08-26
Tom Clegg
Merge branch '3149-filter-any' refs #3149
blob
|
commitdiff
|
raw
|
diff to current
2014-08-26
Tom Clegg
Merge branch '3660-project-editable' closes #3660
blob
|
commitdiff
|
raw
|
diff to current
2014-08-26
Tom Clegg
Merge branch '3171-admin-groups' closes #3171
blob
|
commitdiff
|
raw
|
diff to current
2014-08-25
Peter Amstutz
Merge branch 'master' into 3036-collection-uuids
blob
|
commitdiff
|
raw
|
diff to current
2014-08-25
Tom Clegg
3171: Merge branch 'master' into 3171-group-membership
blob
|
commitdiff
|
raw
|
diff to current
2014-08-25
Tim Pierce
Merge branch '3448-keep-put-timestamps'
blob
|
commitdiff
|
raw
|
diff to current
2014-08-25
Tom Clegg
Merge branch 'multiple-dispatch' no issue #
blob
|
commitdiff
|
raw
|
diff to current
2014-08-24
radhika
Merge branch 'master' into 3112-report-bug
blob
|
commitdiff
|
raw
|
diff to current
2014-08-24
radhika
closes #3153
blob
|
commitdiff
|
raw
|
diff to current
2014-08-24
radhika
Merge branch 'master' into 3153-auto-setup-user
blob
|
commitdiff
|
raw
|
diff to current
2014-08-23
radhika
Merge branch 'master' into 3153-auto-setup-user
blob
|
commitdiff
|
raw
|
diff to current
2014-08-23
radhika
Merge branch '3153-auto-setup-tests' into 3153-auto...
blob
|
commitdiff
|
raw
|
diff to current
2014-08-23
Tom Clegg
3153: Add integration tests.
blob
|
commitdiff
|
raw
|
diff to current
2014-07-21
Tim Pierce
Merge branch '3072-empty-collection-bugfix'
blob
|
commitdiff
|
raw
|
diff to current
2014-07-21
radhika
Merge branch 'master' into 3140-project-content-tabs
blob
|
commitdiff
|
raw
|
diff to current
2014-07-21
Tom Clegg
3170: Merge branch 'master' into 3170-refresh-tab-pane
blob
|
commitdiff
|
raw
|
diff to current
2014-07-21
radhika
Merge branch 'master' into 3138-wiselinks
blob
|
commitdiff
|
raw
|
diff to current
2014-07-19
Ward Vandewege
Merge branch 'master' into 3219-further-docker-improvements
blob
|
commitdiff
|
raw
|
diff to current
2014-07-19
Tom Clegg
Merge branch '3214-permission-to-use-owner-uuid'
blob
|
commitdiff
|
raw
|
diff to current
2014-07-19
Tom Clegg
3214: Merge branch 'master' into 3214-permission-to...
blob
|
commitdiff
|
raw
|
diff to current
next