root
/
gitlab-ce
mirror of https://gitlab.com/free-releases/gitlab-ce.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity
58,911 Commits 9,131 Branches 1,640 Tags 2 GiB
Commit Graph

50 Commits

Author SHA1 Message Date
Alexandros Keramidas 6bd94f20e3 Added authentiq provider to tests and updated documentation, gem and config file. 2017-07-18 00:12:50 +03:00
James Lopez 04bb82c8b8 update preferences controller 2017-06-23 11:41:41 +02:00
Robert Speicher a6ec5121f0 Correct RSpec/SingleLineHook cop offenses 2017-06-14 13:18:56 -05:00
Rémy Coutable 857d039145
Lint our factories creation in addition to their build 
Signed-off-by: Rémy Coutable <remy@rymai.me>
 2017-06-02 19:06:50 +02:00
Sean McGivern 5069682d8e Enable RSpec/FilePath cop 
- Ignore JS fixtures
- Ignore qa directory
- Rewrite concern specs to put concern name first
 2017-04-26 12:50:32 +01:00
Rémy Coutable 4e3516788f Don't use FFaker in factories, use sequences instead 
FFaker can generate data that randomly break our test suite. This
simplifies our factories and use sequences which are more predictive.

Signed-off-by: Rémy Coutable <remy@rymai.me>
 2017-04-03 18:54:48 +02:00
Tiago Botelho b9adf92f3c Prevent users from disconnecting gitlab account from CAS 2017-03-31 18:42:34 +01:00
Stan Hu 49d8c1c891 Simplify spec 2017-03-24 15:10:26 -07:00
Stan Hu 7cad597f6c Revert "Merge branch '8836-mr-revert' into 'master' 
This reverts commit 68e40bd49f, reversing
changes made to 2d1f823b4c.
 2017-03-16 20:18:57 -07:00
Stan Hu 203bb0bc54 Revert "Merge branch 'option-to-be-notified-of-own-activity' into 'master' 
This reverts commit 5e96668803, reversing
changes made to b35378a938.
 2017-03-15 11:51:08 -07:00
Sean McGivern 8549f7aa1e Fix access token specs 
de37dcee90 was a manual merge, which meant
it didn't have a build, so I broke master :-(
 2017-03-07 18:12:52 +00:00
Sean McGivern de37dcee90 Merge branch 'siemens/gitlab-ce-feature/openid-connect' 2017-03-07 16:16:08 +00:00
Douwe Maan 6a52cda31d Merge remote-tracking branch 'origin/personal_access_token_api_and_impersonation_token' 2017-03-07 09:29:55 -06:00
Markus Koller 8699c8338f Require explicit scopes on personal access tokens 
Gitlab::Auth and API::APIGuard already check for at least one valid
scope on personal access tokens, so if the scopes are empty the token
will always fail validation.
 2017-03-07 15:00:29 +01:00
Tiago Botelho 005749a616 apply codestyle and implementation changes to the respective feature code 2017-03-06 19:18:26 +00:00
Pawel Chojnacki d13669c98b Remove remnants of git annex 2017-03-03 18:33:47 +01:00
Tiago Botelho f0ea7130f7 refactors documentation and personal access tokens form to not allow admins to generate non impersionation tokens 2017-02-28 22:15:40 +00:00
Simon Vocella a3dfb58e7f add impersonation token 2017-02-28 22:15:39 +00:00
Simon Vocella 81246e5649 manage personal_access_tokens through api 2017-02-28 22:15:39 +00:00
Douwe Maan 7d4b52b27d Enable Style/WordArray 2017-02-23 09:32:41 -06:00
Annabel Dunstone Gray c780ad0e92 Remove all instances of theme_id; require downtime 2017-02-15 13:31:18 -06:00
Douwe Maan 99df355ec2 Merge branch '27480_deploy_keys_should_not_show_up_in_users_keys_list' into 'master' 
Make deploy key not show in User's keys list

Closes #27480

See merge request !9024
 2017-02-13 19:08:06 +00:00
Pawel Chojnacki e31b982a13 Make deploy key not show in User's keys list 2017-02-13 15:38:00 +01:00
Richard Macklin 0e2c96e709 Use `let` in Profiles::NotificationsController spec 2017-02-03 20:49:45 -08:00
Richard Macklin 946efd9fa6 Add missing newline in Profiles::NotificationsController spec 2017-02-01 11:31:22 -08:00
Richard Macklin 0a0207ea91 Add notified_of_own_activity to permitted attributes 
in Profiles::NotificationsController#update
 2017-02-01 11:31:21 -08:00
Richard Macklin 67cec150cc Add controller spec for Profiles::NotificationsController 2017-02-01 11:17:36 -08:00
Timothy Andrew f14d423dc7 Add a controller spec for personal access tokens. 
Split the existing feature spec into both feature and controller specs.
Feature specs assert on browser DOM, and controller specs assert on database
state.
 2016-12-16 16:29:32 +05:30
tiagonbotelho 519275c110 fixes part1 of files to start using active tense 2016-08-09 15:06:23 +01:00
Grzegorz Bizon 9e211091a8 Enable Style/EmptyLines cop, remove redundant ones 2016-07-01 21:56:17 +02:00
Z.J. van de Weg abca19da8b Use HTTP matchers if possible 2016-06-27 20:10:42 +02:00
Patricio Cano 2786edc931 Added CHANGELOG item and fixed Rubocop errors 2016-06-14 18:37:22 -05:00
Patricio Cano 34bf165147 Disable the unlink feature for SAML connected accounts (social login). 2016-06-14 18:28:17 -05:00
Timothy Andrew 128549f10b Implement U2F registration. 
- 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
 2016-06-06 12:50:31 +05:30
Rémy Coutable a434ffd3b3
Make /profile/keys/new redirects to /profile/keys for back-compat 
Report: https://github.com/gitlabhq/gitlabhq/issues/10138

Signed-off-by: Rémy Coutable <remy@rymai.me>
 2016-04-15 09:45:58 +02:00
Rémy Coutable 1714883107 Revert "Merge branch 'avatar-cropping' into 'master' " 
This reverts commit 01160fc061, reversing
changes made to 4bff9daf8b.
 2016-03-15 14:55:40 +01:00
Robert Speicher 93e6282657 Add `:with_avatar` trait to User factory 2016-02-24 13:50:03 -05:00
Robert Speicher dfca5bfa47 Move a few controller specs to their correct locations 2016-02-18 21:50:49 -05:00
Robert Speicher 259851c0d6 Bump devise-two-factor to 2.0.0 
Addresses internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2605

See https://github.com/tinfoil/devise-two-factor/pull/43
 2015-09-19 21:16:18 -04:00
Robert Speicher 22724418d3 Add User#disable_two_factor! 
This method encapsulates all the logic for disabling 2FA on a specific
User model.
 2015-07-10 16:18:30 -04:00
Robert Speicher 94eff65569 Fix Style/SpaceInsideHashLiteralBraces cop violations 
These fixes were performed automatically by Rubocop's `-a` flag.
 2015-06-22 14:41:00 -04:00
Robert Speicher b6318297fc Use User#two_factor_enabled instead of otp_required_for_login 2015-06-19 15:14:37 -04:00
Robert Speicher 1562f017b6 Spec the failure cases for PreferencesController#update 2015-06-13 17:59:12 -04:00
Robert Speicher 2bc4fd2d04 Add `dashboard` attribute to User model 2015-06-13 17:59:11 -04:00
Robert Speicher 821fc4b034 Add Profiles::PreferencesController 2015-06-13 17:58:15 -04:00
Robert Speicher 7b879bb8bd Bump secret key length to 32 2015-05-23 18:47:53 -04:00
Robert Speicher e73ea12695 Add support for manually entering 2FA details 2015-05-23 15:04:40 -04:00
Hannes Rosenögger 1dd0caf4d9 Merge branch 'fix-avatar-removal' into 'master' 
Fix bug where avatar filenames were not actually deleted from the database during removal

This would result in a 404 error in certain views.

The `save` call was being rolled back due to an error in the validation step.
Relax the validation step so that this works.

Closes #1570

See merge request !620
 2015-05-12 14:46:58 +00:00
Robert Speicher 414ddc0021 Clear all 2FA-related fields when user disables the feature 2015-05-09 17:32:49 -04:00
Stan Hu bf4b438459 Fix bug where avatar filenames were not actually deleted from the database during removal. 
This would result in a 404 error in certain views.

The `save` call was being rolled back due to an error in the validation step.
Relax the validation step so that this works.

Closes #1570
 2015-05-07 10:00:35 -07:00