summaryrefslogtreecommitdiff
path: root/app/controllers/application_controller.rb
Commit message (Collapse)AuthorAgeFilesLines
* Implement U2F registration.Timothy Andrew2016-06-061-0/+11
| | | | | | | | | | | - Move the `TwoFactorAuthsController`'s `new` action to `show`, since the page is not used to create a single "two factor auth" anymore. We can have a single 2FA authenticator app, along with any number of U2F devices, in any combination, so the page will be accessed after the first "two factor auth" is created. - Add the `u2f` javascript library, which provides an API to the browser's U2F implementation. - Add tests for the JS components
* Add a `U2fRegistrations` table/model.Timothy Andrew2016-06-061-2/+2
| | | | | | | | | | | | | | - To hold registrations from U2F devices, and to authenticate them. - Previously, `User#two_factor_enabled` was aliased to the `otp_required_for_login` column on `users`. - This commit changes things a bit: - `User#two_factor_enabled` is not a method anymore - `User#two_factor_enabled?` checks both the `otp_required_for_login` column, as well as `U2fRegistration`s - Change all instances of `User#two_factor_enabled` to `User#two_factor_enabled?` - Add the `u2f` gem, and implement registration/authentication at the model level.
* Merge branch 'upgrade-devise-two-factor' into 'master' Robert Speicher2016-06-021-1/+1
|\ | | | | | | | | | | | | | | | | Upgrade devise, devise-two-factor, and attr_encrypted Devise 4 includes support for Rails 5, working towards #14286. devise-async doesn't support Devise 4.0 and in 4.1 the bug that was blocking using Devise's built-in ActiveJob integration was fixed. So devise-async is removed. devise-two-factor 3.0.0 is required for Devise 4 support. attr_encrypted and encryptor are optional but recommended upgrades for devise-two-factor 3.0.0. The mode and algorithm will need to be changed in order to update to attr_encrypted 4.x in the future. See merge request !4216
| * Upgrade devise and devise-two-factor, remove devise-asyncConnor Shea2016-05-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | Devise (3.5.4 => 4.1.1) Changelog: https://github.com/plataformatec/devise/blob/master/CHANGELOG.md devise-two-factor (2.0.1 => 3.0.0) Changelog: https://github.com/tinfoil/devise-two-factor/blob/master/CHANGELOG.md These are reliant on each other, so they have to be upgraded together. devise-async is no longer necessary as Devise 4.1 fixes a bug with the ActiveJob integration.
* | Add leading comment space copissue_15557Felipe Artur2016-05-311-1/+1
|/
* Codestyle: make sure we have space around operatorsGabriel Mazetto2016-05-131-1/+1
|
* Use sign out path only if not emptyArtem Sidorenko2016-05-031-1/+1
|
* Add Sentry program context even without a current userRobert Speicher2016-04-141-8/+10
|
* Include GonHelper separately and remove created_at in factoryStan Hu2016-04-141-0/+1
|
* Add spec for deletion of authorized OAuth2 applicationStan Hu2016-04-141-14/+0
| | | | | | Closes #14370 Move gon function into its own helper
* Add a `program` tag to Sentry Raven contextrs-sidekiq-sentry-contextRobert Speicher2016-04-091-0/+10
| | | | | | | | | This will let us filter errors by the program environment in which they were encountered. Source: http://stackoverflow.com/a/28370539/223897 Closes #15092
* Merge branch 'master' into issue_12658Douwe Maan2016-03-211-2/+0
|\ | | | | | | | | | | | | | | | | # Conflicts: # app/models/issue.rb # app/views/projects/_home_panel.html.haml # app/views/shared/projects/_project.html.haml # db/schema.rb # spec/models/project_spec.rb
| * Use the configured Kaminari "per page" defaultrs-use-kaminari-defaultRobert Speicher2016-03-191-2/+0
| |
* | Tweaks, refactoring, and specsDouwe Maan2016-03-201-61/+0
|/
* Move method to UserJacob Vosmaer2016-03-101-1/+1
|
* Rename ExpiringLock to ExclusiveLeaseJacob Vosmaer2016-03-101-1/+1
|
* Acquire lock before LDAP syncJacob Vosmaer2016-03-091-0/+2
|
* Fix build and add specsRubén Dávila2016-02-191-1/+8
|
* Provide explicit html format when rendering git_not_found pagers-git_not_foundRobert Speicher2016-02-151-1/+1
| | | | | Prior, if the request format was, for example, .zip, we'd get an `ActionView::MissingTemplate` error.
* Properly render the `errors/git_not_found` pageRobert Speicher2016-02-151-1/+1
|
* Various filter fixesJosh Frye2016-02-041-2/+2
|
* Paginate + ajax filter dashboard projectsJosh Frye2016-02-041-2/+3
|
* Support download access by PRIVATE-TOKEN headerStan Hu2016-02-031-0/+2
| | | | | | | | | Currently there is no way to download a raw file without embedding the token in the URL, which exposes the token in the URL. There should be an way of sending this information via the header as the API does. Closes https://github.com/gitlabhq/gitlabhq/issues/8137
* Make default sorting preference work for Issues and MRs.issue_5546Rubén Dávila2016-01-221-4/+2
|
* Merge branch 'master' into issue_5546Rubén Dávila2016-01-221-0/+1
|\
| * Merge branch 'master' into issue_3945Douwe Maan2016-01-201-0/+11
| |\
| * \ Merge branch 'master' into issue_3945Douwe Maan2016-01-201-1/+1
| |\ \
| * \ \ Merge branch 'master' into issue_3945Rubén Dávila2016-01-141-1/+1
| |\ \ \
| * | | | Change strategy to highlight diffs. #3945Rubén Dávila2016-01-071-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Now we apply syntax highlighting to the whole old and new files. This basically help us to highlight adequately multiline content.
* | | | | Make sorting preference reusable for all projects.Rubén Dávila2016-01-221-6/+15
| | | | |
* | | | | Make cookie suffix more simpler.Rubén Dávila2016-01-211-2/+2
| | | | |
* | | | | Little refactor plus some specs.Rubén Dávila2016-01-211-12/+6
| | | | |
* | | | | Remember last sort option used.Rubén Dávila2016-01-201-1/+21
| |_|_|/ |/| | |
* | | | Send user context to SentryDouwe Maan2016-01-201-0/+11
| |_|/ |/| |
* | | Consider that URL can end with '/' before redirecting. #7975issue_7975Rubén Dávila2016-01-131-1/+1
| |/ |/|
* | Sort by ID when sorting using "Recently created"Yorick Peterse2016-01-071-1/+1
|/ | | | | | | | | Sorting by "id" has the same effect as sorting by created_at while performing far better and without the need of an extra index (in case one wanted to speed up sorting by "created_at"). Sorting by "Recently updated" still uses the physical "updated_at" column as there's no way to use the "id" column for this instead.
* Fixed codestyle and added 2FA documentationfeature/force-tfaGabriel Mazetto2015-12-241-2/+2
|
* specs for forced two-factor authentication and grace periodGabriel Mazetto2015-12-241-7/+3
| | | | simplified code and fixed stuffs
* Grace period support for TFAGabriel Mazetto2015-12-241-2/+18
|
* WIP require two factor authenticationGabriel Mazetto2015-12-241-0/+12
|
* add CAS authentication supporttduehr2015-12-141-0/+15
|
* Only redirect to homepage url when its not the root urlJeroen van Baarsen2015-11-021-7/+15
| | | | | | | | | | | It was possible to create an infi redirect when the user set up the `home_page_url` to redirect to the main URL of the gitlab instance. This fix makes sure this redirect is not possible. Fixes !1020 Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
* Merge branch 'project-path-case-sensitivity' into 'master' Robert Speicher2015-10-221-1/+0
|\ | | | | | | | | | | | | Prefer project with exact path to differently cased one when both exist. Fixes #3113. See merge request !1649
| * Move case sensitivity check to find_with_namespace.Douwe Maan2015-10-211-2/+1
| |
| * Prefer project with exact path to differently cased one when both exist.Douwe Maan2015-10-201-2/+2
| |
* | Redirect to a default path if HTTP_REFERER is not setStan Hu2015-10-201-0/+4
|/ | | | | | | | | | Safari 9.0 does not yet honor the HTML5 `origin-when-cross-origin` mode, and it's possible load balancers/proxies strip the HTTP_REFERER from the request header. In these cases, default to some default path. Closes #3122 Closes https://github.com/gitlabhq/gitlabhq/issues/9731
* Merge branch 'master' into git-archive-golanggit-archive-golangDouwe Maan2015-10-151-5/+1
|\
| * Only render 404 page from /publicinified_404_errorValery Sizov2015-10-131-5/+1
| |
* | Always return HTML in git_not_foundJacob Vosmaer2015-10-141-1/+1
|/ | | | This allows us to give a nice 404 for e.g. archive.zip.
* Redirect case sensitive project path to the normalized oneFrancesco Levorato2015-09-181-1/+6
|
View Lorry Controller Status