summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'fe-fix-ee-diff-in-text-utility-spec' into 'master'Filipa Lacerda2019-04-121-8/+6
|\
| * Resolve CE/EE diff in text_utility_specfe-fix-ee-diff-in-text-utility-specPaul Slaughter2019-04-111-8/+6
* | Squashed commits and modified visibility level outputSara Ahbabou2019-04-122-0/+19
|/
* Merge branch 'winh-notes_spec-timeout' into 'master'Fatih Acet2019-04-111-1/+1
|\
| * Increase timeout for notes_spec.jswinh-notes_spec-timeoutWinnie Hellmann2019-04-111-1/+1
* | Improve project settings pageLuke Bennett2019-04-113-22/+44
* | Merge branch '60398-increase-timeouts-clusters-bundle' into 'master'Phil Hughes2019-04-111-1/+1
|\ \
| * | Increase clusters bundle specs timeout60398-increase-timeouts-clusters-bundleEnrique Alcantara2019-04-111-1/+1
* | | Merge branch 'restore-hipchat' into 'master'Nick Thomas2019-04-118-5/+483
|\ \ \
| * | | Add frozen_string_literal to HipChat filesrestore-hipchatSean McGivern2019-04-102-0/+4
| * | | Fix UrlBlocker specSean McGivern2019-04-101-1/+1
| * | | Revert "Remove HipChat integration from GitLab"Sean McGivern2019-04-108-5/+479
* | | | Merge branch 'fixed-web-ide-merge-request-review' into 'master'Kushal Pandya2019-04-112-0/+39
|\ \ \ \
| * | | | Fixes Web IDE not loading merge request filesPhil Hughes2019-04-112-0/+39
| | |_|/ | |/| |
* | | | Merge branch 'revert-24704-download-repository-path' into 'master'Rémy Coutable2019-04-116-33/+18
|\ \ \ \
| * | | | Revert "Merge branch '24704-download-repository-path' into 'master'"revert-24704-download-repository-pathPatrick Bajao2019-04-116-33/+18
* | | | | Merge branch 'limit-amount-of-created-pipelines' into 'master'Grzegorz Bizon2019-04-111-3/+39
|\ \ \ \ \
| * | | | | Process at most 4 pipelines during pushlimit-amount-of-created-pipelinesKamil Trzciński2019-04-101-3/+39
* | | | | | Merge branch 'ce-6120-extract-ee-specific-files-lines-for-spec-services-merge...Lin Jen-Shin2019-04-112-4/+2
|\ \ \ \ \ \
| * | | | | | Fix naming of testce-6120-extract-ee-specific-files-lines-for-spec-services-merge_requestsHeinrich Lee Yu2019-04-112-4/+2
* | | | | | | Merge branch 'jc-guard-against-empty-dereferenced_target' into 'master'Sean McGivern2019-04-111-0/+7
|\ \ \ \ \ \ \
| * | | | | | | Guard against nil dereferenced_targetjc-guard-against-empty-dereferenced_targetJohn Cai2019-04-101-0/+7
* | | | | | | | Merge branch 'winh-eslint-jest' into 'master'Phil Hughes2019-04-111-5/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Replace individual ESLint rules with jest/recommendedwinh-eslint-jestWinnie Hellmann2019-04-101-5/+2
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Delete static_fixtures.rb for static HAML fixturesWinnie Hellmann2019-04-113-30/+15
| |_|_|_|/ / / |/| | | | | |
* | | | | | | Align UrlValidator to validate_url gem implementation.Thong Kuah2019-04-116-42/+146
* | | | | | | Revert "Merge branch 'tz-reorganise-digests-json' into 'master'"tz-revert-new-emojis-loadingTim Zallmann2019-04-103-129/+73
| |_|_|_|_|/ |/| | | | |
* | | | | | Merge branch 'ce-10834-support-fast-unit-tests-in-ee' into 'master'Rémy Coutable2019-04-102-0/+6
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Require possible EE extensionLin Jen-Shin2019-04-102-0/+6
| |/ / / /
* | | | | Quarantine flaky specsquarantine-flaky-specsRémy Coutable2019-04-104-4/+4
|/ / / /
* | | | Merge branch 'winh-jest-valid-describe' into 'master'Kushal Pandya2019-04-106-12/+13
|\ \ \ \
| * | | | Wrap modal mutation names in template stringswinh-jest-valid-describeWinnie Hellmann2019-04-101-3/+3
| * | | | Hard code test name in timeline_entry_item_spec.jsWinnie Hellmann2019-04-101-1/+1
| * | | | Hard code test name in suggestion_diff_row_spec.jsWinnie Hellmann2019-04-101-1/+1
| * | | | Wrap import project mutation names in template stringsWinnie Hellmann2019-04-101-2/+2
| * | | | Wrap file template mutation names in template stringsWinnie Hellmann2019-04-101-5/+5
| * | | | Enable ESLint rule jest/valid-describeWinnie Hellmann2019-04-101-0/+1
* | | | | Merge branch '6623-extract-ee-specific-files-lines-for-ci-spec-serializers' i...Yorick Peterse2019-04-101-2/+4
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Use different query count expectations in EE6623-extract-ee-specific-files-lines-for-ci-spec-serializersMatija Čupić2019-04-101-2/+4
* | | | | Merge branch '6073-extract-ee-specific-files-lines-for-some-ci-files' into 'm...Yorick Peterse2019-04-101-3/+5
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Add optional IGNORE_ACCESSORS in RetryBuildService6073-extract-ee-specific-files-lines-for-some-ci-filesMatija Čupić2019-04-101-3/+5
| | |_|/ | |/| |
* | | | Add time tracking to issue board entitiespataar2019-04-101-0/+3
| |/ / |/| |
* | | Merge branch 'increase-rspec-retries' into 'master'Rémy Coutable2019-04-101-2/+2
|\ \ \
| * | | Double retries for rspec-retriesLin Jen-Shin2019-04-101-2/+2
| |/ /
* | | Merge branch 'quarantine-flaky-specs' into 'master'Kamil Trzciński2019-04-101-1/+1
|\ \ \ | |/ / |/| |
| * | Quarantine a flaky spec in spec/features/issues/user_creates_branch_and_merge...Rémy Coutable2019-04-101-1/+1
* | | Merge branch '47327-fix-github-project-import-visibility' into 'master'Douwe Maan2019-04-101-3/+13
|\ \ \ | |/ / |/| |
| * | Address style review commentDaniel Wyatt2019-04-091-2/+0
| * | Add test for github project import to user namespace.Daniel Wyatt2019-04-091-0/+12
| * | Fix GitHub project import visibilityDaniel Wyatt2019-04-081-2/+2