Stan Hu a7e2f96b59 Fix logins via OAuth2 geting logged out in an hour ... Users without GitLab 2FA enabled would be logged out after an hour due to a regression in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/20700. The OAuth2 controller sets the current_user after the controller is finished, so we should only limit session times after this has been done. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/50210		2018-08-10 14:41:59 -07:00
..
bin	…
config	…
controllers	Fix logins via OAuth2 geting logged out in an hour	2018-08-10 14:41:59 -07:00
db/production	…
dependencies	…
factories	Merge branch 'ee-6470-milestone-dates-integrated-into-epics' into 'master'	2018-08-08 10:39:02 +00:00
features	Merge branch 'ce-port-3959-mirroring-interface-improvements' into 'master'	2018-08-10 12:02:12 +00:00
finders	Merge branch 'group-todos' into 'master'	2018-08-07 12:35:32 +00:00
fixtures	Merge branch 'sh-support-bitbucket-server-import' into 'master'	2018-08-06 17:32:12 +00:00
graphql	…
helpers	Add default avatar to group	2018-08-09 13:47:47 +00:00
initializers	…
javascripts	Merge branch '49375-move-reports-code' into 'master'	2018-08-09 14:34:51 +00:00
lib	Add frozen_string_literal to recently-added files from the community	2018-08-10 12:41:01 +01:00
mailers	…
migrations	Merge branch 'background-migrations-system-load' into 'master'	2018-08-06 16:16:09 +00:00
models	Merge branch '48320-cancel-a-created-job' into 'master'	2018-08-10 12:37:01 +00:00
policies	Revert "Merge branch 'bvl-instance-stats-default' into 'master'"	2018-08-06 15:44:23 +00:00
presenters	Merge branch 'issue_44821' into 'master'	2018-08-06 15:44:40 +00:00
requests	Merge branch 'group-todos' into 'master'	2018-08-07 12:35:32 +00:00
routing	…
rubocop/cop	Add rubocop check for add_reference to require index.	2018-08-08 23:30:48 +02:00
serializers	Merge branch 'master' into 'ce-port-3959-mirroring-interface-improvements'	2018-08-06 10:20:05 +00:00
services	CE Port of Protected Environments backend	2018-08-10 13:45:14 +00:00
sidekiq/cron	…
support	CE Port of Protected Environments backend	2018-08-10 13:45:14 +00:00
tasks	Add object storage related tests for `gitlab:cleanup:project_uploads` task	2018-08-03 04:36:43 +00:00
unicorn	…
uploaders	…
validators	…
views	Merge branch 'bvl-user-status-message-35463' into 'master'	2018-08-01 15:21:24 +00:00
workers	Merge branch 'group-todos' into 'master'	2018-08-07 12:35:32 +00:00
factories_spec.rb	…
fast_spec_helper.rb	…
rails_helper.rb	…
rake_helper.rb	…
simplecov_env.rb	…
spec_helper.rb	…