summaryrefslogtreecommitdiff
path: root/spec/models
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | Merge branch 'fix-jira-integration' into 'master'Rémy Coutable2017-08-041-0/+9
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Ensure `JIRA::Resource::Issue` responds to `resolution` before calling it See merge request !13240
| * | | | Ensure `JIRA::Resource::Issue` responds to `resolution` before calling itMehdi Lahmam2017-08-031-0/+9
| | | | |
* | | | | Merge branch 'use-rspec-support-helper' into 'master'Rémy Coutable2017-08-035-21/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Don't include EmailHelpers manually, pick with rspec See merge request !13257
| * | | | | Don't include EmailHelpers manually, pick with rspecuse-rspec-support-helperLin Jen-Shin2017-08-035-21/+5
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `:mailer` is needed to pick it easily, while `type: :mailer` is needed for picking it automatically for tests located in spec/mailers/*_spec.rb It's a bit complicated in spec/services/notification_service_spec.rb but we'll leave it alone for now.
* | | | | fix #35133 strip new lines from ssh keyshaseeb2017-08-031-6/+8
|/ / / /
* | | | Change all `:empty_project` to `:project`rs-empty_project-defaultRobert Speicher2017-08-0271-356/+356
| |/ / |/| |
* | | Ensure all project factories use `:repository` trait or `:empty_project`rs-empty_project-cleanupRobert Speicher2017-08-0125-36/+36
|/ /
* | Merge branch '33620-remove-events-from-notification_settings' into 'master'Douwe Maan2017-08-011-8/+4
|\ \ | | | | | | | | | | | | | | | | | | Resolve "Remove `events` from `notification_settings`" Closes #33620 See merge request !13152
| * | Remove events column from notification settings33620-remove-events-from-notification_settingsSean McGivern2017-07-311-8/+4
| |/ | | | | | | | | This was migrated to separate columns in 9.4, and now just needs to be removed for real.
* | Merge branch '28283-legacy-storage-format' into 'master'Sean McGivern2017-08-018-28/+60
|\ \ | | | | | | | | | | | | [CE] Added Legacy Storage format See merge request !13149
| * | Rename more path_with_namespace -> full_path or disk_pathGabriel Mazetto2017-08-011-7/+11
| | |
| * | Rename path_with_namespace -> disk_path when dealing with the filesystemGabriel Mazetto2017-08-013-10/+10
| | |
| * | Rename many path_with_namespace -> full_pathGabriel Mazetto2017-08-015-11/+39
| |/
* | Exclude keys linked to other projectsmk-fix-deploy-key-deletionMichael Kozono2017-07-281-9/+33
|/
* Ensure Gitlab::Application.routes.default_url_options are set correctly in ↵Rémy Coutable2017-07-281-1/+1
| | | | | | Capybara + :js specs Signed-off-by: Rémy Coutable <remy@rymai.me>
* fix merge missShinya Maeda2017-07-281-0/+4
|
* initShinya Maeda2017-07-283-4/+15
|
* Merge branch '32483-jira-error' into 'master'Sean McGivern2017-07-281-7/+24
|\ | | | | | | | | | | | | Display specific error message when JIRA test fails Closes #32483 See merge request !13100
| * Display specific error message when JIRA test fails32483-jira-errorJarka Kadlecova2017-07-271-7/+24
| |
* | Merge branch '1827-prevent-concurrent-editing-wiki' into 'master'Robert Speicher2017-07-271-0/+36
|\ \ | | | | | | | | | | | | | | | | | | Prevent concurrent editing wiki Closes #1827 See merge request !9707
| * | Encapsulate the commit.sha logicHiroyuki Sato2017-07-271-4/+26
| | |
| * | Refactor: use keyword arguments for optional parametersHiroyuki Sato2017-07-231-2/+2
| | |
| * | Change double quotes to single quotesHiroyuki Sato2017-07-231-7/+7
| | |
| * | Merge branch 'master' into 1827-prevent-concurrent-editing-wikiHiroyuki Sato2017-07-23159-3961/+10710
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: app/controllers/projects/wikis_controller.rb app/views/projects/wikis/edit.html.haml spec/features/projects/wiki/user_updates_wiki_page_spec.rb
| * | | Prevent concurrent editing wikiHiroyuki Sato2017-03-081-0/+14
| | | |
* | | | Merge branch 'feature/gpg-signed-commits' into 'master'Dmitriy Zaporozhets2017-07-273-0/+205
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GPG signed commits Closes #20268 See merge request !9546
| * | | | improve gpg key validationAlexis Reigel2017-07-271-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when omitting the end part of the key ('-----END PGP PUBLIC KEY BLOCK-----') the error message was not about the key anymore, but about the missing fingerprint and primary_keyid, which was confusing for the user. the new validation checks that the end also matches the expected format.
| * | | | validate the foreign_key instead of the relationAlexis Reigel2017-07-271-1/+1
| | | | |
| * | | | simplify nil handlingAlexis Reigel2017-07-271-0/+4
| | | | |
| * | | | store gpg user name and email on the signatureAlexis Reigel2017-07-271-3/+23
| | | | |
| * | | | user may now revoke a gpg keyAlexis Reigel2017-07-271-0/+27
| | | | | | | | | | | | | | | | | | | | | | | | | other than just removing a key, which doesn't affect the verified state of a commit, revoking a key unverifies all signed commits.
| * | | | simplify fetching of commitAlexis Reigel2017-07-271-0/+13
| | | | |
| * | | | validate presence of user on gpg_keyAlexis Reigel2017-07-271-0/+1
| | | | |
| * | | | use hash instead of 2d arrayAlexis Reigel2017-07-271-4/+4
| | | | |
| * | | | remove the :gpg rspec tagAlexis Reigel2017-07-271-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | since everything (except the CurrentKeyChain method) operates on a tempoary keychain anyway we don't need this anymore.
| * | | | update invalid gpg signatures when email changesAlexis Reigel2017-07-271-0/+20
| | | | |
| * | | | store gpg_key_primary_keyid for unknown gpg keysAlexis Reigel2017-07-271-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | we need to store the keyid to be able to update the signature later in case the missing key is added later.
| * | | | move signature cache read to Gpg::CommitAlexis Reigel2017-07-271-82/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | as we write the cache in the gpg commit class already the read should also happen there. This also removes all logic from the main commit class, which just proxies the call to the Gpg::Commit now.
| * | | | gpg signature is only valid when key is verifiedAlexis Reigel2017-07-271-0/+16
| | | | |
| * | | | cache the gpg commit signatureAlexis Reigel2017-07-271-23/+65
| | | | | | | | | | | | | | | | | | | | | | | | | we store the result of the gpg commit verification in the db because the gpg verification is an expensive operation.
| * | | | gpg signature model for gpg verification cachingAlexis Reigel2017-07-271-0/+14
| | | | |
| * | | | verify gpg commit using tmp keyring and db queryAlexis Reigel2017-07-271-2/+2
| | | | |
| * | | | add primary keyid attribute to gpg keysAlexis Reigel2017-07-271-0/+8
| | | | |
| * | | | don't sync to keychain fileAlexis Reigel2017-07-272-107/+8
| | | | |
| * | | | remove gpg from keychain when user's email changesAlexis Reigel2017-07-272-24/+76
| | | | |
| * | | | notification email on add new gpg keyAlexis Reigel2017-07-271-0/+14
| | | | |
| * | | | gpg email verificationAlexis Reigel2017-07-271-3/+42
| | | | |
| * | | | move current keychain methods to namespaceAlexis Reigel2017-07-271-3/+5
| | | | |
| * | | | test with a gpg key with multiple emailsAlexis Reigel2017-07-271-1/+1
| | | | |
| * | | | use example gpg key instead of my ownAlexis Reigel2017-07-271-4/+4
| | | | |
View Lorry Controller Status