summaryrefslogtreecommitdiff
path: root/spec/lib
Commit message (Collapse)AuthorAgeFilesLines
* Prepare Repository#merge for migration to Gitalyoperation-service-mergeJacob Vosmaer2017-09-151-9/+1
|
* Merge branch 'gitlab-git-user' into 'master'Rémy Coutable2017-09-142-5/+5
|\ | | | | | | | | Rename Gitlab::Git::Committer to User See merge request gitlab-org/gitlab-ce!14254
| * Rename Gitlab::Git::Committer to UserJacob Vosmaer2017-09-142-5/+5
| |
* | Don't force the encoding of the OAuth provider in ↵37845-fix-oauth-provider-forced-encodingRémy Coutable2017-09-141-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Gitlab::OAuth::AuthHash#provider Some providers freeze their name (e.g. https://github.com/zquestz/omniauth-google-oauth2/blob/414c43ef3ffec37d473321f262e80f1e46dda89f/lib/omniauth/strategies/google_oauth2.rb#L1), so trying to modify the string would fail with a `can't modify frozen String` exception (see https://gitlab.com/gitlab-org/gitlab-ce/issues/37845#note_40308148). In this case, we can just stop trying to force the encoding of the provider name as they should always be in utf8 by default. Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Merge branch 'backport-ee-changes-to-url-sanitizer' into 'master'Rémy Coutable2017-09-131-0/+9
|\ \ | |/ |/| | | | | Backport more EE changes to Gitlab::UrlSanitizer See merge request !14150
| * Backport more EE changes to Gitlab::UrlSanitizerNick Thomas2017-09-111-0/+9
| |
* | Merge branch ↵Douwe Maan2017-09-131-0/+14
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | '37629-lazy-image-loading-breaks-notification-mails-for-an-added-screenshot' into 'master' Resolve "Lazy image loading breaks notification mails for an added screenshot" Closes #37629 See merge request !14161
| * | Remove ImageLazyLoadFilter from EmailPipeline37629-lazy-image-loading-breaks-notification-mails-for-an-added-screenshotRobert Speicher2017-09-121-0/+14
| | |
* | | Merge branch 'zj-usage-data-auto-devops' into 'master'Kamil Trzciński2017-09-131-0/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add usage ping for Auto DevOps Closes #37648 See merge request !14162
| * | | Add auto devops enabled/disabled to usage pingZeger-Jan van de Weg2017-09-121-0/+2
| | | |
| * | | Add usage ping for Auto DevOpsZeger-Jan van de Weg2017-09-081-0/+2
| | | | | | | | | | | | | | | | Fixes gitlab-org/gitlab-ce#37648
* | | | Merge branch '5836-move-lib-ci-into-gitlab-namespace' into 'master'Grzegorz Bizon2017-09-136-1702/+1704
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Move `lib/ci` to `lib/gitlab/ci`" Closes #5836 See merge request !14078
| * | | | adds changelogMaxim Rydkin2017-09-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix CI fix CI
| * | | | move `lib/ci/mask_secret.rb` into `lib/gitlab/ci/mask_secret.rb`Maxim Rydkin2017-09-121-1/+1
| | | | |
| * | | | move `lib/ci/gitlab_ci_yaml_processor.rb` into `lib/gitlab/ci/yaml_processor.rb`Maxim Rydkin2017-09-122-1697/+1699
| | | | |
| * | | | move `lib/ci/charts.rb` into `lib/gitlab/ci/charts.rb`Maxim Rydkin2017-09-121-2/+2
| | | | |
| * | | | move `lib/ci/ansi2html.rb` into `lib/gitlab/ci/ansi2html.rb`Maxim Rydkin2017-09-121-1/+1
| | | | |
* | | | | Merge branch 'revert-2f46c3a8' into 'master'Robert Speicher2017-09-122-2/+58
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | Revert "Merge branch 'revert-f2421b2b' into 'master'" See merge request !14190
| * | | | Revert "Merge branch 'revert-f2421b2b' into 'master'"revert-2f46c3a8Annabel Dunstone Gray2017-09-112-2/+58
| | |_|/ | |/| | | | | | This reverts merge request !14148
* | | | Merge branch 'gitaly-519-commit-stats' into 'master'Robert Speicher2017-09-122-1/+34
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | Migrate Git::CommitStats to Gitaly Closes gitaly#519 See merge request !14077
| * | | Migrate Git::CommitStats to Gitalygitaly-519-commit-statsKim "BKC" Carlbäcker2017-09-112-1/+34
| |/ /
* | | Resolve "Error 500 in non-UTF8 branch names"Micael Bergeron2017-09-122-1/+10
| | |
* | | Merge branch 'detect-orphaned-repositories' into 'master'Douwe Maan2017-09-122-0/+129
|\ \ \ | | | | | | | | | | | | | | | | Detect orphaned repositories See merge request !14204
| * | | Refactor on namespace and repository checks and added specsGabriel Mazetto2017-09-122-0/+129
| |/ /
* | | Merge branch 'hide-read-registry-scope-when-registry-disabled' into 'master'Kamil Trzciński2017-09-121-6/+32
|\ \ \ | |/ / |/| | | | | | | | Hide read_registry scope when registry is disabled on instance See merge request !13314
| * | Hide read_registry scope when registry is disabled on instanceRobin Bobbitt2017-08-211-6/+32
| | |
* | | 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
| | | | |
View Lorry Controller Status