summaryrefslogtreecommitdiff
path: root/spec
Commit message (Collapse)AuthorAgeFilesLines
* Fixed linting error with trailing space in rbTim Zallmann2018-06-141-1/+1
|
* Makes the html attribute in the json output optional with the option ↵Tim Zallmann2018-06-141-0/+18
| | | | html_render=false
* Deny repository disk access in development and testJacob Vosmaer (GitLab)2018-06-1412-18/+54
|
* Merge branch 'fix-flakey-user-comment-on-issue' into 'master'Sean McGivern2018-06-141-2/+5
|\ | | | | | | | | Fix flakey time-sensitive user comment on issue test See merge request gitlab-org/gitlab-ce!19786
| * Fix flakey user comment on issue test race conditionEric Eastwood2018-06-141-2/+5
| |
* | Merge branch ↵Sean McGivern2018-06-141-0/+4
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | 'rd-33733-showing-created-date-instead-of-updated-date-in-project-lists' into 'master' Invalidate cache with project details when repository is updated Closes #33733 See merge request gitlab-org/gitlab-ce!19774
| * | Invalidate cache with project details when repository is updatedrd-33733-showing-created-date-instead-of-updated-date-in-project-listsRubén Dávila2018-06-131-0/+4
| | | | | | | | | | | | | | | The partial using this cache key was showing stale information due to the cache not being invalidated.
* | | Merge branch 'jprovazn-rails5-shoulda' into 'master'Rémy Coutable2018-06-141-0/+27
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix shoulda-matchers in Rails 5 Closes #47639 See merge request gitlab-org/gitlab-ce!19749
| * | | Fix shoulda-matchers in Rails 5jprovazn-rails5-shouldaJan Provaznik2018-06-131-0/+27
| | | | | | | | | | | | | | | | | | | | Backports a fix for https://github.com/thoughtbot/shoulda-matchers/issues/913. This can be removed once new shoulda-matchers version is released.
* | | | enable CommonMark as the defaultBrett Walker2018-06-148-31/+106
| | | |
* | | | Merge branch 'rails5-fix-47805' into 'master'Rémy Coutable2018-06-141-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rails5 ActionController::ParameterMissing: param is missing or the value is… Closes #47805 See merge request gitlab-org/gitlab-ce!19763
| * | | | Rails5 ActionController::ParameterMissing: param is missing or the value is ↵Jasper Maes2018-06-131-1/+1
| | | | | | | | | | | | | | | | | | | | empty: application_setting
* | | | | Merge branch 'rails5-fix-47804' into 'master'Rémy Coutable2018-06-141-4/+4
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | Rails5 fix stack level too deep Closes #47804 See merge request gitlab-org/gitlab-ce!19762
| * | | | Rails5 fix stack level too deepJasper Maes2018-06-131-4/+4
| |/ / /
* | | | Fix branch name encoding for dropdown on issue pageWinnie Hellmann2018-06-131-0/+67
| | | |
* | | | Merge branch 'bvl-missing-message-on-access-denied' into 'master'Robert Speicher2018-06-132-0/+17
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Render access denied without message Closes #47844 See merge request gitlab-org/gitlab-ce!19755
| * | | | Render access denied without messageBob Van Landuyt2018-06-132-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `errors/access_denied` page should not fail to render when no message is provided. When accessing something as a sessionless user, we should also display the terms message if possible.
* | | | | Add support for verifying remote uploads, artifacts, and LFS objects in ↵Michael Kozono2018-06-133-22/+59
| |/ / / |/| | | | | | | | | | | check rake tasks
* | | | Merge branch 'zj-empty-batch-no-rpc' into 'master'Rémy Coutable2018-06-131-0/+10
|\ \ \ \ | |/ / / |/| | | | | | | | | | | ListCommitByOid isn't called with an empty batch See merge request gitlab-org/gitlab-ce!19753
| * | | ListCommitByOid isn't called with an empty batchZeger-Jan van de Weg2018-06-131-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | Batching commits for performance improvements, might lead to empty batches being used. This isn't the case yet, but to guard against this in future cases, a guard clause is added.
* | | | Resolve "Add `/confidential` quick action for issues"Jan2018-06-132-0/+54
| | | |
* | | | Merge branch 'blackst0ne-rails5-fix-storage-counter-helper' into 'master'Rémy Coutable2018-06-131-10/+14
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Resolve "[Rails5] `StorageHelper#storage_counter uses commas as thousands separator` fails" Closes #47375 See merge request gitlab-org/gitlab-ce!19725
| * | | [Rails5] Fix `storage_counter` helperblackst0ne2018-06-131-10/+14
| |/ / | | | | | | | | | | | | | | | | | | | | | Since rails 5 beta 2 support of petabytes and exabytes were added to the `number_to_human*` methods. See https://github.com/rails/rails/pull/22759 So for rails5 the comma separator gets shown for big numbers (EBs).
* | | Resolve "Provide ability to retrieve `visibility` level via Snippets API"Jan2018-06-132-0/+4
| | |
* | | Resolve "Quick actions are case sensitive"Jan2018-06-131-0/+16
| | |
* | | Merge branch 'ide-commit-section-file-active-indicator' into 'master'Filipa Lacerda2018-06-133-1/+32
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add active class to active file in IDE commit panel Closes #46051 See merge request gitlab-org/gitlab-ce!19646
| * | | moved strings into constants fileide-commit-section-file-active-indicatorPhil Hughes2018-06-131-0/+1
| | | |
| * | | fixed eslintPhil Hughes2018-06-121-3/+5
| | | |
| * | | added specs for is-active classPhil Hughes2018-06-122-0/+25
| | | | | | | | | | | | | | | | added spec for openPendingTab in component
| * | | karma updatesPhil Hughes2018-06-123-0/+3
| | | |
* | | | Merge branch '47735-milestone-regression' into 'master'Phil Hughes2018-06-133-2/+36
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Regressions for assigning group milestone from ancestor" Closes #47735 See merge request gitlab-org/gitlab-ce!19721
| * | | | Sidebar Milestone - Fix wrong URL when selecting a parent group milestone47735-milestone-regressionMario de la Ossa2018-06-122-1/+27
| | | | |
| * | | | Fix Banzai reference for milestones belonging to parent groupsMario de la Ossa2018-06-121-1/+9
| | |/ / | |/| |
* | | | Merge branch ↵Sean McGivern2018-06-132-4/+14
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '47513-upload-migration-lease-key-is-incorrect-for-non-mounted-uploaders' into 'master' Resolve "Upload migration lease key is incorrect for non-mounted uploaders" Closes #47513 See merge request gitlab-org/gitlab-ce!19600
| * | | | Use upload ID instead of model ID in lease keyJan Provaznik2018-06-122-4/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For FileUploaders it's possible that a model has many uploads and if lease key is created only from model id, it causes that the model's uploads can not be migrated in parallel because the exclusive lease key would be same for all uploads of the model.
* | | | | Image Diff Viewing + Download Diff ViewingTim Zallmann2018-06-138-5/+323
| | | | |
* | | | | Merge branch '47408-migrateuploadsworker-is-doing-n-1-queries-on-migration' ↵Sean McGivern2018-06-133-17/+42
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "`MigrateUploadsWorker` is doing N+1 queries on migration" Closes #47408 See merge request gitlab-org/gitlab-ce!19547
| * | | | | apply feedback47408-migrateuploadsworker-is-doing-n-1-queries-on-migrationMicaël Bergeron2018-06-121-20/+14
| | | | | |
| * | | | | apply feedbackMicaël Bergeron2018-06-081-2/+2
| | | | | |
| * | | | | fix the failing specMicaël Bergeron2018-06-072-4/+4
| | | | | |
| * | | | | shave off another 20% queryMicaël Bergeron2018-06-071-2/+1
| | | | | |
| * | | | | shave off 30% of the query countMicaël Bergeron2018-06-061-9/+41
| | | | | |
* | | | | | Restoring user v3 endpointFrancisco Javier López2018-06-132-38/+45
| | | | | |
* | | | | | Merge branch '42342-teams-pipeline-notifications' into 'master'Douwe Maan2018-06-132-2/+7
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Microsoft Teams notification for pipelines do not work" Closes #42342 See merge request gitlab-org/gitlab-ce!19632
| * | | | | | Fixes Microsoft Teams notifications for pipeline eventsJeff Brown2018-06-122-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #42342
* | | | | | | Merge branch 'commits_api_with_stats' into 'master'Rémy Coutable2018-06-133-2/+37
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | Added with_stats option to GET /projects/:id/repository/commits (API) See merge request gitlab-org/gitlab-ce!19484
| * | | | | | Added with_statsoption for GET /projects/:id/repository/commitsLeonid Batizhevskii2018-06-123-2/+37
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'ide-job-loading-empty-state' into 'master'Filipa Lacerda2018-06-121-0/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed IDE jobs empty state showing when loading Closes #47766 See merge request gitlab-org/gitlab-ce!19706
| * | | | | | Fixed IDE jobs empty state showing when loadingide-job-loading-empty-statePhil Hughes2018-06-121-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #47766
* | | | | | | Merge branch 'pr-importer-io-extra-error-handling' into 'master'Nick Thomas2018-06-121-0/+12
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure MR diffs always exist in the PR importer Closes #47312 See merge request gitlab-org/gitlab-ce!19704