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
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
0aaaae9d
Commit
0aaaae9d
authored
Apr 12, 2016
by
Rémy Coutable
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix features specs (hopefully)
Signed-off-by:
Rémy Coutable
<
remy@rymai.me
>
parent
13804aba
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
features/steps/project/source/browse_files.rb
features/steps/project/source/browse_files.rb
+1
-1
lib/api/licenses.rb
lib/api/licenses.rb
+3
-3
No files found.
features/steps/project/source/browse_files.rb
View file @
0aaaae9d
...
@@ -283,7 +283,7 @@ class Spinach::Features::ProjectSourceBrowseFiles < Spinach::FeatureSteps
...
@@ -283,7 +283,7 @@ class Spinach::Features::ProjectSourceBrowseFiles < Spinach::FeatureSteps
end
end
step
'I click on "add a file" link'
do
step
'I click on "add a file" link'
do
click_link
'adding README'
click_link
'adding
a
README'
# Remove pre-receive hook so we can push without auth
# Remove pre-receive hook so we can push without auth
FileUtils
.
rm_f
(
File
.
join
(
@project
.
repository
.
path
,
'hooks'
,
'pre-receive'
))
FileUtils
.
rm_f
(
File
.
join
(
@project
.
repository
.
path
,
'hooks'
,
'pre-receive'
))
...
...
lib/api/licenses.rb
View file @
0aaaae9d
...
@@ -5,12 +5,12 @@ module API
...
@@ -5,12 +5,12 @@ module API
/[\<\{\[]
/[\<\{\[]
(project|description|
(project|description|
one\sline\s.+\swhat\sit\sdoes\.) # matching the start and end is enough here
one\sline\s.+\swhat\sit\sdoes\.) # matching the start and end is enough here
[\>\}\]]/xi
[\>\}\]]/xi
.
freeze
YEAR_TEMPLATE_REGEX
=
/[<{\[](year|yyyy)[>}\]]/i
YEAR_TEMPLATE_REGEX
=
/[<{\[](year|yyyy)[>}\]]/i
.
freeze
FULLNAME_TEMPLATE_REGEX
=
FULLNAME_TEMPLATE_REGEX
=
/[\<\{\[]
/[\<\{\[]
(fullname|name\sof\s(author|copyright\sowner))
(fullname|name\sof\s(author|copyright\sowner))
[\>\}\]]/xi
[\>\}\]]/xi
.
freeze
# Get the list of the available license templates
# Get the list of the available license templates
#
#
...
...
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