projects
/
rails.git
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
Merge remote-tracking branch 'upstream/pull/1986'
[rails.git]
/
test
/
controllers
/
user_controller_test.rb
2018-09-10
Tom Hughes
Merge remote-tracking branch 'upstream/pull/1986'
blob
|
commitdiff
|
raw
2018-09-10
Tom Hughes
Merge remote-tracking branch 'upstream/pull/1985'
blob
|
commitdiff
|
raw
|
diff to current
2018-09-10
Tom Hughes
Merge remote-tracking branch 'upstream/pull/1984'
blob
|
commitdiff
|
raw
|
diff to current
2018-09-10
Andy Allan
Just pass the user object, rather than the display_name...
blob
|
commitdiff
|
raw
|
diff to current
2018-09-10
Andy Allan
Rename user#list to user#index
blob
|
commitdiff
|
raw
|
diff to current
2018-09-05
Tom Hughes
Merge remote-tracking branch 'upstream/pull/1974'
blob
|
commitdiff
|
raw
|
diff to current
2018-09-05
Tom Hughes
Merge remote-tracking branch 'upstream/pull/1973'
blob
|
commitdiff
|
raw
|
diff to current
2018-09-05
Tom Hughes
Merge remote-tracking branch 'upstream/pull/1972'
blob
|
commitdiff
|
raw
|
diff to current
2018-09-05
Andy Allan
Rename user#view to user#show
blob
|
commitdiff
|
raw
|
diff to current
2018-07-09
Tom Hughes
Add /api/0.6/users to fetch multiple users
blob
|
commitdiff
|
raw
|
diff to current
2018-06-10
Tom Hughes
Merge branch 'master' into next
blob
|
commitdiff
|
raw
|
diff to current
2018-05-18
hikemaniac
Rebase to current master
blob
|
commitdiff
|
raw
|
diff to current
2018-05-17
Tom Hughes
Update for rubocop 0.54.0
blob
|
commitdiff
|
raw
|
diff to current
2017-11-29
Andy Allan
Merge branch 'master' into moderation
blob
|
commitdiff
|
raw
|
diff to current
2017-11-22
Andy Allan
Merge branch 'pull/843' into titles
blob
|
commitdiff
|
raw
|
diff to current
2017-11-22
Andy Allan
Merge branch 'p' of https://github.com/jfirebaugh/opens...
blob
|
commitdiff
|
raw
|
diff to current
2017-11-15
Andy Allan
Merge branch 'wheres_this' of https://github.com/pnorma...
blob
|
commitdiff
|
raw
|
diff to current
2017-10-16
Tom Hughes
Merge remote-tracking branch 'upstream/pull/1580'
blob
|
commitdiff
|
raw
|
diff to current
2017-10-05
Tom Hughes
Fix rubocop warnings
blob
|
commitdiff
|
raw
|
diff to current
2017-08-30
Tom Hughes
Merge remote-tracking branch 'upstream/pull/1614'
blob
|
commitdiff
|
raw
|
diff to current
2017-08-11
Tom Hughes
Make sure we show errors correctly when resetting a...
blob
|
commitdiff
|
raw
|
diff to current
2017-08-02
Tom Hughes
Merge remote-tracking branch 'upstream/pull/1604'
blob
|
commitdiff
|
raw
|
diff to current
2017-08-02
Tom Hughes
Make sure the account form is POSTed
blob
|
commitdiff
|
raw
|
diff to current
2017-08-02
Andy Allan
Merge pull request #1588 from Georeactor/master
blob
|
commitdiff
|
raw
|
diff to current
2017-08-02
Tom Hughes
Merge remote-tracking branch 'upstream/pull/1603'
blob
|
commitdiff
|
raw
|
diff to current
2017-08-02
Andy Allan
Merge branch 'master' into moderation
blob
|
commitdiff
|
raw
|
diff to current
2017-08-01
Tom Hughes
Fix user settings form
blob
|
commitdiff
|
raw
|
diff to current
2017-07-12
Tom Hughes
Merge remote-tracking branch 'upstream/pull/1583'
blob
|
commitdiff
|
raw
|
diff to current
2017-07-12
Andy Allan
Standardise on basic_authorization without the parentheses
blob
|
commitdiff
|
raw
|
diff to current
2017-07-12
Andy Allan
Merge branch 'master' into moderation
blob
|
commitdiff
|
raw
|
diff to current
2017-07-06
Tom Hughes
Merge remote-tracking branch 'upstream/pull/1575'
blob
|
commitdiff
|
raw
|
diff to current
2017-07-05
Andy Allan
Hide contributor terms details, unless the user hasn...
blob
|
commitdiff
|
raw
|
diff to current
2017-06-29
Tom Hughes
Merge remote-tracking branch 'upstream/pull/1561'
blob
|
commitdiff
|
raw
|
diff to current
2017-06-27
Tom Hughes
Fix some tests for changes in rails 5
blob
|
commitdiff
|
raw
|
diff to current
2017-06-27
Tom Hughes
Update get/post etc to remove use of deprecated syntax
blob
|
commitdiff
|
raw
|
diff to current
2017-06-02
Tom Hughes
Merge remote-tracking branch 'openstreetmap/pull/1553'
blob
|
commitdiff
|
raw
|
diff to current
2017-06-02
Tom Hughes
Remove all use of the :text option to render
blob
|
commitdiff
|
raw
|
diff to current
2017-06-01
Andy Allan
Rubocop fixes.
blob
|
commitdiff
|
raw
|
diff to current
2017-05-31
Andy Allan
Update the user list pagination test to avoid counting...
blob
|
commitdiff
|
raw
|
diff to current
2017-05-31
Andy Allan
Refactor the user list test to use factory-built users...
blob
|
commitdiff
|
raw
|
diff to current
2017-03-15
Tom Hughes
Merge remote-tracking branch 'openstreetmap/pull/1491'
blob
|
commitdiff
|
raw
|
diff to current
2017-03-15
Tom Hughes
Merge remote-tracking branch 'openstreetmap/pull/1488'
blob
|
commitdiff
|
raw
|
diff to current
2017-03-15
Andy Allan
Use a pending user for testing password resets.
blob
|
commitdiff
|
raw
|
diff to current
2017-03-15
Andy Allan
Use users factory for user_controller tests.
blob
|
commitdiff
|
raw
|
diff to current
2017-03-13
Andy Allan
Build pending users via factory
blob
|
commitdiff
|
raw
|
diff to current
2017-03-05
Tom Hughes
Merge remote-tracking branch 'openstreetmap/pull/1437'
blob
|
commitdiff
|
raw
|
diff to current
2017-02-23
Tom Hughes
Merge remote-tracking branch 'openstreetmap/pull/1436'
blob
|
commitdiff
|
raw
|
diff to current
2017-02-22
Andy Allan
User factory associations for all factories.
blob
|
commitdiff
|
raw
|
diff to current
2017-02-22
Tom Hughes
Merge remote-tracking branch 'openstreetmap/pull/1458'
blob
|
commitdiff
|
raw
|
diff to current
2017-02-22
Tom Hughes
Merge remote-tracking branch 'openstreetmap/pull/1457'
blob
|
commitdiff
|
raw
|
diff to current
2017-02-22
Andy Allan
Pass the user object, rather than the id, for sessions.
blob
|
commitdiff
|
raw
|
diff to current
2017-02-12
Tom Hughes
Merge remote-tracking branch 'openstreetmap/pull/1030...
blob
|
commitdiff
|
raw
|
diff to current
2017-02-06
Tom Hughes
Merge remote-tracking branch 'openstreetmap/pull/1426'
blob
|
commitdiff
|
raw
|
diff to current
2017-02-05
Tom Hughes
Link GPX fixture files instead of stubbing
blob
|
commitdiff
|
raw
|
diff to current
2017-02-05
Tom Hughes
Merge remote-tracking branch 'openstreetmap/pull/1347...
blob
|
commitdiff
|
raw
|
diff to current
2016-12-21
Tom Hughes
Merge remote-tracking branch 'openstreetmap/pull/1395'
blob
|
commitdiff
|
raw
|
diff to current
2016-12-20
Tom Hughes
Add support for Wikimedia authentication
blob
|
commitdiff
|
raw
|
diff to current
2016-12-18
Tom Hughes
Merge remote-tracking branch 'openstreetmap/pull/1367'
blob
|
commitdiff
|
raw
|
diff to current
2016-11-16
Andy Allan
Rename test trace fixtures to use letters instead of...
blob
|
commitdiff
|
raw
|
diff to current
2016-11-09
Tom Hughes
Rename stub_signup_requests to stub_hostip_requests
blob
|
commitdiff
|
raw
|
diff to current
2016-11-09
Tom Hughes
Merge remote-tracking branch 'openstreetmap/pull/1350'
blob
|
commitdiff
|
raw
|
diff to current
2016-11-09
Andy Allan
Use 'def setup' instead of 'setup do', for consistency
blob
|
commitdiff
|
raw
|
diff to current
2016-11-09
Andy Allan
Extract the hostip.info stubbing into a common method.
blob
|
commitdiff
|
raw
|
diff to current
2016-10-30
Andy Allan
Refactor the gravatar email changes to use webmock...
blob
|
commitdiff
|
raw
|
diff to current
2016-10-30
Andy Allan
Stub out requests to gravatar.com during tests.
blob
|
commitdiff
|
raw
|
diff to current
2016-10-30
Andy Allan
Stub out requests to hostip.info during tests
blob
|
commitdiff
|
raw
|
diff to current
2016-10-29
Andy Allan
Replace trace-related fixtures with factories.
blob
|
commitdiff
|
raw
|
diff to current
2016-10-27
Tom Hughes
Merge remote-tracking branch 'openstreetmap/pull/1344'
blob
|
commitdiff
|
raw
|
diff to current
2016-10-26
Tom Hughes
Merge remote-tracking branch 'openstreetmap/pull/1339'
blob
|
commitdiff
|
raw
|
diff to current
2016-10-26
Tom Hughes
Merge remote-tracking branch 'openstreetmap/pull/1338'
blob
|
commitdiff
|
raw
|
diff to current
2016-10-26
Andy Allan
Replace messages fixtures with a factory.
blob
|
commitdiff
|
raw
|
diff to current
2016-10-19
Tom Hughes
Merge remote-tracking branch 'openstreetmap/pull/1332'
blob
|
commitdiff
|
raw
|
diff to current
2016-10-19
Tom Hughes
Merge remote-tracking branch 'openstreetmap/pull/1331'
blob
|
commitdiff
|
raw
|
diff to current
2016-10-19
Tom Hughes
Merge remote-tracking branch 'openstreetmap/pull/1330'
blob
|
commitdiff
|
raw
|
diff to current
2016-10-19
Andy Allan
Use model relations when creating objects from factories
blob
|
commitdiff
|
raw
|
diff to current
2016-10-19
Andy Allan
Replace user_blocks fixture with a factory.
blob
|
commitdiff
|
raw
|
diff to current
2016-10-12
Mikel Maron
merge upstream/master and resolve conflicts from https...
blob
|
commitdiff
|
raw
|
diff to current
2016-10-10
Tom Hughes
Merge remote-tracking branch 'openstreetmap/pull/1312'
blob
|
commitdiff
|
raw
|
diff to current
2016-10-05
Andy Allan
Replace friends fixture with a factory
blob
|
commitdiff
|
raw
|
diff to current
2016-08-19
Tom Hughes
Merge remote-tracking branch 'openstreetmap/pull/1036'
blob
|
commitdiff
|
raw
|
diff to current
2016-08-19
Simon Poole
Merge message when Gravatar status has changed with...
blob
|
commitdiff
|
raw
|
diff to current
2016-08-16
Simon Poole
Add tests for change of gravatar use depending on email
blob
|
commitdiff
|
raw
|
diff to current
2016-08-16
Simon Poole
Remove default enabling of gravatar, check on initial...
blob
|
commitdiff
|
raw
|
diff to current
2016-08-15
Tom Hughes
Merge remote-tracking branch 'openstreetmap/pull/1004'
blob
|
commitdiff
|
raw
|
diff to current
2016-07-14
Tom Hughes
Add support for GitHub authentication
blob
|
commitdiff
|
raw
|
diff to current
2016-03-20
Tom Hughes
Merge remote-tracking branch 'openstreetmap/pull/954'
blob
|
commitdiff
|
raw
|
diff to current
2016-03-14
Tom Hughes
Merge remote-tracking branch 'openstreetmap/pull/954'
blob
|
commitdiff
|
raw
|
diff to current
2016-03-09
Tom Hughes
Merge remote-tracking branch 'openstreetmap/pull/1120'
blob
|
commitdiff
|
raw
|
diff to current
2016-03-09
Tom Hughes
Merge remote-tracking branch 'openstreetmap/pull/1122'
blob
|
commitdiff
|
raw
|
diff to current
2016-02-26
Tom Hughes
Treeat user as logged in after a password reset
blob
|
commitdiff
|
raw
|
diff to current
2015-08-27
Tom Hughes
Merge remote-tracking branch 'openstreetmap/pull/891'
blob
|
commitdiff
|
raw
|
diff to current
2015-08-27
Tom Hughes
Merge remote-tracking branch 'openstreetmap/pull/903'
blob
|
commitdiff
|
raw
|
diff to current
2015-07-20
Tom Hughes
Require a valid session token to resend a confirmation
blob
|
commitdiff
|
raw
|
diff to current
2015-05-19
Tom Hughes
Add support for Windows Live authentication
blob
|
commitdiff
|
raw
|
diff to current
2015-05-19
Tom Hughes
Add support for Facebook authentication
blob
|
commitdiff
|
raw
|
diff to current
2015-04-14
Tom Hughes
Add tests for Google OAuth authentication
blob
|
commitdiff
|
raw
|
diff to current
2015-03-09
Tom Hughes
More work on user tests
blob
|
commitdiff
|
raw
|
diff to current
2015-03-08
Tom Hughes
Ever more tests...
blob
|
commitdiff
|
raw
|
diff to current
2015-03-02
Tom Hughes
Yet more tests...
blob
|
commitdiff
|
raw
|
diff to current
2015-02-25
Tom Hughes
Convert OpenID authentication to generic third party...
blob
|
commitdiff
|
raw
|
diff to current
next