summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ide-job-loading-empty-state' into 'master'Filipa Lacerda2018-06-121-0/+5
|\
| * Fixed IDE jobs empty state showing when loadingide-job-loading-empty-statePhil Hughes2018-06-121-0/+5
* | Merge branch 'pr-importer-io-extra-error-handling' into 'master'Nick Thomas2018-06-121-0/+12
|\ \
| * | Ensure MR diffs always exist in the PR importerpr-importer-io-extra-error-handlingYorick Peterse2018-06-121-0/+12
* | | Merge branch 'gitaly-disk-access-3' into 'master'Douwe Maan2018-06-1223-125/+214
|\ \ \
| * | | 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 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}_URLexpose-ci-urlKamil Trzciński2018-06-122-1/+4
* | | | | | Resolve "[Rails5] `ActionView::MissingTemplate` in spec/features/projects/wik...blackst0ne2018-06-121-8/+12
| |_|_|/ / |/| | | |
* | | | | Merge branch 'da-port-cte-to-ce' into 'master'Yorick Peterse2018-06-121-0/+42
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | 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 maintainersbvl-fix-maintainer-push-rejectedBob Van Landuyt2018-06-112-0/+22
| |/ / / /
* | | | | Relax expectation in spec/models/project_spec.rbStan Hu2018-06-111-1/+1
* | | | | Merge branch 'sh-expire-content-cache-after-import' into 'master'Mayra Cabrera2018-06-114-11/+25
|\ \ \ \ \
| * | | | | 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
* | | | | | Merge branch 'jprovazn-rails5-boards' into 'master'Rémy Coutable2018-06-111-6/+12
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Fix conversion of integer into string in board specJan Provaznik2018-06-091-6/+12
| |/ / / /
* | | | | Merge branch '47684-uploads-specs-are-failing-on-master' into 'master'Sean McGivern2018-06-114-4/+4
|\ \ \ \ \
| * | | | | Don't use Rails.root.join for upload fixture pathsRémy Coutable2018-06-114-4/+4
* | | | | | Merge branch 'ide-etag-polling' into 'master'Filipa Lacerda2018-06-112-22/+36
|\ \ \ \ \ \
| * | | | | | fixed specsPhil Hughes2018-06-111-18/+29
| * | | | | | Fix IDE pipelines eTagPoll not stoppingPhil Hughes2018-06-111-4/+7
* | | | | | | Merge branch 'use-tooltip-component-in-mr-widget-author-time-component' into ...Filipa Lacerda2018-06-112-5/+5
|\ \ \ \ \ \ \
| * | | | | | | 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
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | 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 suggestionDmitriy Zaporozhets2018-06-081-1/+1
* | | | | | Merge branch 'bvl-terms-on-registration' into 'master'Robert Speicher2018-06-084-69/+118
|\ \ \ \ \ \
| * | | | | | Users can accept terms during registrationBob Van Landuyt2018-06-084-69/+118
* | | | | | | Merge branch 'rs-schema-spec-parity' into 'master'Nick Thomas2018-06-081-1/+5
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Refactor schema_spec.rb for CE-EE parity and simplicityRobert Speicher2018-06-071-1/+5
* | | | | | | Revert rename allow collaboration columnMark Chao2018-06-081-1/+1
* | | | | | | Resolve "Automatically created MR uses wrong target branch (when branching fr...Athar Hameed2018-06-081-3/+8
* | | | | | | Fix NotificationRecipientService spec for EESean McGivern2018-06-081-3/+3
| |_|_|_|_|/ |/| | | | |
* | | | | | Merge branch 'improve-housekeeping-spec' into 'master'Nick Thomas2018-06-081-31/+41
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | backport changes from gitlab-org/gitlab-ee!5461improve-housekeeping-specGabriel Mazetto2018-04-261-31/+41
* | | | | | Merge branch '44331-upgrade-monaco-editor-and-remove-copywebpackplugin' into ...2018-06-07-code-freeze-ee2018-06-07-code-freezeTim Zallmann2018-06-087-82/+35
|\ \ \ \ \ \
| * | | | | | refactor monaco-editor import and stop storing as class property within editorMike Greiling2018-06-081-4/+5