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
a25da8b2
Commit
a25da8b2
authored
Apr 02, 2018
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resolve conflicts in app/models/ci/build.rb
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
f4dd12eb
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
17 deletions
+0
-17
app/models/ci/build.rb
app/models/ci/build.rb
+0
-17
No files found.
app/models/ci/build.rb
View file @
a25da8b2
...
...
@@ -7,11 +7,8 @@ module Ci
include
Presentable
include
Importable
include
Gitlab
::
Utils
::
StrongMemoize
<<<<<<<
HEAD
prepend
EE
::
Ci
::
Build
=======
>>>>>>>
upstream
/
master
MissingDependenciesError
=
Class
.
new
(
StandardError
)
...
...
@@ -291,7 +288,6 @@ module Ci
variables
.
concat
(
pipeline
.
pipeline_schedule
.
job_variables
)
if
pipeline
.
pipeline_schedule
end
end
<<<<<<<
HEAD
##
# Variables that do not depend on the environment name.
...
...
@@ -303,19 +299,6 @@ module Ci
end
##
=======
##
# Variables that do not depend on the environment name.
#
def
simple_variables
strong_memoize
(
:simple_variables
)
do
scoped_variables
(
environment:
nil
).
to_runner_variables
end
end
##
>>>>>>>
upstream
/
master
# All variables, including persisted environment variables.
#
def
variables
...
...
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