summaryrefslogtreecommitdiff
path: root/spec/lib
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Merge branch 'revert-f2421b2b' into 'master'"revert-2f46c3a8Annabel Dunstone Gray2017-09-112-2/+58
| | | This reverts merge request !14148
* Revert "Merge branch ↵revert-f2421b2bRubén Dávila2017-09-082-58/+2
| | | | | '35012-navigation-add-option-to-change-navigation-color-palette' into 'master'" This reverts merge request !13619
* Merge branch 'rs-issue-36104' into 'security-9-5'Douwe Maan2017-09-071-0/+12
| | | | | [9.5] Disallow the `name` attribute on all user-provided markup See merge request gitlab/gitlabhq!2166
* Merge branch 'rs-issue-36098' into 'security-9-5'Robert Speicher2017-09-071-3/+17
| | | | | [9.5] Limit `style` attribute on `th` and `td` elements to specific properties See merge request gitlab/gitlabhq!2155
* Merge branch 'dm-go-get-xss' into 'security-9-3'Robert Speicher2017-09-071-1/+17
| | | | | Fix XSS issue in go-get handling See merge request !2128
* Merge branch ↵Douwe Maan2017-09-071-0/+12
|\ | | | | | | | | | | | | | | | | '35558-only-one-garbage-collection-should-be-running-per-project-at-once' into 'master' Adds exclusive lease to Git garbage collect worker. Closes #35558 See merge request !14036
| * Adds exclusive lease to Git garbage collect worker.35558-only-one-garbage-collection-should-be-running-per-project-at-onceTiago Botelho2017-09-071-0/+12
| |
* | Gitaly feature toggles are on by default in development environmentsAndrew Newdigate2017-09-071-0/+16
| |
* | Merge remote-tracking branch 'origin/master' into ↵Kamil Trzcinski2017-09-075-96/+61
|\ \ | | | | | | | | | zj/gitlab-ce-zj-auto-devops-table
| * \ Merge branch ↵Sean McGivern2017-09-072-2/+58
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '35012-navigation-add-option-to-change-navigation-color-palette' into 'master' Add option to change navigation color palette Closes #35012 See merge request !13619
| | * | Add previews in preferencesAnnabel Dunstone Gray2017-09-061-1/+1
| | | |
| | * | Use `table` helper in migration specsSean McGivern2017-09-061-0/+1
| | | |
| | * | Don't depend on user model in migration specSean McGivern2017-09-061-2/+9
| | | | | | | | | | | | | | | | | | | | The User model now has a default value for a field that didn't exist when these migrations ran.
| | * | Add blue themeAnnabel Dunstone Gray2017-09-061-3/+3
| | | |
| | * | Add functionality for two themesAnnabel Dunstone Gray2017-09-061-5/+5
| | | |
| | * | Restore some changes from !9199Rubén Dávila2017-09-061-0/+48
| | | |
| * | | Merge branch 'events-migration-cleanup' into 'master'Sean McGivern2017-09-074-94/+3
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Finish migration to the new events setup Closes #37241 See merge request !13932
| | * | | Finish migration to the new events setupevents-migration-cleanupYorick Peterse2017-09-064-94/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This finishes the procedure for migrating events from the old format into the new format. Code no longer uses the old setup and the database tables used during the migration process are swapped, with the old table being dropped. While the database migration can be reversed this will 1) take a lot of time as data has to be coped around 2) won't restore data in the "events.data" column as we have no way of restoring this. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/37241
* | | | | Merge branch 'master' into zj-auto-devops-tablezj/gitlab-ce-zj-auto-devops-tableZeger-Jan van de Weg2017-09-071-0/+3
|\ \ \ \ \ | |/ / / /
| * | | | Implement fix for n+1 issue on `flatten_tree` helpergitaly-tree-entries-fixAlejandro Rodríguez2017-09-061-0/+3
| | |_|/ | |/| |
* | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵Kamil Trzcinski2017-09-0610-140/+597
|\ \ \ \ | |/ / / | | | | | | | | zj/gitlab-ce-zj-auto-devops-table
| * | | Merge branch 'anakashima/gitlab-ce-fix_wiki_toc_indent' into 'master'Sean McGivern2017-09-061-0/+36
| |\ \ \ | | |_|/ | |/| | | | | | | | | | Wiki table of contents are now properly nested to reflect header level See merge request !13909
| | * | Space before closing braceRobert Speicher2017-09-061-2/+2
| | | |
| | * | Refactor TableOfContentsFilter's nested table of contentsRobert Speicher2017-09-061-30/+34
| | | | | | | | | | | | | | | | Most of the logic is now self-contained within the `HeaderNode` class.
| | * | Fix indentation level in Wiki's TOC items to regard header levelAkihiro Nakashima2017-09-061-6/+38
| | | |
| * | | Merge branch 'feature/migrate-branch-operations-to-gitaly' into 'master'37407-error-500-when-creating-a-project-createservice-returns-a-nil-objectRobert Speicher2017-09-061-29/+56
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Migrate creating/deleting a branch to Gitaly See merge request !13864
| | * | | Migrate creating/deleting a branch to Gitalyfeature/migrate-branch-operations-to-gitalyAhmad Sherif2017-09-061-29/+56
| | | | |
| * | | | Merge branch ↵Douwe Maan2017-09-063-44/+101
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '34509-improves-markdown-rendering-performance-for-commits-list' into 'master' Resolve "Projects::CommitsController#show is slow partially due to SQL queries" Closes #34509 See merge request !13762
| | * | | Adds cacheless render to Banzai object render34509-improves-markdown-rendering-performance-for-commits-listTiago Botelho2017-09-063-44/+101
| | | | |
| * | | | Merge branch 'url-sanitizer-fixes' into 'master'Douwe Maan2017-09-061-50/+129
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix problems sanitizing URLs with empty passwords Closes gitlab-ee#3352 See merge request !14083
| | * | | | Remove blank passwords from sanitized URLsNick Thomas2017-09-061-51/+129
| | | | | |
| | * | | | Backport EE fixes to Gitlab::UrlSanitizer to CENick Thomas2017-09-061-0/+1
| | |/ / /
| * | | | Merge branch 'feature/gb/download-single-job-artifact-using-api' into 'master'Kamil Trzciński2017-09-061-0/+64
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add API endpoint for downloading a single job artifact Closes #37196 See merge request !14027
| | * \ \ \ Merge commit 'd1b60cbc67dc14b21820ef3f823a8e1ea851697d' into ↵Grzegorz Bizon2017-09-0613-106/+572
| | |\ \ \ \ | | | | |_|/ | | | |/| | | | | | | | | | | | | | | | | | | | feature/gb/download-single-job-artifact-using-api * commit 'd1b60cbc67dc14b21820ef3f823a8e1ea851697d': (210 commits)
| | * | | | Extract a class that represents artifacts file pathGrzegorz Bizon2017-09-051-0/+64
| | | | | |
| * | | | | Merge branch '35942_api_binary_encoding' into 'master'Sean McGivern2017-09-061-0/+19
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | API fix for non UTF-8 data Closes #35942 See merge request !14038
| | * | | | | [ci-skip] spec for an instance method35942_api_binary_encodingmicael.bergeron2017-09-061-1/+1
| | | | | | |
| | * | | | | add .json_safe_diff specmicael.bergeron2017-09-061-0/+19
| | | |_|/ / | | |/| | |
| * | | | | Profile updates from providersAlexander Keramidas2017-09-062-17/+192
| |/ / / /
* | | | | Merge branch 'master' into zj-auto-devops-tableZeger-Jan van de Weg2017-09-0618-117/+629
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch ↵Douwe Maan2017-09-062-1/+4
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'AshleyDumaine/gitlab-ce-36994-toggle-for-automatically-collapsing-outdated-diff-comments' into 'master' Add setting to collapse outdated diff comments on push Closes #36994 See merge request !14053
| | * | | | Fix note resolution specsSean McGivern2017-09-061-0/+2
| | | | | |
| | * | | | Add functionality to collapse outdated diff comments regardless of ↵Ashley Dumaine2017-09-062-1/+2
| | | |/ / | | |/| | | | | | | | | | | | discussion resolution
| * | | | Merge branch 'fix/import-export-performance' into 'master'Douwe Maan2017-09-062-10/+13
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | Improve Import/Export memory use and performance Closes #35389 and #26556 See merge request !13957
| | * | | fix specsJames Lopez2017-09-051-2/+2
| | | | |
| | * | | fix typoJames Lopez2017-09-051-1/+1
| | | | |
| | * | | refactor code a littleJames Lopez2017-09-051-1/+1
| | | | |
| | * | | fix export performance of CI buildsJames Lopez2017-09-051-8/+11
| | | | |
| * | | | Merge branch 'system-checks-incoming-email' into 'master'Sean McGivern2017-09-061-1/+23
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Move Incoming Email checks to System Checks See merge request !14028
| | * | | | Added dynamic skip reason to SystemCheckGabriel Mazetto2017-09-041-1/+23
| | | | | |
View Lorry Controller Status