summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'issue_14684' into 'master' Douwe Maan2016-05-162-2/+3
|\ | | | | | | | | | | | | Toggle email signup confirmation in admin settings Implements toggling verification email #14684 See merge request !3862
| * Change landing page when skipping confirmation email and add documentationFelipe Artur2016-05-161-2/+2
| |
| * Change skip_user_confirmation_email to send_user_confirmation_emailFelipe Artur2016-05-161-1/+1
| |
| * Toggle email signup confirmation in admin settingsFelipe Artur2016-05-161-0/+1
| |
* | Merge branch ↵Robert Speicher2016-05-161-0/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | '13691-allow-admin-to-reset-user-password-and-force-password-reset-on-next-login' into 'master' Force password change after admin reset Closes #13691. See merge request !4016
| * | Force password change after admin reset13691-allow-admin-to-reset-user-password-and-force-password-reset-on-next-loginSean McGivern2016-05-161-0/+1
| |/ | | | | | | | | | | When an admin changes a user's password for them, force the user to reset the password after logging in by expiring the new password immediately.
* | Merge branch 'docker-registry' into 'master' Douwe Maan2016-05-162-1/+89
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | Added authentication service for docker registry This adds a simple authentication service for docker which uses current user credentials to authenticate pulls and pushes. I have only one concern. Since the `.docker/config` is unencrypted, thus the password for user stored there is unencrypted, maybe we should from the start implement function to generate/provide a separate password just for the purposes of accessing docker registry? What do you think @jacobvosmaer @sytses @marin? cc @marin See merge request !3787
| * Improve JwtControllerKamil Trzcinski2016-05-141-1/+1
| |
| * Rename JWT to JSONWebTokenKamil Trzcinski2016-05-141-1/+1
| |
| * Add TODOKamil Trzcinski2016-05-141-0/+3
| |
| * Improve code design after reviewKamil Trzcinski2016-05-141-5/+2
| |
| * Use Auth::ContainerRegistryAuthenticationServiceKamil Trzcinski2016-05-141-1/+1
| |
| * Merge remote-tracking branch 'origin/master' into docker-registryKamil Trzcinski2016-05-1314-11/+83
| |\ | | | | | | | | | | | | # Conflicts: # config/initializers/1_settings.rb
| * | Improve JwtController codeKamil Trzcinski2016-05-131-18/+19
| | |
| * | Move JWT to Gitlab::JWTKamil Trzcinski2016-05-131-1/+1
| | |
| * | Fix CI testsKamil Trzcinski2016-05-121-1/+1
| | |
| * | Rename DockerAuthenticationService to ContainerRegistryAuthenticationServiceKamil Trzcinski2016-05-091-1/+1
| | |
| * | Make code more clear in what is doneKamil Trzcinski2016-05-091-4/+5
| | |
| * | Rename `images` to `container_registry`Kamil Trzcinski2016-05-091-1/+1
| | |
| * | Merge remote-tracking branch 'origin/master' into docker-registryKamil Trzcinski2016-05-0912-55/+78
| |\ \
| * | | Split docker authentication serviceKamil Trzcinski2016-05-021-101/+13
| | | |
| * | | Added JWT controllerKamil Trzcinski2016-05-021-0/+173
| | | |
| * | | Make images_enabled configurableKamil Trzcinski2016-04-291-1/+2
| | | |
* | | | Satisfy RubocopDouwe Maan2016-05-131-1/+1
| | | |
* | | | Use `@diff_notes_disabled` instead of `@comments_allowed`Douwe Maan2016-05-133-2/+2
| | | |
* | | | Extract LegacyDiffNote out of NoteDouwe Maan2016-05-134-12/+14
| |_|/ |/| |
* | | Codestyle: make sure we have space around operatorsGabriel Mazetto2016-05-132-2/+2
| | |
* | | Merge branch 'health-check-route'Douwe Maan2016-05-123-0/+33
|\ \ \ | | | | | | | | | | | | | | | | # Conflicts: # db/schema.rb
| * | | Add Changelog entryhealth-check-routeDJ Mountney2016-05-121-5/+1
| | | | | | | | | | | | | | | | and drop exception handling around HealthCheck::Utils.process_checks, it wasn't needed
| * | | Support token header for health check token, and general cleanup of the ↵DJ Mountney2016-05-111-3/+12
| | | | | | | | | | | | | | | | health_check feature.
| * | | Add health_check access token, and enforce on the health_check endpointDJ Mountney2016-05-103-0/+28
| | |/ | |/| | | | | | | Also added a health check page to the admin section for resetting the token.
* | | Merge branch 'otzy007/gitlab-ce-disable_oauth_sign_in_sources'Douwe Maan2016-05-121-1/+8
|\ \ \
| * | | delete the enabled_oauth_sign_in_sources after getting it's value into ↵Andrei Gliga2016-05-121-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | enabled_oauth_sign_in_sources just delete enabled_oauth_sign_in_sources and get it's value
| * | | Array(enabled_oauth_sign_in_sources) instead of the ifAndrei Gliga2016-05-121-1/+1
| | | |
| * | | enabled_oauth_sign_in_sources param doesn't need permitAndrei Gliga2016-05-121-1/+0
| | | |
| * | | On Application Settings Page let the user select the enabled OAuth Sign in ↵Andrei Gliga2016-05-121-8/+8
| | | | | | | | | | | | | | | | sources instead of the disabled ones
| * | | disabled_oauth_sign_in_sources parameter handling in ↵Andrei Gliga2016-05-121-1/+11
| | | | | | | | | | | | | | | | ApplicationSettingsController
* | | | Merge branch 'send-incremental-build-log' into 'master' Jacob Schatz2016-05-121-0/+8
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update build log incrementally Proof of concept implementation of incremental sending of build log to browser. cc @jschatz1 @vsizov @grzesiek @tmaczukin See merge request !3737
| * \ \ \ Merge remote-tracking branch 'origin/master' into send-incremental-build-logKamil Trzcinski2016-05-101-1/+1
| |\ \ \ \
| * | | | | Encode state as base64 stringKamil Trzcinski2016-05-091-8/+1
| | | | | |
| * | | | | Send trace to a browser incrementally when build is runningKamil Trzcinski2016-05-091-0/+15
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | We send a state of ansi2html to client, client needs to send this state back. The state describes the configuration of generator and position within trace.
* | | | | Merge branch 'fix/reuse-runner-edit-form-in-admin-area' into 'master' Rémy Coutable2016-05-122-2/+2
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reuse runners edit form in admin and project area Reuse runners edit form in admin and project area. ![reuse_runner_form](/uploads/d16e3ee196151b68f584d947f38a7c29/reuse_runner_form.png) See merge request !4094
| * | | | Share form editable attributes mf runner via modelGrzegorz Bizon2016-05-102-2/+2
| |/ / /
* | | | Merge branch 'issue_15572_snippets_tab_under_user_profile' into 'master' Douwe Maan2016-05-112-1/+23
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add snippet tab under user profile Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15572 See merge request !4001
| * \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵Long Nguyen2016-05-111-1/+1
| |\ \ \ \ | | | |/ / | | |/| | | | | | | issue_15572_snippets_tab_under_user_profile
| * | | | user routings refactorLong Nguyen2016-05-081-2/+20
| | | | |
| * | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵Long Nguyen2016-05-0513-70/+110
| |\ \ \ \ | | | |/ / | | |/| | | | | | | issue_15572_snippets_tab_under_user_profile
| * | | | Remove unused view and update redirect when destroy snippetLong Nguyen2016-05-051-1/+1
| | | | |
| * | | | Remove unused code, update spec, and update changelogLong Nguyen2016-05-051-19/+1
| | | | |
| * | | | Add snippet tab under user profileLong Nguyen2016-05-021-0/+22
| | | | |
View Lorry Controller Status