Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/spec/lib
AgeCommit message (Collapse)Author
2015-08-19Merge branch 'remove-satellites'Dmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-18Merge branch 'fix-authhash-infinite-loop' into 'master'Robert Speicher
Fix infinite loop when SAML was incorrectly configured. See merge request !1170
2015-08-18Merge branch 'mr-source-branch-clear-cache' into 'master'Dmitriy Zaporozhets
Clear cache to prevent listing deleted branches after MR removes source branch Closes #2272 See merge request !1160
2015-08-18Fix infinite loop when SAML was incorrectly configured.Douwe Maan
2015-08-18Merge branch 'fix-backslashes-inline-diff' into 'master'Douwe Maan
Fix bug where backslashes in inline diffs could be dropped This MR fixes a bug in inline diff generation causing backslashes to be dropped. For example, the input: ``` input.to_s.sub(/[\r\n].+/,'').sub(/\\[rn].+/, '').strip ``` The second backslash is dropped in the second `sub` statement: ![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/16e513894f7ecda1b111fe7d43e7f388/image.png) With this fix, it looks like: ![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/90fd635a937a68f1b2403740ebc75e3a/image.png) Closes #2253 See merge request !1143
2015-08-17Merge branch 'master' into remove-satellitesDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-14Clear cache to prevent listing deleted branches after MR removes source branchStan Hu
Closes #2272
2015-08-12markup_helper: detect .mkd and .mkdn as markdownBen Boeckel
2015-08-12Fix bug where backslashes in inline diffs could be droppedStan Hu
Closes #2253
2015-08-11Revert "Merge branch 'revert-satellites' into 'master' "Dmitriy Zaporozhets
This reverts commit 5daf44b7c86e0e2641a902b1da8b01d91fa3dbfa, reversing changes made to 2f706fbd231cabe7a76a5d17ac44285aaaf8592c.
2015-08-11Revert "Merge branch 'drop-satellites'"Dmitriy Zaporozhets
This reverts commit 957e849f41d96fa9778fcdd06792d2f0274b29ab, reversing changes made to 6b9dbe9f5a175a8162abf296367f561bab3eea1a. Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-10Merge branch 'rs-reference-data-attrs' into 'master' Robert Speicher
Add `data-[type]-id` attribute to reference links This is to let us redact them later in another filter. See merge request !1110
2015-08-08Add `data-[type]-id` attribute to reference linksRobert Speicher
This is to let us redact them later in another filter.
2015-08-07Add `Group#add_*` convenience methodsRobert Speicher
Encapsulates the logic for `Gitlab::Access::WHATEVER` levels.
2015-08-06Merge branch 'fix-branch-errors-with-encoded-slashes' into 'master'Douwe Maan
Fix errors deleting, creating, and viewing graphs using branches with encoded slashes * Closes #1804 * Closes #1359 See merge request !1084
2015-08-05Merge branch 'drop-satellites'Dmitriy Zaporozhets
2015-08-05Revert "Update noteable after a new note is added"Valery Sizov
This reverts commit fbdaf0e2a517660c0e4e3960f20b2d3568c33e78.
2015-08-04Improve tests to use real branches in merge requestsDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-04Merge branch 'master' into drop-satellitesDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-02Fix "Network" and "Graphs" pages for branches with encoded slashesStan Hu
Closes #1359
2015-07-31Add spec to RelativeLinkFilter for Unicode filenamesRobert Speicher
2015-07-20GoogleCode importer: Do not care about casing of image file extensionsSven Strickroth
Signed-off-by: Sven Strickroth <email@cs-ware.de>
2015-07-15Remove satellitesDmitriy Zaporozhets
2015-07-01Extract the longest-matching ref from a commit path when multiple matches occurStan Hu
Closes #1839
2015-06-23Merge branch 'master' into rubocop-for-testsDmitriy Zaporozhets
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
2015-06-23Fix Style/IndentationWidth cop violationsStan Hu
2015-06-23Fix Style/CaseIndentation cop violationsStan Hu
2015-06-23Fix Style/AlignHash cop violationsStan Hu
2015-06-22Fix Style/Blocks cop violationsRobert Speicher
2015-06-22Fix Style/SpaceInsideHashLiteralBraces cop violationsRobert Speicher
These fixes were performed automatically by Rubocop's `-a` flag.
2015-06-22Fix Style/TrailingBlankLines cop violationsRobert Speicher
2015-06-22Fix Style/IndentationConsistency cop violationsRobert Speicher
2015-06-22Remove unnecessary whitespace between let and (Dmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-22Fix Gitlab::OAuth::User specRobert Speicher
2015-06-22Change `to_not` calls to `not_to`Robert Speicher
Both work, but now we're consistent across the entire app.
2015-06-22Fix `raise_error` without an argument deprecation warningsRobert Speicher
2015-06-22Update mock and stub syntax for specsRobert Speicher
2015-06-18Add init test for ProjectSearchResultsStan Hu
See: https://github.com/gitlabhq/gitlabhq/pull/9368#issuecomment-110350335
2015-06-17Fix behavior of ldap_person method in Gitlab::OAuth::UserAlex Lossent
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.
2015-06-15Merge branch 'rs-dev-issue-2228' into 'master'Dmitriy Zaporozhets
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
2015-06-14Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets
2015-06-14Merge pull request #9340 from jvanbaarsen/update-noteableDmitriy Zaporozhets
Update noteable after a new note is added
2015-06-14Change `foo.should` syntax to `expect(foo).to` in specsRobert Speicher
2015-06-14Change `foo.should_not` syntax to `expect(foo).not_to` in specsRobert Speicher
2015-06-14Add Gitlab::Themes module; remove Gitlab::ThemeRobert Speicher
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.
2015-06-05Update noteable after a new note is addedJeroen van Baarsen
**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>
2015-06-05Merge branch 'cernvcs/gitlab-ce-feature/auto_link_ldap_omniauth'Douwe Maan
2015-06-04Merge branch 'rs-remove-guard' into 'master'Dmitriy Zaporozhets
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
2015-06-04Merge branch 'fix-upgrader-script' into 'master'Dmitriy Zaporozhets
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
2015-06-04Remove unnecessary require from RepositoryCache specRobert Speicher