summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Expand)AuthorAgeFilesLines
* 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
| |/ / /
* | | | Don't symbolize params.params-to-symDouwe Maan2015-05-111-5/+5
|/ / /
* | | Added X-GitLab-Event header for web hooksbugagazavr2015-05-081-1/+1
|/ /
* | Merge branch 'fix-escaped-branches-in-compare' into 'master'Douwe Maan2015-05-041-2/+4
|\ \
| * | Unescape branch names in compare commitStan Hu2015-04-301-2/+4
* | | Merge pull request #9234 from dsander/group-milestones-by-titleDmitriy Zaporozhets2015-05-031-25/+0
|\ \ \
| * | | Removed unused ApplicationController#set_filter_values methodDominik Sander2015-05-011-25/+0
* | | | Merge branch 'change-primary-email' into 'master'Dmitriy Zaporozhets2015-05-032-7/+7
|\ \ \ \
| * | | | Allow primary email to be set to an email that you've already added.change-primary-emailDouwe Maan2015-04-302-7/+7
| | |/ / | |/| |
* | | | Add application setting to restrict user signups to e-mail domainsStan Hu2015-05-021-1/+2
* | | | Fix title on user page.you-get-a-title-and-you-get-a-title-and-everyone-gets-a-titleDouwe Maan2015-05-011-3/+0
* | | | Add helpers for header title and sidebar, and move setting those from control...Douwe Maan2015-05-0115-98/+28
* | | | Set head panel title of help section.Douwe Maan2015-04-301-0/+7
* | | | Fix Profiles::PasswordsController.Douwe Maan2015-04-301-1/+1
* | | | before_action > before_filter.Douwe Maan2015-04-301-1/+1
* | | | Remove an old determine_layout call.Douwe Maan2015-04-301-2/+0
* | | | Add a page title to every page.Douwe Maan2015-04-3034-108/+118
* | | | Merge branch 'show-invalid-projects-google-code-import' into 'master'Douwe Maan2015-04-301-0/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | Show incompatible projects in Google Code import statusStan Hu2015-04-301-0/+1
| |/ /
* | | Don't allow a merge request to be merged when its title starts with "WIP".Douwe Maan2015-04-301-2/+2
|/ /
* | Draft improvements to search layoutDmitriy Zaporozhets2015-04-281-3/+6
* | Merge branch 'rs-issue-2269' into 'master'Dmitriy Zaporozhets2015-04-281-12/+0
|\ \
| * | Remove duplicate settings for default_url_optionsRobert Speicher2015-04-251-12/+0
* | | Merge pull request #8645 from chulkilee/hipchat-api-versionDmitriy Zaporozhets2015-04-271-1/+1
|\ \ \
| * | | Add api version property on hipchat serviceChulki Lee2015-04-271-1/+1
* | | | Revert "Added X-GitLab-Event header for web hooks"Valery Sizov2015-04-271-1/+1
|/ / /
View Lorry Controller Status