summaryrefslogtreecommitdiff
path: root/spec
Commit message (Collapse)AuthorAgeFilesLines
* Resets state correctly when switching to merge request in IDEide-pipeline-reset-statePhil Hughes2018-06-133-6/+35
| | | | Closes #47763
* 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
| * | | | Ensure MR diffs always exist in the PR importerpr-importer-io-extra-error-handlingYorick Peterse2018-06-121-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In rare cases it could happen that an MR was created, but creating the MR diffs somehow failed (e.g. due to an error). This commit adds an additional check to make sure MR diffs are always present when importing GitHub pull requests.
* | | | | Merge branch 'gitaly-disk-access-3' into 'master'Douwe Maan2018-06-1223-125/+214
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Find and mark more Git disk access locations, part 2 See merge request gitlab-org/gitlab-ce!19437
| * | | | | Find and mark more Git disk access locations, part 2Jacob Vosmaer2018-06-1223-125/+214
| | | | | |
* | | | | | mergeError message has been binded using v-html directiveMurat Dogan2018-06-121-4/+19
| | | | | |
* | | | | | Merge branch 'replace-dots-with-ellipsis' into 'master'Annabel Gray2018-06-123-4/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace ... with ellipsis in placeholders See merge request gitlab-org/gitlab-ce!19627
| * | | | | | Replace ... with ellipsis in placeholdersreplace-dots-with-ellipsisAndreas Kämmerle2018-06-113-4/+4
| | |_|_|_|/ | |/| | | |
* | | | | | Bumping gitlab-gollum-lib and gitlab-gollum-rugged_adapterFrancisco Javier López2018-06-121-0/+16
| | | | | |
* | | | | | Merge branch 'expose-ci-url' into 'master'Grzegorz Bizon | off until 20th June2018-06-122-1/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add CI_{PIPELINE,JOB}_URL See merge request gitlab-org/gitlab-ce!19618
| * | | | | | Add CI_{PIPELINE,JOB}_URLexpose-ci-urlKamil Trzciński2018-06-122-1/+4
| | | | | | |
* | | | | | | Resolve "[Rails5] `ActionView::MissingTemplate` in ↵blackst0ne2018-06-121-8/+12
| |_|_|/ / / |/| | | | | | | | | | | | | | | | | spec/features/projects/wiki/user_views_wiki_page_spec.rb"
* | | | | | Merge branch 'da-port-cte-to-ce' into 'master'Yorick Peterse2018-06-121-0/+42
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | Add Gitlab::SQL:CTE for easily building CTE statements See merge request gitlab-org/gitlab-ce!19652
| * | | | | Add Gitlab::SQL:CTE for easily building CTE statementsDouglas Barbosa Alexandre2018-06-111-0/+42
| | | | | |
* | | | | | Merge branch 'bvl-fix-maintainer-push-rejected' into 'master'Douwe Maan2018-06-122-0/+22
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes rejected pushes from maintainers Closes #46337 See merge request gitlab-org/gitlab-ce!18968
| * | | | | | Fixes rejected pushes from maintainersbvl-fix-maintainer-push-rejectedBob Van Landuyt2018-06-112-0/+22
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before the push git would make a call to `/:namespace/:project/git-receive-pack`. This would perform an access check without a ref. So the `Project#branch_allows_maintainer_push?` would return false. This adjusts `Project#branch_allows_maintainer_push?` to return true when passing no branch name if there are merge requests open that would allow the user to push. The actual check then happens when a call to `/api/v4/internal/allowed` is made from a git hook.
* | | | | | Relax expectation in spec/models/project_spec.rbStan Hu2018-06-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Multiple Sidekiq workers can run in the spec, causing `Project.find` to be run in different places. Instead of setting a fixed number of calls, just use `allow`.
* | | | | | Merge branch 'sh-expire-content-cache-after-import' into 'master'Mayra Cabrera2018-06-114-11/+25
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expire Wiki content cache after importing a repository Closes #47546 See merge request gitlab-org/gitlab-ce!19617
| * | | | | | Fix Rubocop failure in spec/models/project_spec.rbStan Hu2018-06-111-1/+1
| | | | | | |
| * | | | | | Work around limitations of expect_any_instance_of by stubbing Project.findStan Hu2018-06-113-9/+23
| | | | | | |
| * | | | | | Expire Wiki content cache after importing a repositoryStan Hu2018-06-112-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The cache state for Wikis that were imported via GitHub or Bitbucket does not appear to have been flushed after a successful import. Closes #47546
* | | | | | | Merge branch 'jprovazn-rails5-boards' into 'master'Rémy Coutable2018-06-111-6/+12
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [Rails5] Fix conversion of integer into string in board spec Closes #47653 See merge request gitlab-org/gitlab-ce!19616
| * | | | | | Fix conversion of integer into string in board specJan Provaznik2018-06-091-6/+12
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In rails 5 controller specs, integers are converted to strings unless conte-type is set with `as: :json`: https://github.com/rails/rails/issues/26069
* | | | | | Merge branch '47684-uploads-specs-are-failing-on-master' into 'master'Sean McGivern2018-06-114-4/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Uploads specs are failing on master" Closes #47684 See merge request gitlab-org/gitlab-ce!19638
| * | | | | | Don't use Rails.root.join for upload fixture pathsRémy Coutable2018-06-114-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | Merge branch 'ide-etag-polling' into 'master'Filipa Lacerda2018-06-112-22/+36
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix IDE pipelines eTagPoll not stopping Closes #47678 See merge request gitlab-org/gitlab-ce!19636
| * | | | | | | fixed specsPhil Hughes2018-06-111-18/+29
| | | | | | | |
| * | | | | | | Fix IDE pipelines eTagPoll not stoppingPhil Hughes2018-06-111-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #47678
* | | | | | | | Merge branch 'use-tooltip-component-in-mr-widget-author-time-component' into ↵Filipa Lacerda2018-06-112-5/+5
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Use Tooltip component in MrWidgetAuthorTime vue component See merge request gitlab-org/gitlab-ce!19635
| * | | | | | | | Update MrWidgetAuthorTime and MRWidgetMerged specGeorge Tsiolis2018-06-112-2/+2
| | | | | | | | |
| * | | | | | | | Rename MrWidgetAuthorTime vue componentGeorge Tsiolis2018-06-111-3/+3
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Avoid checking the user format in every url validationFrancisco Javier López2018-06-114-21/+96
| |_|/ / / / / |/| | | | | |
* | | | | | | Don't use Gitlab::Utils.nlbr in Gitlab::GitJacob Vosmaer (GitLab)2018-06-119-25/+41
| | | | | | |
* | | | | | | Merge branch 'rs-update-rspec' into 'master'Rémy Coutable2018-06-1143-76/+72
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | Update rspec to 3.7 See merge request gitlab-org/gitlab-ce!19449
| * | | | | | Correct more usages of non-relative `fixture_file_upload` pathsRobert Speicher2018-06-078-19/+13
| | | | | | |
| * | | | | | Make all uses of `fixture_file_upload` use relative pathsRobert Speicher2018-06-0737-58/+60
| | | | | | |
* | | | | | | Merge branch 'dz-jupyter-use-nip-io' into 'master'Grzegorz Bizon | off until 20th June2018-06-111-1/+1
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | Use nip.io instead of xip.io for jupyter domain suggestion See merge request gitlab-org/gitlab-ce!19576
View Lorry Controller Status