Skip to content

G
gitlab-ce
Commit 9647b407 authored by Zeger-Jan van de Weg's avatar Zeger-Jan van de Weg
Browse files
Options

Fix merge conflicts for daily CE merge 

All conflicts listed in https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/5482
are included
parent 43834ec3
Show whitespace changes
Inline Side-by-side
Showing with 225 additions and 33 deletions
app/services/projects/destroy_service.rb
View file @ 9647b407
......@@ -104,7 +104,6 @@ module Projects
def rollback_repository(old_path, new_path)
# There is a possibility project does not have repository or wiki
<<<<<<< HEAD
return true unless repo_exists?(old_path)
mv_repository(old_path, new_path)
......@@ -115,8 +114,6 @@ module Projects
end
def mv_repository(from_path, to_path)
=======
>>>>>>> upstream/master
return true unless gitlab_shell.exists?(project.repository_storage, from_path + '.git')
gitlab_shell.mv_repository(project.repository_storage, from_path, to_path)
......
db/migrate/20161220141214_remove_dot_git_from_group_names.rb
View file @ 9647b407
......@@ -60,11 +60,7 @@ class RemoveDotGitFromGroupNames < ActiveRecord::Migration
def move_namespace(group_id, path_was, path)
repository_storages = select_all("SELECT distinct(repository_storage) FROM projects WHERE namespace_id = #{group_id}").map do |row|
<<<<<<< HEAD
Gitlab.config.repositories.storages[row['repository_storage']].legacy_disk_path
=======
row['repository_storage']
>>>>>>> upstream/master
end.compact
# Move the namespace directory in all storages paths used by member projects
......
db/schema.rb
View file @ 9647b407
......@@ -11,11 +11,7 @@
#
# It's strongly recommended that you check this file into your version control system.
<<<<<<< HEAD
ActiveRecord::Schema.define(version: 20180419031622) do
=======
ActiveRecord::Schema.define(version: 20180425131009) do
>>>>>>> upstream/master
# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"
......
locale/gitlab.pot
View file @ 9647b407
......@@ -8,13 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: gitlab 1.0.0\n"
"Report-Msgid-Bugs-To: \n"
<<<<<<< HEAD
"POT-Creation-Date: 2018-04-18 09:58+0200\n"
"PO-Revision-Date: 2018-04-18 09:58+0200\n"
=======
"POT-Creation-Date: 2018-04-24 13:19+0000\n"
"PO-Revision-Date: 2018-04-24 13:19+0000\n"
>>>>>>> upstream/master
"POT-Creation-Date: 2018-04-25 17:57+0200\n"
"PO-Revision-Date: 2018-04-25 17:57+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: \n"
......@@ -110,6 +105,9 @@ msgstr ""
msgid "%{openOrClose} %{noteable}"
msgstr ""
msgid "%{percent}%% complete"
msgstr ""
msgid "%{storage_name}: failed storage access attempt on host:"
msgid_plural "%{storage_name}: %{failed_attempts} failed storage access attempts:"
msgstr[0] ""
......@@ -118,6 +116,9 @@ msgstr[1] ""
msgid "%{text} is available"
msgstr ""
msgid "%{title} changes"
msgstr ""
msgid "%{type} detected %d vulnerability"
msgid_plural "%{type} detected %d vulnerabilities"
msgstr[0] ""
......@@ -132,6 +133,41 @@ msgstr ""
msgid "- show less"
msgstr ""
msgid "1 %{type} addition"
msgid_plural "%d %{type} additions"
msgstr[0] ""
msgstr[1] ""
msgid "1 %{type} modification"
msgid_plural "%d %{type} modifications"
msgstr[0] ""
msgstr[1] ""
msgid "1 closed issue"
msgid_plural "%d closed issues"
msgstr[0] ""
msgstr[1] ""
msgid "1 closed merge request"
msgid_plural "%d closed merge requests"
msgstr[0] ""
msgstr[1] ""
msgid "1 merged merge request"
msgid_plural "%d merged merge requests"
msgstr[0] ""
msgstr[1] ""
msgid "1 open issue"
msgid_plural "%d open issues"
msgstr[0] ""
msgstr[1] ""
msgid "1 open merge request"
msgid_plural "%d open merge requests"
msgstr[0] ""
msgstr[1] ""
msgid "1 pipeline"
msgid_plural "%d pipelines"
msgstr[0] ""
......@@ -167,6 +203,9 @@ msgstr ""
msgid "Abuse reports"
msgstr ""
msgid "Accepted MR"
msgstr ""
msgid "Access Tokens"
msgstr ""
......@@ -419,6 +458,9 @@ msgstr ""
msgid "Artifacts"
msgstr ""
msgid "Ascending"
msgstr ""
msgid "Assertion consumer service URL"
msgstr ""
......@@ -446,6 +488,9 @@ msgstr ""
msgid "Assignee"
msgstr ""
msgid "Assignee(s)"
msgstr ""
msgid "Attach a file by drag &amp; drop or %{upload_link}"
msgstr ""
......@@ -823,9 +868,39 @@ msgstr ""
msgid "CI/CD for external repo"
msgstr ""
msgid "CICD|An explicit %{ci_file} needs to be specified before you can begin using Continuous Integration and Delivery."
msgstr ""
msgid "CICD|Auto DevOps (Beta)"
msgstr ""
msgid "CICD|Auto DevOps will automatically build, test, and deploy your application based on a predefined Continuous Integration and Delivery configuration."
msgstr ""
msgid "CICD|Disable Auto DevOps"
msgstr ""
msgid "CICD|Enable Auto DevOps"
msgstr ""
msgid "CICD|Follow the instance default to either have Auto DevOps enabled or disabled when there is no project specific %{ci_file}."
msgstr ""
msgid "CICD|Instance default (%{state})"
msgstr ""
msgid "CICD|Jobs"
msgstr ""
msgid "CICD|Learn more about Auto DevOps"
msgstr ""
msgid "CICD|The Auto DevOps pipeline configuration will be used when there is no %{ci_file} in the project."
msgstr ""
msgid "CICD|You need to specify a domain if you want to use Auto Review Apps and Auto Deploy stages."
msgstr ""
msgid "Cancel"
msgstr ""
......@@ -1003,6 +1078,9 @@ msgstr ""
msgid "CircuitBreakerApiLink|circuitbreaker api"
msgstr ""
msgid "Clear search input"
msgstr ""
msgid "Click any <strong>project name</strong> in the project list below to navigate to the project milestone."
msgstr ""
......@@ -1033,6 +1111,9 @@ msgstr ""
msgid "Closed"
msgstr ""
msgid "Closed issues"
msgstr ""
msgid "ClusterIntegration|%{appList} was successfully installed on your Kubernetes cluster"
msgstr ""
......@@ -1333,6 +1414,9 @@ msgstr ""
msgid "Collapse"
msgstr ""
msgid "Collapse sidebar"
msgstr ""
msgid "Comment and resolve discussion"
msgstr ""
......@@ -1529,6 +1613,9 @@ msgstr ""
msgid "Contribution guide"
msgstr ""
msgid "Contributions per group member"
msgstr ""
msgid "Contributors"
msgstr ""
......@@ -1637,12 +1724,6 @@ msgstr ""
msgid "CreateTokenToCloneLink|create a personal access token"
msgstr ""
msgid "Creates a new branch from %{branchName}"
msgstr ""
msgid "Creates a new branch from %{branchName} and re-directs to create a new merge request"
msgstr ""
msgid "Creating epic"
msgstr ""
......@@ -1789,6 +1870,9 @@ msgstr ""
msgid "DeployTokens|Your new project deploy token has been created."
msgstr ""
msgid "Descending"
msgstr ""
msgid "Description"
msgstr ""
......@@ -1807,6 +1891,9 @@ msgstr ""
msgid "Disable"
msgstr ""
msgid "Discard changes"
msgstr ""
msgid "Discard draft"
msgstr ""
......@@ -1822,6 +1909,9 @@ msgstr ""
msgid "Documentation for popular identity providers"
msgstr ""
msgid "Domain"
msgstr ""
msgid "Don't show again"
msgstr ""
......@@ -1972,6 +2062,9 @@ msgstr ""
msgid "Environments|You don't have any environments right now."
msgstr ""
msgid "Epic"
msgstr ""
msgid "Epic will be removed! Are you sure?"
msgstr ""
......@@ -2023,6 +2116,9 @@ msgstr ""
msgid "Error updating todo status."
msgstr ""
msgid "Estimated"
msgstr ""
msgid "EventFilterBy|Filter by all"
msgstr ""
......@@ -2053,6 +2149,9 @@ msgstr ""
msgid "Expand"
msgstr ""
msgid "Expand sidebar"
msgstr ""
msgid "Explore projects"
msgstr ""
......@@ -2238,6 +2337,9 @@ msgstr ""
msgid "GeoNodes|Local attachments:"
msgstr ""
msgid "GeoNodes|Local job artifacts:"
msgstr ""
msgid "GeoNodes|New node"
msgstr ""
......@@ -2391,6 +2493,9 @@ msgstr ""
msgid "Got it!"
msgstr ""
msgid "Group ID"
msgstr ""
msgid "GroupRoadmap|Epics let you manage your portfolio of projects more efficiently and with less effort"
msgstr ""
......@@ -2674,6 +2779,9 @@ msgstr ""
msgid "LabelSelect|%{labelsString}, and %{remainingLabelCount} more"
msgstr ""
msgid "LabelSelect|Labels"
msgstr ""
msgid "Labels"
msgstr ""
......@@ -2751,9 +2859,15 @@ msgstr ""
msgid "List your GitHub repositories"
msgstr ""
msgid "Loading contribution stats for group members"
msgstr ""
msgid "Loading the GitLab IDE..."
msgstr ""
msgid "Loading..."
msgstr ""
msgid "Lock"
msgstr ""
......@@ -2799,7 +2913,7 @@ msgstr ""
msgid "March"
msgstr ""
msgid "Mark done"
msgid "Mark todo as done"
msgstr ""
msgid "Maximum git storage failures"
......@@ -2817,6 +2931,9 @@ msgstr ""
msgid "Members will be forwarded here when signing in to your group. Get this from your identity provider, where it can also be called \"SSO Service Location\", \"SAML Token Issuance Endpoint\", or \"SAML 2.0/W-Federation URL\"."
msgstr ""
msgid "Merge Request:"
msgstr ""
msgid "Merge Requests"
msgstr ""
......@@ -2826,6 +2943,9 @@ msgstr ""
msgid "Merge request"
msgstr ""
msgid "Merge requests"
msgstr ""
msgid "Merge requests are a place to propose changes you've made to a project and discuss those changes with others"
msgstr ""
......@@ -2964,6 +3084,9 @@ msgstr ""
msgid "Multiple issue boards"
msgstr ""
msgid "Name"
msgstr ""
msgid "Name new label"
msgstr ""
......@@ -3044,6 +3167,9 @@ msgstr ""
msgid "No file chosen"
msgstr ""
msgid "No files found."
msgstr ""
msgid "No labels created yet."
msgstr ""
......@@ -3188,6 +3314,12 @@ msgstr ""
msgid "Opened"
msgstr ""
msgid "Opened MR"
msgstr ""
msgid "Opened issues"
msgstr ""
msgid "OpenedNDaysAgo|Opened"
msgstr ""
......@@ -3401,6 +3533,12 @@ msgstr ""
msgid "Pipeline|with stages"
msgstr ""
msgid "Planned finish date"
msgstr ""
msgid "Planned start date"
msgstr ""
msgid "PlantUML"
msgstr ""
......@@ -3500,6 +3638,9 @@ msgstr ""
msgid "Programming languages used in this repository"
msgstr ""
msgid "Progress"
msgstr ""
msgid "Project '%{project_name}' is in the process of being deleted."
msgstr ""
......@@ -3731,6 +3872,9 @@ msgstr ""
msgid "PushRule|Committer restriction"
msgstr ""
msgid "Pushed"
msgstr ""
msgid "Quick actions can be used in the issues description and comment boxes."
msgstr ""
......@@ -3836,6 +3980,9 @@ msgstr ""
msgid "Response metrics (Custom)"
msgstr ""
msgid "Retry"
msgstr ""
msgid "Retry this job"
msgstr ""
......@@ -3919,6 +4066,9 @@ msgstr ""
msgid "Search branches and tags"
msgstr ""
msgid "Search files"
msgstr ""
msgid "Search milestones"
msgstr ""
......@@ -4083,6 +4233,9 @@ msgstr ""
msgid "Something went wrong when toggling the button"
msgstr ""
msgid "Something went wrong while fetching group member contributions"
msgstr ""
msgid "Something went wrong while fetching the projects."
msgstr ""
......@@ -4212,6 +4365,18 @@ msgstr ""
msgid "Specify the following URL during the Runner setup:"
msgstr ""
msgid "Stage all"
msgstr ""
msgid "Stage changes"
msgstr ""
msgid "Staged"
msgstr ""
msgid "Staged %{type}"
msgstr ""
msgid "StarProject|Star"
msgstr ""
......@@ -4274,6 +4439,9 @@ msgstr[1] ""
msgid "Tags"
msgstr ""
msgid "Tags:"
msgstr ""
msgid "TagsPage|Browse commits"
msgstr ""
......@@ -4565,6 +4733,12 @@ msgstr ""
msgid "Time in seconds GitLab will wait for a response from the external service. When the service does not respond in time, access will be denied."
msgstr ""
msgid "Time remaining"
msgstr ""
msgid "Time spent"
msgstr ""
msgid "Time tracking"
msgstr ""
......@@ -4758,6 +4932,9 @@ msgstr ""
msgid "Todo"
msgstr ""
msgid "Toggle Sidebar"
msgstr ""
msgid "Toggle sidebar"
msgstr ""
......@@ -4767,6 +4944,9 @@ msgstr ""
msgid "ToggleButton|Toggle Status: ON"
msgstr ""
msgid "Total Contributions"
msgstr ""
msgid "Total Time"
msgstr ""
......@@ -4809,6 +4989,21 @@ msgstr ""
msgid "Unresolve discussion"
msgstr ""
msgid "Unstage all"
msgstr ""
msgid "Unstage changes"
msgstr ""
msgid "Unstaged"
msgstr ""
msgid "Unstaged %{type}"
msgstr ""
msgid "Unstaged and staged %{type}"
msgstr ""
msgid "Unstar"
msgstr ""
......@@ -4950,6 +5145,9 @@ msgstr ""
msgid "Weight"
msgstr ""
msgid "Weight %{weight}"
msgstr ""
msgid "When leaving the URL blank, classification labels can still be specified whitout disabling cross project features or performing external authorization checks."
msgstr ""
......@@ -5196,6 +5394,9 @@ msgstr ""
msgid "Your projects"
msgstr ""
msgid "ago"
msgstr ""
msgid "among other things"
msgstr ""
......@@ -5363,6 +5564,12 @@ msgstr[1] ""
msgid "detected no vulnerabilities"
msgstr ""
msgid "disabled"
msgstr ""
msgid "enabled"
msgstr ""
msgid "estimateCommand|%{slash_command} will update the estimated time with the latest command."
msgstr ""
......@@ -5604,6 +5811,9 @@ msgstr ""
msgid "private key does not match certificate."
msgstr ""
msgid "remaining"
msgstr ""
msgid "remove due date"
msgstr ""
......
spec/factories/projects.rb
View file @ 9647b407
......@@ -181,7 +181,6 @@ FactoryBot.define do
# an API that isn't running
project.gitlab_shell.rm_directory(project.repository_storage,
File.join("#{project.disk_path}.git", 'hooks'))
<<<<<<< HEAD
end
end
......@@ -194,8 +193,6 @@ FactoryBot.define do
after(:create) do |project, evaluator|
project.remote_mirrors.create!(url: evaluator.url, enabled: evaluator.enabled)
=======
>>>>>>> upstream/master
end
end
......
spec/helpers/projects_helper_spec.rb
View file @ 9647b407
......@@ -283,11 +283,7 @@ describe ProjectsHelper do
end
end
<<<<<<< HEAD
describe '#sanitized_repo_path' do
=======
describe '#sanitizerepo_repo_path' do
>>>>>>> upstream/master
describe '#sanitize_repo_path' do
let(:project) { create(:project, :repository) }
let(:storage_path) { Gitlab.config.repositories.storages.default.legacy_disk_path }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7