summaryrefslogtreecommitdiff
path: root/spec
Commit message (Collapse)AuthorAgeFilesLines
* Absorb gitlab_gitRobert Speicher2017-01-0417-0/+3667
|
* Merge branch 'recaptcha_500' into 'master' Rémy Coutable2017-01-041-15/+45
|\ | | | | | | | | Properly handle failed reCAPTCHA on user registration See merge request !8403
| * Properly handle failed reCAPTCHA on user registrationDrew Blessing2017-01-031-15/+45
| | | | | | | | | | | | | | | | If a user presses the 'Register' button too quickly after attempting to solve the reCAPTCHA, or the reCAPTCHA is not solved at all, the user would experience a 500 error. Now, the case is properly handled and the user will be sent back to the registration page with a clear error message and can try again.
* | Merge branch 'add_email_password_confirmation' into 'master' Douwe Maan2017-01-042-17/+22
|\ \ | | | | | | | | | | | | | | | | | | Add email confirmation field to registration form Closes #3053 See merge request !7432
| * | Add email and password confirmation fields to registration formDrew Blessing2017-01-032-17/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's too easy to mistype an email or password when signing up. The support team is receiving an increasing number of requests because users mistype their email. We can eliminate this problem by requiring users to confirm the email before registering. The same issue can occur for the password field so we should add this, too. We should note that password confirmation is part of the default Devise forms. I don't know why/when GitLab removed it.
* | | Merge branch 'rs-remove-unused-method' into 'master' Douwe Maan2017-01-041-8/+0
|\ \ \ | | | | | | | | | | | | | | | | Remove unused `Project#web_url_without_protocol` method See merge request !8416
| * | | Remove unused `Project#web_url_without_protocol` methodrs-remove-unused-methodRobert Speicher2017-01-031-8/+0
| | | |
* | | | Merge branch 'fix-api-project-hooks-params' into 'master' Sean McGivern2017-01-041-2/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix project hooks params Closes #26291 See merge request !8425
| * | | | Fix project hooks paramsfix-api-project-hooks-paramsRobert Schilling2017-01-031-2/+3
| | | | |
* | | | | Merge branch 'ldap_person_attributes' into 'master' include-uncovered-jasmineRobert Speicher2017-01-031-0/+44
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Gitlab::LDAP::Person uses LDAP attributes configuration Closes #26290 See merge request !8418
| * | | | Gitlab::LDAP::Person uses LDAP attributes configurationDrew Blessing2017-01-031-0/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We allow users to configure LDAP attribute preferences. For example, email can be configured to use `mail`, `email` and `userPrincipalName`, falling through to the next until a value is found. Prior to this change, Gitlab::LDAP::Person did not honor this configuration. Now, the class will honor `name` and `mail` configuration. It does not handle `username`, or fallback to `first_name` + `last_name` in the absence of `name`.
* | | | | Merge branch ↵Fatih Acet2017-01-031-0/+48
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '25836-changing-from-version-in-diff-comparison-does-not-preserve-to-version' into 'master' Resolve changing "from" version in diff comparison does not preserve "to" version Closes #25836 See merge request !8328
| * | | | | Preserve selected versions when comparing MR changes25836-changing-from-version-in-diff-comparison-does-not-preserve-to-versionSam Rose2016-12-311-0/+48
| | | | | |
* | | | | | Merge branch '26168-emoji-reactions-missing-tooltip-when-not-logged-in' into ↵Fatih Acet2017-01-032-5/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Disable award emoji button but display tooltip Closes #26168 See merge request !8382
| * | | | | | Disable award emoji button but display tooltip26168-emoji-reactions-missing-tooltip-when-not-logged-inSam Rose2016-12-312-5/+5
| |/ / / / /
* | | | | | Merge branch 'use-stable-icon-url' into 'master' Kamil Trzciński2017-01-031-0/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use stable icon for Mattermost integration See merge request !8252
| * | | | | | Rename logo, apply for Slack tooZ.J. van de Weg2017-01-031-0/+6
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'project-avatar-fork' into 'master' Sean McGivern2017-01-033-7/+20
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Copy, don't move uploaded avatar files Closes #26158 See merge request !8396
| * | | | | Don't delete files from spec/fixturesJacob Vosmaer2017-01-031-3/+3
| | | | | |
| * | | | | Copy, don't move uploaded avatar filesJacob Vosmaer2017-01-032-4/+17
| | |/ / / | |/| | |
* | | | | Merge branch 'fix/cross-project-ref-path' into 'master' Sean McGivern2017-01-034-1/+19
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | Fix cross-project references copy to include the project reference Closes #25890 See merge request !8232
| * | | | Fix cross-project references copy to include the project referencefix/cross-project-ref-pathJames Lopez2017-01-034-1/+19
| | |/ / | |/| | | | | | | | | | Also added relevant specs and refactored to_references in a bunch of places to be more consistent.
* | | | Merge branch 'add-tests-to-cycle-analytics' into 'master' 26257-tooltip-hidden-pipeline-dropdownSean McGivern2017-01-031-0/+126
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Add tests to cycle analytics See merge request !7727
| * | | | Improve specAlfredo Sumaran2017-01-021-11/+9
| | | | |
| * | | | Add feature tests for Cycle AnalyticsAlfredo Sumaran2017-01-021-0/+128
| | |/ / | |/| |
* | | | Merge branch 'api-fix-extern-uid-validation' into 'master' Sean McGivern2017-01-031-2/+2
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | API: extern_uid is a string Closes #26227 See merge request !8404
| * | | API: extern_uid is a stringapi-fix-extern-uid-validationRobert Schilling2017-01-031-2/+2
| |/ /
* | | Merge branch 'remove-timezone-assertion-datetime-on-tooltips-spec' into ↵Alfredo Sumaran2017-01-021-1/+1
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | 'master' Remove time zone information from assertion in timeago tooltips spec Closes #26183 See merge request !8374
| * | Remove time zone information from assertion in timeago tooltips specremove-timezone-assertion-datetime-on-tooltips-specAdam Niedzielski2016-12-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | This allows the test to pass when your local time zone is different than UTC. "Date Format" JavaScript library uses a custom, non-standard format when displaying time zone part of the datetime. There is no point in trying to replicate this behavior in Ruby.
* | | Merge branch '18556-polish-up-the-u2f-flow' into 'master' 26172-stages-icons-on-pipelines-page-skewedFatih Acet2016-12-303-55/+90
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Improved the u2f flow Closes #18556 See merge request !8304
| * | | Improved the u2f flow18556-polish-up-the-u2f-flowLuke "Jared" Bennett2016-12-273-55/+90
| | | | | | | | | | | | | | | | Added tests
* | | | Merge branch 'fix-default-sort-order-spec-failures' into 'master' Sean McGivern2016-12-301-8/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix failures in default sort order spec See merge request !8379
| * | | | Fix failures in default sort order specAdam Niedzielski2016-12-301-8/+2
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test cases were not waiting for page load after clicking. This caused failures in test cases that were executed right after these incorrect ones, because of requests hitting server after a test was finished. We do not have to click links, we can go directly to a correct page by passing parameters in the URL.
* | | | Merge branch 'issue_25578' into 'master' Sean McGivern2016-12-301-1/+31
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Fix redirect after update file when user has forked project Closes #25578 See merge request !8371
| * | | Fix redirect after update file when user has forked projectFelipe Artur2016-12-291-1/+31
| | | |
* | | | Merge branch 'feature/admin-merge-groups-and-projects' into 'master' Sean McGivern2016-12-301-0/+17
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merged the 'groups' and 'projects' tabs when viewing user profiles Closes #24752 See merge request !8323
| * | | | Merged the 'groups' and 'projects' tabs when viewing user profilesJames Gregory2016-12-291-0/+17
| | | | |
* | | | | Fix typo: seach to searchfix-boards-search-typovictorwu2016-12-291-3/+3
|/ / / /
* | | | Merge branch '25996-Move-award-emoji-out-of-the-discussion-tab-for-MR' into ↵Fatih Acet2016-12-291-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Move award emoji's out of the discussion tab for merge requests Closes #25996 See merge request !8358
| * | | | Fix MR versions spec25996-Move-award-emoji-out-of-the-discussion-tab-for-MRAnnabel Dunstone Gray2016-12-291-2/+2
| | | | |
* | | | | Merge branch 'issue_25682' into 'master' Sean McGivern2016-12-292-1/+22
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | Parse JIRA issue references even if Issue Tracker is disabled Closes #25682 See merge request !8238
| * | | | Parse JIRA issue references even if Issue Tracker is disabledFelipe Artur2016-12-292-1/+22
| | | | |
* | | | | Merge branch 'dz-nested-group-misc' into 'master' Dmitriy Zaporozhets2016-12-292-4/+40
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Miscellaneous improvements to the nested groups feature See merge request !8308
| * | | | | Refactor nested group related codedz-nested-group-miscDmitriy Zaporozhets2016-12-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Simplify code around group parent access check * Rename 'Nested groups' to 'Subgroups' tab at group#show page Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | Show nested groups tab on group pageDmitriy Zaporozhets2016-12-261-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | Add nested groups support to the Groups::CreateServiceDmitriy Zaporozhets2016-12-261-4/+27
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | Merge branch 'grapify-settings-api' into 'master' Sean McGivern2016-12-291-2/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Grapify the settings API See merge request !8336
| * | | | | | Grapify the settings APIgrapify-settings-apiRobert Schilling2016-12-291-2/+1
| | | | | | |
* | | | | | | Merge branch 'dz-fix-milestones-spec' into 'master' Dmitriy Zaporozhets2016-12-291-0/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix RoutingError at ./spec/features/milestones/milestones_spec.rb See merge request !8361
| * | | | | | | Wait for ajax request to complete when testing milestont drang-n-drop featureDmitriy Zaporozhets2016-12-291-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
View Lorry Controller Status