summaryrefslogtreecommitdiff
path: root/spec
Commit message (Collapse)AuthorAgeFilesLines
* Fix error when deleting a user who has projectsStan Hu2015-06-231-0/+24
| | | | | Closes #1856 Closes https://github.com/gitlabhq/gitlabhq/issues/9394
* Merge branch 'rubocop-for-tests' into 'master'Dmitriy Zaporozhets2015-06-2385-491/+548
|\ | | | | | | | | | | | | | | | | | | Enable rubocop for tests too cc @DouweM @rspeicher Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !862
| * Fix rubocop issues after merge of recent masterDmitriy Zaporozhets2015-06-232-7/+7
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Merge branch 'master' into rubocop-for-testsDmitriy Zaporozhets2015-06-2380-457/+521
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: spec/features/issues_spec.rb spec/models/forked_project_link_spec.rb spec/models/hooks/service_hook_spec.rb spec/models/hooks/web_hook_spec.rb spec/models/project_services/hipchat_service_spec.rb spec/requests/api/project_members_spec.rb spec/requests/api/projects_spec.rb spec/requests/api/system_hooks_spec.rb spec/services/archive_repository_service_spec.rb spec/support/matchers.rb spec/tasks/gitlab/backup_rake_spec.rb
| * | Fix Style/NonNilCheck cop violationsrubocop-for-testsStan Hu2015-06-221-1/+1
| | |
| * | Fix Style/IndentationWidth cop violationsStan Hu2015-06-224-8/+8
| | |
| * | Fix Style/CaseIndentation cop violationsStan Hu2015-06-221-10/+10
| | |
| * | Fix Style/AlignHash cop violationsStan Hu2015-06-2215-80/+178
| | |
| * | Fix bad multi-line split from previous commitRobert Speicher2015-06-221-1/+2
| | |
| * | Fix Style/Blocks cop violationsRobert Speicher2015-06-2234-213/+197
| | |
| * | Fix Style/CommentIndentation cop violationRobert Speicher2015-06-221-7/+7
| | |
| * | Fix Style/HashSyntax violationsRobert Speicher2015-06-223-3/+3
| | |
| * | Fix Style/Not cop violationsRobert Speicher2015-06-221-2/+2
| | |
| * | Fix Style/AsciiComments cop violationRobert Speicher2015-06-221-1/+1
| | |
| * | Fix Style/SpaceInsideHashLiteralBraces cop violationsRobert Speicher2015-06-2218-45/+45
| | | | | | | | | | | | These fixes were performed automatically by Rubocop's `-a` flag.
| * | Fix Style/TrailingBlankLines cop violationsRobert Speicher2015-06-2212-26/+1
| | |
| * | Fix Style/IndentationConsistency cop violationsRobert Speicher2015-06-223-7/+5
| | |
| * | Fix part of api specs for rubocopDmitriy Zaporozhets2015-06-224-84/+84
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Remove unnecessary whitespace between let and (Dmitriy Zaporozhets2015-06-227-19/+19
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge branch 'rs-dev-issue-2414' into 'master'Dmitriy Zaporozhets2015-06-232-36/+78
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | Allow Admin to filter users by 2FA status > ![Screen_Shot_2015-06-19_at_4.38.12_PM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/deba7f2a6b8d1548c1d1ac401e0e35a1/Screen_Shot_2015-06-19_at_4.38.12_PM.png) Closes internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2414 See merge request !852
| * | Use alias_attribute to define User#two_factor_enabledrs-dev-issue-2414Robert Speicher2015-06-221-24/+0
| | |
| * | Make default value for otp_required_for_login false instead of nullRobert Speicher2015-06-201-2/+2
| | |
| * | Allow Admin to filter users by 2FA statusRobert Speicher2015-06-192-10/+76
| | |
* | | Merge branch 'fix-project-icon-links' into 'master'Dmitriy Zaporozhets2015-06-232-8/+8
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix avatar tests to use banana_sample.gif Fixes tests that were broken in f5e0e5c0 due to the purge of `gitlab_logo.png`. See merge request !866
| * | | Fix avatar tests to use banana_sample.gif since SVG is not supportedStan Hu2015-06-222-8/+8
| | | |
* | | | Merge branch 'revert-mr-state-names'Dmitriy Zaporozhets2015-06-221-3/+2
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: features/steps/project/merge_requests.rb
| * | | Merge requests API returns closed for closed and merged for merged.revert-mr-state-namesDmitriy Zaporozhets2015-06-221-3/+2
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Merge branch 'rs-rspec3' into 'master'Dmitriy Zaporozhets2015-06-2282-452/+516
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | RSpec3 Upgrades rspec to 3.3.0, we're now up-to-date! :tada: See merge request !831
| * | | Fix Gitlab::OAuth::User specrs-rspec3Robert Speicher2015-06-221-37/+48
| | | |
| * | | Add sleep call before yield in allowing_for_delayRobert Speicher2015-06-221-0/+2
| | | | | | | | | | | | | | | | | | | | This is to give pending AJAX requests time to complete before we navigate away, for example.
| * | | Change `to_not` calls to `not_to`Robert Speicher2015-06-2213-25/+25
| | | | | | | | | | | | | | | | Both work, but now we're consistent across the entire app.
| * | | Fix `raise_error` without an argument deprecation warningsRobert Speicher2015-06-228-16/+16
| | | |
| * | | Remove junk from db_cleaner spec support fileRobert Speicher2015-06-221-29/+0
| | | |
| * | | Move CapybaraHelpers to its own support fileRobert Speicher2015-06-222-33/+32
| | | | | | | | | | | | | | | | In case we end up wanting to use it in Spinach as well.
| * | | Fix GitPushService specRobert Speicher2015-06-221-4/+6
| | | |
| * | | Replace remaining references to `Note.create_cross_reference_note`Robert Speicher2015-06-224-12/+12
| | | |
| * | | Use to_reference for issue and merge request mentionable specsRobert Speicher2015-06-222-4/+4
| | | |
| * | | Update spec/features/security specsRobert Speicher2015-06-222-43/+26
| | | |
| * | | Update email_spec gemRobert Speicher2015-06-222-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | This fixes spec/mailers/notify_spec Also only require email_spec in the one place it's used
| * | | Update mock and stub syntax for specsRobert Speicher2015-06-2246-216/+268
| | | |
| * | | Update and simplify Import controller specsRobert Speicher2015-06-226-36/+75
| | | |
| * | | Fix include_module matcherRobert Speicher2015-06-221-1/+5
| | | |
| * | | Fix features syntaxRobert Speicher2015-06-221-1/+1
| | | |
| * | | Started on the actual rspec 3 upgradeJeroen van Baarsen2015-06-221-0/+1
| | | | | | | | | | | | | | | | Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
* | | | Merge branch 'rs-remove-link-to-override'Dmitriy Zaporozhets2015-06-221-37/+0
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: spec/helpers/application_helper_spec.rb
| * | | Remove overridden `link_to` helperrs-remove-link-to-overrideRobert Speicher2015-06-171-37/+0
| | | | | | | | | | | | | | | | The purpose for this override is now handled by `ExternalLinkFilter`.
* | | | Merge branch 'rs-dev-issue-2355' into 'master'Dmitriy Zaporozhets2015-06-225-15/+242
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MergeRequest#show performance improvements This is a first pass on improving the performance of the `MergeRequests#show` page. Notable changes: - The "Commits" tab is loaded lazily, so the initial page load should be much faster for MRs with many commits. - Relative timestamps via `timeago` are only initialized once per load instead of `O(n^2)`. This greatly improves frontend rendering times for a large number of commits. - Refactored `User.find_for_commit` to use a single ARel-generated SQL query instead of the old method which resulted in one query, and could result in up to three. See merge request !838
| * | | | Add MergeRequestTabs specsrs-dev-issue-2355Robert Speicher2015-06-212-0/+104
| | | | |
| * | | | Fix timezone-based time_ago_with_tooltip spec failuresRobert Speicher2015-06-191-4/+5
| | | | |
| * | | | Load the Merge Request > Commits tab lazilyRobert Speicher2015-06-171-15/+64
| | | | |
View Lorry Controller Status