Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
68a76231
Commit
68a76231
authored
Apr 10, 2019
by
GitLab Bot
Browse files
Options
Browse Files
Download
Plain Diff
Automatic merge of gitlab-org/gitlab-ce master
parents
4d0f474c
aa875163
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
4 deletions
+10
-4
GITLAB_WORKHORSE_VERSION
GITLAB_WORKHORSE_VERSION
+1
-1
changelogs/unreleased/update-workhorse-8-5-1.yml
changelogs/unreleased/update-workhorse-8-5-1.yml
+5
-0
qa/qa/specs/features/browser_ui/3_create/merge_request/merge_merge_request_from_fork_spec.rb
...reate/merge_request/merge_merge_request_from_fork_spec.rb
+2
-1
qa/qa/specs/features/browser_ui/3_create/merge_request/squash_merge_request_spec.rb
...er_ui/3_create/merge_request/squash_merge_request_spec.rb
+2
-2
No files found.
GITLAB_WORKHORSE_VERSION
View file @
68a76231
8.5.
0
8.5.
1
changelogs/unreleased/update-workhorse-8-5-1.yml
0 → 100644
View file @
68a76231
---
title
:
Update GitLab Workhorse to v8.5.1
merge_request
:
27217
author
:
type
:
fixed
qa/qa/specs/features/browser_ui/3_create/merge_request/merge_merge_request_from_fork_spec.rb
View file @
68a76231
# frozen_string_literal: true
# frozen_string_literal: true
module
QA
module
QA
context
'Create'
do
# Failure issue: https://gitlab.com/gitlab-org/quality/nightly/issues/94
context
'Create'
,
:quarantine
do
describe
'Merge request creation from fork'
do
describe
'Merge request creation from fork'
do
it
'user forks a project, submits a merge request and maintainer merges it'
do
it
'user forks a project, submits a merge request and maintainer merges it'
do
Runtime
::
Browser
.
visit
(
:gitlab
,
Page
::
Main
::
Login
)
Runtime
::
Browser
.
visit
(
:gitlab
,
Page
::
Main
::
Login
)
...
...
qa/qa/specs/features/browser_ui/3_create/merge_request/squash_merge_request_spec.rb
View file @
68a76231
# frozen_string_literal: true
# frozen_string_literal: true
module
QA
module
QA
# Failure issue: https://gitlab.com/gitlab-org/quality/
staging/issues/31
# Failure issue: https://gitlab.com/gitlab-org/quality/
nightly/issues/93
context
'Create'
do
context
'Create'
,
:quarantine
do
describe
'Merge request squashing'
do
describe
'Merge request squashing'
do
it
'user squashes commits while merging'
do
it
'user squashes commits while merging'
do
Runtime
::
Browser
.
visit
(
:gitlab
,
Page
::
Main
::
Login
)
Runtime
::
Browser
.
visit
(
:gitlab
,
Page
::
Main
::
Login
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment