summaryrefslogtreecommitdiff
path: root/spec/lib
Commit message (Collapse)AuthorAgeFilesLines
* Fix infinite loop when SAML was incorrectly configured.fix-authhash-infinite-loopDouwe Maan2015-08-171-4/+0
|
* markup_helper: detect .mkd and .mkdn as markdownBen Boeckel2015-08-121-1/+1
|
* Revert "Merge branch 'drop-satellites'"Dmitriy Zaporozhets2015-08-113-4/+224
| | | | | | | This reverts commit 957e849f41d96fa9778fcdd06792d2f0274b29ab, reversing changes made to 6b9dbe9f5a175a8162abf296367f561bab3eea1a. Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch 'rs-reference-data-attrs' into 'master' Robert Speicher2015-08-107-0/+64
|\ | | | | | | | | | | | | Add `data-[type]-id` attribute to reference links This is to let us redact them later in another filter. See merge request !1110
| * Add `data-[type]-id` attribute to reference linksrs-reference-data-attrsRobert Speicher2015-08-087-0/+64
| | | | | | | | This is to let us redact them later in another filter.
* | Add `Group#add_*` convenience methodsrs-group-convenience-methodsRobert Speicher2015-08-071-1/+1
|/ | | | Encapsulates the logic for `Gitlab::Access::WHATEVER` levels.
* Merge branch 'fix-branch-errors-with-encoded-slashes' into 'master'Douwe Maan2015-08-061-0/+10
|\ | | | | | | | | | | | | | | | | Fix errors deleting, creating, and viewing graphs using branches with encoded slashes * Closes #1804 * Closes #1359 See merge request !1084
| * Fix "Network" and "Graphs" pages for branches with encoded slashesStan Hu2015-08-021-0/+10
| | | | | | | | Closes #1359
* | Merge branch 'drop-satellites'Dmitriy Zaporozhets2015-08-053-224/+4
|\ \
| * | Improve tests to use real branches in merge requestsDmitriy Zaporozhets2015-08-041-4/+4
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Merge branch 'master' into drop-satellitesDmitriy Zaporozhets2015-08-042-0/+17
| |\ \ | | |/ | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Remove satellitesDmitriy Zaporozhets2015-07-152-220/+0
| | |
* | | Revert "Update noteable after a new note is added"revert_touchValery Sizov2015-08-051-4/+0
| |/ |/| | | | | This reverts commit fbdaf0e2a517660c0e4e3960f20b2d3568c33e78.
* | Add spec to RelativeLinkFilter for Unicode filenamesRobert Speicher2015-07-301-0/+16
| |
* | GoogleCode importer: Do not care about casing of image file extensionsSven Strickroth2015-07-201-0/+1
|/ | | | Signed-off-by: Sven Strickroth <email@cs-ware.de>
* Extract the longest-matching ref from a commit path when multiple matches occurStan Hu2015-07-011-2/+9
| | | | Closes #1839
* Merge branch 'master' into rubocop-for-testsDmitriy Zaporozhets2015-06-2315-103/+145
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 Gitlab::OAuth::User specrs-rspec3Robert Speicher2015-06-221-37/+48
| |
| * Change `to_not` calls to `not_to`Robert Speicher2015-06-225-10/+10
| | | | | | | | Both work, but now we're consistent across the entire app.
| * Fix `raise_error` without an argument deprecation warningsRobert Speicher2015-06-223-4/+4
| |
| * Update mock and stub syntax for specsRobert Speicher2015-06-228-53/+84
| |
* | Fix Style/IndentationWidth cop violationsStan Hu2015-06-223-5/+5
| |
* | Fix Style/CaseIndentation cop violationsStan Hu2015-06-221-10/+10
| |
* | Fix Style/AlignHash cop violationsStan Hu2015-06-222-6/+15
| |
* | Fix Style/Blocks cop violationsRobert Speicher2015-06-2211-76/+84
| |
* | Fix Style/SpaceInsideHashLiteralBraces cop violationsRobert Speicher2015-06-226-10/+10
| | | | | | | | These fixes were performed automatically by Rubocop's `-a` flag.
* | Fix Style/TrailingBlankLines cop violationsRobert Speicher2015-06-222-3/+0
| |
* | Fix Style/IndentationConsistency cop violationsRobert Speicher2015-06-221-3/+1
| |
* | Remove unnecessary whitespace between let and (Dmitriy Zaporozhets2015-06-222-2/+2
|/ | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Add init test for ProjectSearchResultsStan Hu2015-06-181-0/+23
| | | | See: https://github.com/gitlabhq/gitlabhq/pull/9368#issuecomment-110350335
* Fix behavior of ldap_person method in Gitlab::OAuth::UserAlex Lossent2015-06-171-46/+56
| | | | | Code tweaks in 45e9150a caused the ldap_person method to not return expected results. Improved tests to cover the ldap_person method, which was previously stubbed.
* Merge branch 'rs-dev-issue-2228' into 'master'Dmitriy Zaporozhets2015-06-151-0/+51
|\ | | | | | | | | | | | | | | | | | | Allow user to customize default Dashboard page Renames the "Design" profile page to "Preferences" and adds a field to customize the default Dashboard page: > ![Screen_Shot_2015-06-11_at_11.12.53_PM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/b5282a3be7861d1148528c6bc9e7a0e0/Screen_Shot_2015-06-11_at_11.12.53_PM.png) See merge request !778
| * Add Gitlab::Themes module; remove Gitlab::ThemeRobert Speicher2015-06-131-0/+51
| | | | | | | | | | | | | | Now we can simply loop through all themes, among other things. This also removes the `dark_theme` / `light_theme` classes and the `theme_type` helper, since they weren't used anywhere.
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-06-142-10/+10
|\ \
| * | Change `foo.should` syntax to `expect(foo).to` in specsRobert Speicher2015-06-132-9/+9
| | |
| * | Change `foo.should_not` syntax to `expect(foo).not_to` in specsRobert Speicher2015-06-131-1/+1
| |/
* | Merge pull request #9340 from jvanbaarsen/update-noteableDmitriy Zaporozhets2015-06-141-0/+4
|\ \ | |/ |/| Update noteable after a new note is added
| * Update noteable after a new note is addedJeroen van Baarsen2015-06-051-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | **What does this do?** It makes sure that whenever a new note is added to an noteable item, the updated_at of that item is also updated. **Why is this needed?** At this moment when you post a comment on an issue or add a label to an issue, the updated_at is not changed. Because of this the filtering for least recently updated is not really useful (since it only takes in account the original text from the noteable). Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
* | Merge branch 'cernvcs/gitlab-ce-feature/auto_link_ldap_omniauth'Douwe Maan2015-06-051-12/+154
|\ \
| * | Add option to automatically link omniauth and LDAP identitiesAlex Lossent2015-06-031-12/+154
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Until now, a user needed to first sign in with his LDAP identity and then manually link his/her account with an omniauth identity from their profile. Only when this is done can the user authenticate with the omniauth provider and at the same time benefit from the LDAP integration (HTTPS authentication with LDAP username/password and in EE: LDAP groups, SSH keys etc.). This feature automates the process by looking up a corresponding LDAP person when a user connects with omniauth for the first time and then automatically linking the LDAP and omniauth identities (of course, like the existing allow_single_sign_on setting, this is meant to be used with trusted omniauth providers). The result is identical to a manual account link. Add config initializers for other omniauth settings.
* | | Merge branch 'rs-remove-guard' into 'master'Dmitriy Zaporozhets2015-06-041-1/+0
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove Guard None of the GitLab B.V. developers were using it. See internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2360 See merge request !764
| * | | Remove unnecessary require from RepositoryCache specRobert Speicher2015-06-041-1/+0
| |/ /
* | | Merge branch 'fix-upgrader-script' into 'master'Dmitriy Zaporozhets2015-06-041-0/+15
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix upgrader script This is a fix for upgrader script not guessing the latest version correctly. Upgrader now handles versions where a version part (major/minor/patch) can have multi-digit number, also ensures that the latest version is chosen from git tags by converting tag to Gitlab::VersionInfo and than selecting the latest/greatest version. Fixes: #1476 See merge request !695
| * | Update mocking/stubbing syntax to the new RSpec 3 syntaxMartins Polakovs2015-05-301-1/+1
| | |
| * | Fix upgrader scriptMartins Polakovs2015-05-231-0/+15
| | |
* | | Merge branch 'ignore-references' into 'master'Dmitriy Zaporozhets2015-06-021-0/+24
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't notify users mentioned in code blocks or blockquotes. cc @rspeicher See merge request !753
| * | | Ignore references in blockquotes.Douwe Maan2015-06-021-0/+4
| | | |
| * | | Actually ignore references in code blocks etc.Douwe Maan2015-06-021-0/+20
| | |/ | |/|
* | | Further limit the limited whitelist for project/group descriptionsrs-more-nofollowRobert Speicher2015-06-021-2/+17
| | |
* | | Rename ReferenceFilterSpecHelper to FilterSpecHelperRobert Speicher2015-06-0214-27/+15
| | | | | | | | | | | | And make it more generalized for all filter specs.