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
e6a85ca2
Commit
e6a85ca2
authored
May 07, 2019
by
GitLab Bot
Browse files
Options
Browse Files
Download
Plain Diff
Automatic merge of gitlab-org/gitlab-ce master
parents
a6798746
0910dfb9
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
8 deletions
+8
-8
doc/ci/yaml/README.md
doc/ci/yaml/README.md
+2
-2
doc/install/installation.md
doc/install/installation.md
+1
-1
spec/features/dashboard/user_filters_projects_spec.rb
spec/features/dashboard/user_filters_projects_spec.rb
+5
-5
No files found.
doc/ci/yaml/README.md
View file @
e6a85ca2
...
...
@@ -2078,8 +2078,8 @@ of the `group/my-project`:
```
yaml
include
:
-
local
:
:
/templates/docker-build.yml
-
local
:
:
/templates/docker-testing.yml
-
local
:
/templates/docker-build.yml
-
local
:
/templates/docker-testing.yml
```
Our
`/templates/docker-build.yml`
present in
`group/my-project`
adds a
`docker-build`
job:
...
...
doc/install/installation.md
View file @
e6a85ca2
...
...
@@ -111,7 +111,7 @@ sudo apt-get install -y libcurl4-openssl-dev libexpat1-dev gettext libz-dev libs
# Download and compile from source
cd
/tmp
curl
--remote-name
--location
--progress
https://www.kernel.org/pub/software/scm/git/git-2.21.0.tar.gz
echo
'85eca51c7404da75e353eba587f87fea9481ba41e162206a6f70ad8118147bee
'
git-2.21.0.tar.gz
' | shasum -a256 -c - && tar -xzf git-2.21.0.tar.gz
echo
'85eca51c7404da75e353eba587f87fea9481ba41e162206a6f70ad8118147bee git-2.21.0.tar.gz'
| shasum
-a256
-c
-
&&
tar
-xzf
git-2.21.0.tar.gz
cd
git-2.21.0/
./configure
make
prefix
=
/usr/local all
...
...
spec/features/dashboard/user_filters_projects_spec.rb
View file @
e6a85ca2
...
...
@@ -2,9 +2,9 @@ require 'spec_helper'
describe
'Dashboard > User filters projects'
do
let
(
:user
)
{
create
(
:user
)
}
let
(
:project
)
{
create
(
:project
,
name:
'Victorialand'
,
namespace:
user
.
namespace
)
}
let
(
:project
)
{
create
(
:project
,
name:
'Victorialand'
,
namespace:
user
.
namespace
,
created_at:
2
.
seconds
.
ago
,
updated_at:
2
.
seconds
.
ago
)
}
let
(
:user2
)
{
create
(
:user
)
}
let
(
:project2
)
{
create
(
:project
,
name:
'Treasure'
,
namespace:
user2
.
namespace
)
}
let
(
:project2
)
{
create
(
:project
,
name:
'Treasure'
,
namespace:
user2
.
namespace
,
created_at:
1
.
second
.
ago
,
updated_at:
1
.
second
.
ago
)
}
before
do
project
.
add_maintainer
(
user
)
...
...
@@ -129,7 +129,7 @@ describe 'Dashboard > User filters projects' do
list
=
page
.
all
(
'.projects-list .project-name'
).
map
(
&
:text
)
expect
(
list
).
to
match
([
"Private project"
,
"Treasure"
,
"Victorialand"
]
)
expect
(
list
).
to
contain_exactly
(
"Private project"
,
"Treasure"
,
"Victorialand"
)
end
it
'filters internal projects only'
do
...
...
@@ -139,14 +139,14 @@ describe 'Dashboard > User filters projects' do
list
=
page
.
all
(
'.projects-list .project-name'
).
map
(
&
:text
)
expect
(
list
).
to
match
([
'Internal project'
]
)
expect
(
list
).
to
contain_exactly
(
'Internal project'
)
end
it
'filters any project'
do
select_dropdown_option
'#filtered-search-visibility-dropdown'
,
'Any'
list
=
page
.
all
(
'.projects-list .project-name'
).
map
(
&
:text
)
expect
(
list
).
to
match
([
"Internal project"
,
"Private project"
,
"Treasure"
,
"Victorialand"
]
)
expect
(
list
).
to
contain_exactly
(
"Internal project"
,
"Private project"
,
"Treasure"
,
"Victorialand"
)
end
end
...
...
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