summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Expand)AuthorAgeFilesLines
* Move repository when project is removedDmitriy Zaporozhets2015-06-031-10/+7
* Merge branch 'feature/sso_integration' into 'master'Douwe Maan2015-06-021-0/+16
|\
| * Add an option to automatically sign-in with an Omniauth provider without show...Alex Lossent2015-05-291-0/+16
* | Allow to configure a URL to show after sign outAlex Lossent2015-05-292-1/+2
|/
* Merge branch 'leave-project' into 'master'Dmitriy Zaporozhets2015-05-291-1/+5
|\
| * Add ability to leave projectDmitriy Zaporozhets2015-05-291-1/+5
* | Merge branch 'user-oauth-applications' into 'master'Dmitriy Zaporozhets2015-05-292-0/+9
|\ \
| * | Add option to disallow users from registering any application to use GitLab a...user-oauth-applicationsDouwe Maan2015-05-292-0/+9
| |/
* | Merge branch 'leave-group' into 'master'Dmitriy Zaporozhets2015-05-291-1/+5
|\ \ | |/ |/|
| * User should be able to leave group. If not - show him proper messageDmitriy Zaporozhets2015-05-291-1/+5
* | Merge branch 'feature/saml_support' into 'master'Douwe Maan2015-05-291-0/+3
|\ \ | |/ |/|
| * Add SAML support via OmniauthAlex Lossent2015-05-271-0/+3
* | Add MergeRequests#commits action and routeRobert Speicher2015-05-291-5/+12
* | Fix current user removaluser-destroy-wo-groupsDmitriy Zaporozhets2015-05-281-1/+1
* | You can not remove user if he/she is an only owner of groupDmitriy Zaporozhets2015-05-282-6/+2
* | Set milestone on new issue when creating issue from index with milestone filt...Douwe Maan2015-05-271-4/+4
|/
* Merge branch 'rs-manual-2fa-entry' into 'master'Dmitriy Zaporozhets2015-05-271-1/+2
|\
| * Bump secret key length to 32rs-manual-2fa-entryRobert Speicher2015-05-231-1/+1
| * Add support for manually entering 2FA detailsRobert Speicher2015-05-231-1/+2
* | Add support for Webhook note eventsStan Hu2015-05-211-1/+1
|/
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-05-182-2/+18
|\
| * Add search issues/MR by numberNikita Verkhovin2015-05-182-2/+18
* | Fill in email on the new password formVinnie Okada2015-05-161-1/+1
* | Redirect if password reset token is expiredVinnie Okada2015-05-161-0/+20
|/
* Refactor SessionsController to use a controller concernrs-refactor-2faRobert Speicher2015-05-142-9/+33
* Merge branch 'text-batch-1' into 'master'Dmitriy Zaporozhets2015-05-131-2/+9
|\
| * Improve OAuth signup error message.Douwe Maan2015-05-131-2/+9
* | Merge branch 'version-check' into 'master'Dmitriy Zaporozhets2015-05-131-0/+1
|\ \ | |/ |/|
| * Fix syntax errorDmitriy Zaporozhets2015-05-081-1/+1
| * Merge branch 'version-check' into gl-version-checkDmitriy Zaporozhets2015-05-081-0/+1
| |\
| | * Add feature to disable version checkDmitriy Zaporozhets2015-03-101-1/+2
* | | Merge branch '2fa' into 'master'Dmitriy Zaporozhets2015-05-124-3/+124
|\ \ \
| * | | Handle password reset for users with 2FA enabled2faRobert Speicher2015-05-111-0/+21
| * | | Clear all 2FA-related fields when user disables the featureRobert Speicher2015-05-091-2/+7
| * | | Prevent "You are already signed in." error message upon 2FA loginRobert Speicher2015-05-091-2/+8
| * | | Move "invalid 2FA code" error message to the flashRobert Speicher2015-05-091-1/+1
| * | | Refactor SessionsControllerRobert Speicher2015-05-091-22/+25
| * | | Fix nav and layout for TwoFactorAuthsControllerRobert Speicher2015-05-091-1/+1
| * | | Make two-factor login work and add a feature specRobert Speicher2015-05-091-7/+24
| * | | Fix Devise parameter sanitizer for otp_attemptRobert Speicher2015-05-091-1/+1
| * | | Don't use hard-coded sign_in pathRobert Speicher2015-05-091-1/+1
| * | | prepend_before_filter -> prepend_before_actionRobert Speicher2015-05-091-1/+1
| * | | Render 2fa recovery codes instead of downloading itDmitriy Zaporozhets2015-05-091-3/+3
| * | | Add support for backup codesDmitriy Zaporozhets2015-05-092-1/+8
| * | | Turn 2-factor authentication into 2 steps process. Disabled 2fa UI for ldap u...Dmitriy Zaporozhets2015-05-092-1/+25
| * | | Fix rubocop complainDmitriy Zaporozhets2015-05-091-1/+0
| * | | Make 2 factor authentication workDmitriy Zaporozhets2015-05-091-7/+24
| * | | Create Two-factor authentication resource for userDmitriy Zaporozhets2015-05-091-0/+22
* | | | Merge branch 'create-merge-request' into 'master'Dmitriy Zaporozhets2015-05-111-1/+2
|\ \ \ \
| * | | | Link Commits tab to current branch from Compare page.Douwe Maan2015-05-091-1/+2
| |/ / /
View Lorry Controller Status