Skip to content

G
gitlab-ce
Commit b0e67b9e authored by Valery Sizov's avatar Valery Sizov
Browse files
Options

Resolve conflicts

parent f44e8aac
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 214 deletions
app/services/projects/destroy_service.rb
View file @ b0e67b9e
......@@ -34,7 +34,6 @@ module Projects
unless remove_legacy_registry_tags
raise_error('Failed to remove some tags in project container registry. Please try again or contact administrator.')
<<<<<<< HEAD
end
unless remove_repository(repo_path)
......@@ -43,8 +42,6 @@ module Projects
unless remove_repository(wiki_path)
raise_error('Failed to remove wiki repository. Please try again or contact administrator.')
=======
>>>>>>> 57ef7bca47f3cdeedd684779f1b1f825bb778cec
end
end
......
app/views/projects/blob/_blob.html.haml
View file @ b0e67b9e
......@@ -26,16 +26,6 @@
#blob-content-holder.blob-content-holder
%article.file-holder
= render "projects/blob/header", blob: blob
<<<<<<< HEAD
- if current_user
.js-file-fork-suggestion-section.file-fork-suggestion.hidden
%span.file-fork-suggestion-note
You don't have permission to edit this file. Try forking this project to edit the file.
= link_to 'Fork', fork_path, method: :post, class: 'btn btn-grouped btn-inverted btn-new'
%button.js-cancel-fork-suggestion.btn.btn-grouped{ type: 'button' }
Cancel
=======
>>>>>>> 57ef7bca47f3cdeedd684779f1b1f825bb778cec
- if blob.empty?
.file-content.code
......
app/views/shared/issuable/_search_bar.html.haml
View file @ b0e67b9e
......@@ -73,10 +73,7 @@
{{name}}
%span.dropdown-light-content
@{{username}}
<<<<<<< HEAD
=======
>>>>>>> 57ef7bca47f3cdeedd684779f1b1f825bb778cec
- unless board && board.milestone_id
#js-dropdown-milestone.filtered-search-input-dropdown-menu.dropdown-menu{ data: { icon: 'clock-o', hint: 'milestone', tag: '%milestone' } }
%ul{ data: { dropdown: true } }
......@@ -94,10 +91,7 @@
%li.filter-dropdown-item
%button.btn.btn-link.js-data-value
{{title}}
<<<<<<< HEAD
=======
>>>>>>> 57ef7bca47f3cdeedd684779f1b1f825bb778cec
#js-dropdown-label.filtered-search-input-dropdown-menu.dropdown-menu{ data: { icon: 'tag', hint: 'label', tag: '~label', type: 'array' } }
%ul{ data: { dropdown: true } }
%li.filter-dropdown-item{ data: { value: 'none' } }
......
config/routes/project.rb
View file @ b0e67b9e
......@@ -166,10 +166,7 @@ constraints(ProjectUrlConstrainer.new) do
resources :push_access_levels, only: [:destroy]
end
end
<<<<<<< HEAD
=======
>>>>>>> 57ef7bca47f3cdeedd684779f1b1f825bb778cec
resources :protected_tags, only: [:index, :show, :create, :update, :destroy], constraints: { id: Gitlab::Regex.git_reference_regex }
resources :variables, only: [:index, :show, :update, :create, :destroy]
......
db/schema.rb
View file @ b0e67b9e
......@@ -11,12 +11,8 @@
#
# It's strongly recommended that you check this file into your version control system.
<<<<<<< HEAD
ActiveRecord::Schema.define(version: 20170408033905) do
=======
ActiveRecord::Schema.define(version: 20170407140450) do
>>>>>>> 57ef7bca47f3cdeedd684779f1b1f825bb778cec
# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"
enable_extension "pg_trgm"
......
doc/README.md
View file @ b0e67b9e
......@@ -44,14 +44,11 @@ All technical content published by GitLab lives in the documentation, including:
- [Upload your GitLab License](user/admin_area/license.md) Upload the license you purchased for GitLab Enterprise Edition to unlock its features.
- [Audit Events](administration/audit_events.md) Check how user access changed in projects and groups.
- [Access restrictions](user/admin_area/settings/visibility_and_access_controls.md#enabled-git-access-protocols) Define which Git access protocols can be used to talk to GitLab
<<<<<<< HEAD
- [Authentication/Authorization](administration/auth/README.md) Configure external authentication with LDAP, SAML, CAS and additional Omniauth providers.
- [Changing the appearance of the login page](customization/branded_login_page.md) Make the login page branded for your GitLab instance.
- [Email](tools/email.md) Email GitLab users from GitLab
- [Push Rules](push_rules/push_rules.md) Advanced push rules for your project.
- [Help message](customization/help_message.md) Set information about administrators of your GitLab instance.
=======
>>>>>>> 57ef7bca47f3cdeedd684779f1b1f825bb778cec
- [Authentication/Authorization](administration/auth/README.md) Configure external authentication with LDAP, SAML, CAS and additional Omniauth providers.
- [Changing the appearance of the login page](customization/branded_login_page.md) Make the login page branded for your GitLab instance.
- [Email](tools/email.md) Email GitLab users from GitLab
- [Push Rules](push_rules/push_rules.md) Advanced push rules for your project.
......
doc/api/issues.md
View file @ b0e67b9e
......@@ -112,11 +112,7 @@ GET /groups/:id/issues?search=issue+title+or+description
| Attribute | Type | Required | Description |
|-------------|----------------|----------|-----------------------------------------------------------------------------------------------------------------------------|
<<<<<<< HEAD
| `id` | integer/string | yes | The ID or [URL-encoded path of the group](README.md#namespaced-path-encoding) owned by the authenticated user |
=======
| `id` | integer/string | yes | The ID or [URL-encoded path of the group](README.md#namespaced-path-encoding) owned by the authenticated user |
>>>>>>> 57ef7bca47f3cdeedd684779f1b1f825bb778cec
| `state` | string | no | Return all issues or just those that are `opened` or `closed` |
| `labels` | string | no | Comma-separated list of label names, issues must have all labels to be returned. `No+Label` lists all issues with no labels |
| `iids` | Array[integer] | no | Return only the issues having the given `iid` |
......
features/steps/project/merge_requests.rb
View file @ b0e67b9e
......@@ -623,11 +623,7 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
step 'I should not see merge button' do
page.within '.mr-state-widget' do
<<<<<<< HEAD
expect(page).not_to have_button('Accept merge mequest')
=======
expect(page).not_to have_button('Accept merge request')
>>>>>>> 57ef7bca47f3cdeedd684779f1b1f825bb778cec
end
end
......
spec/javascripts/droplab/drop_down_spec.js
View file @ b0e67b9e
......@@ -130,11 +130,7 @@ describe('DropDown', function () {
beforeEach(function () {
this.list = { dispatchEvent: () => {} };
this.dropdown = { hide: () => {}, list: this.list, addSelectedClass: () => {} };
<<<<<<< HEAD
this.event = { preventDefault: () => {}, target: {} };
=======
this.event = { preventDefault: () => {}, target: 'target' };
>>>>>>> 57ef7bca47f3cdeedd684779f1b1f825bb778cec
this.customEvent = {};
this.closestElement = {};
......
yarn.lock
View file @ b0e67b9e
......@@ -25,11 +25,7 @@ acorn-jsx@^3.0.0:
dependencies:
acorn "^3.0.4"
<<<<<<< HEAD
acorn@4.0.4:
=======
acorn@4.0.4, acorn@^4.0.4:
>>>>>>> 57ef7bca47f3cdeedd684779f1b1f825bb778cec
version "4.0.4"
resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.4.tgz#17a8d6a7a6c4ef538b814ec9abac2779293bf30a"
......@@ -878,11 +874,7 @@ block-stream@*:
dependencies:
inherits "~2.0.0"
<<<<<<< HEAD
bluebird@^3.0.5, bluebird@^3.1.1, bluebird@^3.3.0:
=======
bluebird@^3.3.0:
>>>>>>> 57ef7bca47f3cdeedd684779f1b1f825bb778cec
version "3.4.7"
resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.4.7.tgz#f72d760be09b7f76d08ed8fae98b289a8d05fab3"
......@@ -1562,11 +1554,7 @@ debug@2.3.3:
dependencies:
ms "0.7.2"
<<<<<<< HEAD
debug@2.6.0, debug@^2.1.0, debug@^2.1.1, debug@^2.2.0:
=======
debug@2.6.0, debug@^2.1.1, debug@^2.2.0:
>>>>>>> 57ef7bca47f3cdeedd684779f1b1f825bb778cec
version "2.6.0"
resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.0.tgz#bc596bcabe7617f11d9fa15361eded5608b8499b"
dependencies:
......@@ -1774,15 +1762,6 @@ encodeurl@~1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.1.tgz#79e3d58655346909fe6f0f45a5de68103b294d20"
<<<<<<< HEAD
end-of-stream@1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.0.0.tgz#d4596e702734a93e40e9af864319eabd99ff2f0e"
dependencies:
once "~1.3.0"
=======
>>>>>>> 57ef7bca47f3cdeedd684779f1b1f825bb778cec
engine.io-client@1.8.2:
version "1.8.2"
resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-1.8.2.tgz#c38767547f2a7d184f5752f6f0ad501006703766"
......@@ -2103,7 +2082,6 @@ eve-raphael@0.5.0:
event-emitter@~0.3.4:
version "0.3.4"
resolved "https://registry.yarnpkg.com/event-emitter/-/event-emitter-0.3.4.tgz#8d63ddfb4cfe1fae3b32ca265c4c720222080bb5"
<<<<<<< HEAD
dependencies:
d "~0.1.1"
es5-ext "~0.10.7"
......@@ -2119,11 +2097,9 @@ event-stream@~3.3.0:
split "0.3"
stream-combiner "~0.0.4"
through "~2.3.1"
=======
dependencies:
d "~0.1.1"
es5-ext "~0.10.7"
>>>>>>> 57ef7bca47f3cdeedd684779f1b1f825bb778cec
eventemitter3@1.x.x:
version "1.2.0"
......@@ -2133,11 +2109,7 @@ events@^1.0.0:
version "1.1.1"
resolved "https://registry.yarnpkg.com/events/-/events-1.1.1.tgz#9ebdb7635ad099c70dcc4c2a1f5004288e8bd924"
<<<<<<< HEAD
eventsource@0.1.6, eventsource@^0.1.3:
=======
eventsource@~0.1.6:
>>>>>>> 57ef7bca47f3cdeedd684779f1b1f825bb778cec
eventsource@~0.1.6, eventsource@0.1.6, eventsource@^0.1.3:
version "0.1.6"
resolved "https://registry.yarnpkg.com/eventsource/-/eventsource-0.1.6.tgz#0acede849ed7dd1ccc32c811bb11b944d4f29232"
dependencies:
......@@ -2369,13 +2341,6 @@ flat-cache@^1.2.1:
graceful-fs "^4.1.2"
write "^0.2.1"
<<<<<<< HEAD
flatten@^1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/flatten/-/flatten-1.0.2.tgz#dae46a9d78fbe25292258cc1e780a41d95c03782"
=======
>>>>>>> 57ef7bca47f3cdeedd684779f1b1f825bb778cec
for-in@^0.1.5:
version "0.1.6"
resolved "https://registry.yarnpkg.com/for-in/-/for-in-0.1.6.tgz#c9f96e89bfad18a545af5ec3ed352a1d9e5b4dc8"
......@@ -2405,13 +2370,6 @@ forwarded@~0.1.0:
fresh@0.3.0:
version "0.3.0"
resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.3.0.tgz#651f838e22424e7566de161d8358caa199f83d4f"
<<<<<<< HEAD
from@~0:
version "0.1.7"
resolved "https://registry.yarnpkg.com/from/-/from-0.1.7.tgz#83c60afc58b9c56997007ed1a768b3ab303a44fe"
=======
>>>>>>> 57ef7bca47f3cdeedd684779f1b1f825bb778cec
fs-extra@~1.0.0:
version "1.0.0"
......@@ -2536,15 +2494,13 @@ globby@^5.0.0:
pify "^2.0.0"
pinkie-promise "^2.0.0"
<<<<<<< HEAD
good-listener@^1.2.0:
version "1.2.2"
resolved "https://registry.yarnpkg.com/good-listener/-/good-listener-1.2.2.tgz#d53b30cdf9313dffb7dc9a0d477096aa6d145c50"
dependencies:
delegate "^3.1.2"
graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.1.9:
=======
got@^3.2.0:
version "3.3.1"
resolved "https://registry.yarnpkg.com/got/-/got-3.3.1.tgz#e5d0ed4af55fc3eef4d56007769d98192bcb2eca"
......@@ -2561,7 +2517,6 @@ got@^3.2.0:
timed-out "^2.0.0"
graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.1.9:
>>>>>>> 19dd138cdd4e551759a2163f5357ae2fc9f73b99
version "4.1.11"
resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
......@@ -2628,13 +2583,6 @@ has@^1.0.1:
dependencies:
function-bind "^1.0.2"
<<<<<<< HEAD
hash-sum@^1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/hash-sum/-/hash-sum-1.0.2.tgz#33b40777754c6432573c120cc3808bbd10d47f04"
=======
>>>>>>> 57ef7bca47f3cdeedd684779f1b1f825bb778cec
hash.js@^1.0.0:
version "1.0.3"
resolved "https://registry.yarnpkg.com/hash.js/-/hash.js-1.0.3.tgz#1332ff00156c0a0ffdd8236013d07b77a0451573"
......@@ -2657,13 +2605,6 @@ hawk@~3.1.3:
hoek "2.x.x"
sntp "1.x.x"
<<<<<<< HEAD
he@^1.1.0:
version "1.1.1"
resolved "https://registry.yarnpkg.com/he/-/he-1.1.1.tgz#93410fd21b009735151f8868c2f271f3427e23fd"
=======
>>>>>>> 57ef7bca47f3cdeedd684779f1b1f825bb778cec
hoek@2.x.x:
version "2.16.3"
resolved "https://registry.yarnpkg.com/hoek/-/hoek-2.16.3.tgz#20bb7403d3cea398e91dc4710a8ff1b8274a25ed"
......@@ -2719,15 +2660,9 @@ http-errors@~1.5.0, http-errors@~1.5.1:
setprototypeof "1.0.2"
statuses ">= 1.3.1 < 2"
<<<<<<< HEAD
http-proxy-middleware@~0.17.4:
version "0.17.4"
resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-0.17.4.tgz#642e8848851d66f09d4f124912846dbaeb41b833"
=======
http-proxy-middleware@~0.17.1:
version "0.17.3"
resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-0.17.3.tgz#940382147149b856084f5534752d5b5a8168cd1d"
>>>>>>> 57ef7bca47f3cdeedd684779f1b1f825bb778cec
dependencies:
http-proxy "^1.16.2"
is-glob "^3.1.0"
......@@ -2847,13 +2782,10 @@ invert-kv@^1.0.0:
ipaddr.js@1.2.0:
version "1.2.0"
resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.2.0.tgz#8aba49c9192799585bdd643e0ccb50e8ae777ba4"
<<<<<<< HEAD
is-absolute-url@^2.0.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/is-absolute-url/-/is-absolute-url-2.1.0.tgz#50530dfb84fcc9aa7dbe7852e83a37b93b9f2aa6"
=======
>>>>>>> 57ef7bca47f3cdeedd684779f1b1f825bb778cec
is-absolute@^0.2.3:
version "0.2.6"
......@@ -3163,7 +3095,6 @@ jquery-ujs@^1.2.1:
jquery@>=1.8.0, jquery@^2.2.1:
version "2.2.1"
resolved "https://registry.yarnpkg.com/jquery/-/jquery-2.2.1.tgz#3c3e16854ad3d2ac44ac65021b17426d22ad803f"
<<<<<<< HEAD
js-base64@^2.1.9:
version "2.1.9"
......@@ -3177,8 +3108,6 @@ js-beautify@^1.6.3:
editorconfig "^0.13.2"
mkdirp "~0.5.0"
nopt "~3.0.1"
=======
>>>>>>> 57ef7bca47f3cdeedd684779f1b1f825bb778cec
js-cookie@^2.1.3:
version "2.1.3"
......@@ -3188,11 +3117,7 @@ js-tokens@^3.0.0:
version "3.0.1"
resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.1.tgz#08e9f132484a2c45a30907e9dc4d5567b7f114d7"
<<<<<<< HEAD
js-yaml@3.x, js-yaml@^3.4.3, js-yaml@^3.5.1, js-yaml@^3.7.0:
=======
js-yaml@3.x, js-yaml@^3.5.1, js-yaml@^3.7.0:
>>>>>>> 57ef7bca47f3cdeedd684779f1b1f825bb778cec
version "3.8.1"
resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.8.1.tgz#782ba50200be7b9e5a8537001b7804db3ad02628"
dependencies:
......@@ -3695,11 +3620,7 @@ minimalistic-assert@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz#702be2dda6b37f4836bcb3f5db56641b64a1d3d3"
<<<<<<< HEAD
"minimatch@2 || 3", minimatch@3.0.3, minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3:
=======
"minimatch@2 || 3", minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3:
>>>>>>> 57ef7bca47f3cdeedd684779f1b1f825bb778cec
version "3.0.3"
resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.3.tgz#2a4e4090b96b2db06a9d7df01055a62a77c9b774"
dependencies:
......@@ -3842,7 +3763,6 @@ node-zopfli@^2.0.0:
nan "^2.0.0"
node-pre-gyp "^0.6.4"
<<<<<<< HEAD
nodemon@^1.11.0:
version "1.11.0"
resolved "https://registry.yarnpkg.com/nodemon/-/nodemon-1.11.0.tgz#226c562bd2a7b13d3d7518b49ad4828a3623d06c"
......@@ -3859,23 +3779,17 @@ nodemon@^1.11.0:
update-notifier "0.5.0"
nopt@3.x, nopt@~3.0.1, nopt@~3.0.6:
=======
nopt@3.x, nopt@~3.0.6:
>>>>>>> 57ef7bca47f3cdeedd684779f1b1f825bb778cec
version "3.0.6"
resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9"
dependencies:
abbrev "1"
<<<<<<< HEAD
nopt@~1.0.10:
version "1.0.10"
resolved "https://registry.yarnpkg.com/nopt/-/nopt-1.0.10.tgz#6ddd21bd2a31417b92727dd585f8a6f37608ebee"
dependencies:
abbrev "1"
=======
>>>>>>> 57ef7bca47f3cdeedd684779f1b1f825bb778cec
normalize-package-data@^2.3.2:
version "2.3.5"
resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.3.5.tgz#8d924f142960e1777e7ffe170543631cc7cb02df"
......@@ -3888,7 +3802,6 @@ normalize-package-data@^2.3.2:
normalize-path@^2.0.1:
version "2.0.1"
resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.0.1.tgz#47886ac1662760d4261b7d979d241709d3ce3f7a"
<<<<<<< HEAD
normalize-range@^0.1.2:
version "0.1.2"
......@@ -3902,8 +3815,6 @@ normalize-url@^1.4.0:
prepend-http "^1.0.0"
query-string "^4.1.0"
sort-keys "^1.0.0"
=======
>>>>>>> 57ef7bca47f3cdeedd684779f1b1f825bb778cec
npmlog@^4.0.1:
version "4.0.2"
......@@ -3969,11 +3880,7 @@ once@1.x, once@^1.3.0, once@^1.4.0:
dependencies:
wrappy "1"
<<<<<<< HEAD
once@~1.3.0, once@~1.3.3:
=======
once@~1.3.3:
>>>>>>> 57ef7bca47f3cdeedd684779f1b1f825bb778cec
version "1.3.3"
resolved "https://registry.yarnpkg.com/once/-/once-1.3.3.tgz#b2e261557ce4c314ec8304f3fa82663e4297ca20"
dependencies:
......@@ -4040,7 +3947,6 @@ os-tmpdir@^1.0.1, os-tmpdir@~1.0.1:
version "1.0.2"
resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
<<<<<<< HEAD
osenv@^0.1.0:
version "0.1.4"
resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.4.tgz#42fe6d5953df06c8064be6f176c3d05aaaa34644"
......@@ -4048,8 +3954,6 @@ osenv@^0.1.0:
os-homedir "^1.0.0"
os-tmpdir "^1.0.0"
=======
>>>>>>> 57ef7bca47f3cdeedd684779f1b1f825bb778cec
p-limit@^1.1.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.1.0.tgz#b07ff2d9a5d88bec806035895a2bab66a27988bc"
......@@ -4585,7 +4489,6 @@ qs@6.2.1:
qs@~6.3.0:
version "6.3.0"
resolved "https://registry.yarnpkg.com/qs/-/qs-6.3.0.tgz#f403b264f23bc01228c74131b407f18d5ea5d442"
<<<<<<< HEAD
query-string@^4.1.0:
version "4.3.2"
......@@ -4593,8 +4496,6 @@ query-string@^4.1.0:
dependencies:
object-assign "^4.1.0"
strict-uri-encode "^1.0.0"
=======
>>>>>>> 57ef7bca47f3cdeedd684779f1b1f825bb778cec
querystring-es3@^0.2.0:
version "0.2.1"
......@@ -4641,11 +4542,7 @@ raw-loader@^0.5.1:
version "0.5.1"
resolved "https://registry.yarnpkg.com/raw-loader/-/raw-loader-0.5.1.tgz#0c3d0beaed8a01c966d9787bf778281252a979aa"
<<<<<<< HEAD
rc@^1.0.1, rc@~1.1.6:
=======
rc@~1.1.6:
>>>>>>> 57ef7bca47f3cdeedd684779f1b1f825bb778cec
version "1.1.6"
resolved "https://registry.yarnpkg.com/rc/-/rc-1.1.6.tgz#43651b76b6ae53b5c802f1151fa3fc3b059969c9"
dependencies:
......@@ -4653,7 +4550,6 @@ rc@~1.1.6:
ini "~1.3.0"
minimist "^1.2.0"
strip-json-comments "~1.0.4"
<<<<<<< HEAD
react-dev-utils@^0.5.2:
version "0.5.2"
......@@ -4676,8 +4572,6 @@ read-all-stream@^3.0.0:
dependencies:
pinkie-promise "^2.0.0"
readable-stream "^2.0.0"
=======
>>>>>>> 57ef7bca47f3cdeedd684779f1b1f825bb778cec
read-pkg-up@^1.0.1:
version "1.0.1"
......@@ -4694,11 +4588,7 @@ read-pkg@^1.0.0:
normalize-package-data "^2.3.2"
path-type "^1.0.0"
<<<<<<< HEAD
readable-stream@^2.0.0, "readable-stream@^2.0.0 || ^1.1.13", readable-stream@^2.1.0, readable-stream@^2.2.2:
=======
"readable-stream@^2.0.0 || ^1.1.13", readable-stream@^2.0.2, readable-stream@^2.1.0, readable-stream@^2.2.2:
>>>>>>> 57ef7bca47f3cdeedd684779f1b1f825bb778cec
version "2.2.2"
resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.2.2.tgz#a9e6fec3c7dda85f8bb1b3ba7028604556fc825e"
dependencies:
......@@ -4979,17 +4869,10 @@ select2@3.5.2-browserify:
version "3.5.2-browserify"
resolved "https://registry.yarnpkg.com/select2/-/select2-3.5.2-browserify.tgz#dc4dafda38d67a734e8a97a46f0d3529ae05391d"
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 57ef7bca47f3cdeedd684779f1b1f825bb778cec
select@^1.1.2:
version "1.1.2"
resolved "https://registry.yarnpkg.com/select/-/select-1.1.2.tgz#0e7350acdec80b1108528786ec1d4418d11b396d"
"semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@~5.3.0:
<<<<<<< HEAD
=======
semver-diff@^2.0.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/semver-diff/-/semver-diff-2.1.0.tgz#4bbb8437c8d37e4b0cf1a68fd726ec6d645d6d36"
......@@ -4997,9 +4880,6 @@ semver-diff@^2.0.0:
semver "^5.0.3"
"semver@2 || 3 || 4 || 5", semver@^5.0.3, semver@^5.3.0, semver@~5.3.0:
>>>>>>> 19dd138cdd4e551759a2163f5357ae2fc9f73b99
=======
>>>>>>> 57ef7bca47f3cdeedd684779f1b1f825bb778cec
version "5.3.0"
resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"
......@@ -5146,26 +5026,9 @@ socket.io@1.7.2:
socket.io-client "1.7.2"
socket.io-parser "2.3.1"
<<<<<<< HEAD
sockjs-client@1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/sockjs-client/-/sockjs-client-1.0.1.tgz#8943ae05b46547bc2054816c409002cf5e2fe026"
dependencies:
debug "^2.1.0"
eventsource "^0.1.3"
faye-websocket "~0.7.3"
inherits "^2.0.1"
json3 "^3.3.2"
url-parse "^1.0.1"
sockjs-client@1.1.2:
version "1.1.2"
resolved "https://registry.yarnpkg.com/sockjs-client/-/sockjs-client-1.1.2.tgz#f0212a8550e4c9468c8cceaeefd2e3493c033ad5"
=======
sockjs-client@1.1.1:
version "1.1.1"
resolved "https://registry.yarnpkg.com/sockjs-client/-/sockjs-client-1.1.1.tgz#284843e9a9784d7c474b1571b3240fca9dda4bb0"
>>>>>>> 57ef7bca47f3cdeedd684779f1b1f825bb778cec
dependencies:
debug "^2.2.0"
eventsource "~0.1.6"
......@@ -5181,7 +5044,6 @@ sockjs@0.3.18:
faye-websocket "^0.10.0"
uuid "^2.0.2"
<<<<<<< HEAD
sort-keys@^1.0.0:
version "1.1.2"
resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-1.1.2.tgz#441b6d4d346798f1b4e49e8920adfba0e543f9ad"
......@@ -5189,9 +5051,6 @@ sort-keys@^1.0.0:
is-plain-obj "^1.0.0"
source-list-map@^0.1.7, source-list-map@~0.1.7:
=======
source-list-map@~0.1.7:
>>>>>>> 57ef7bca47f3cdeedd684779f1b1f825bb778cec
version "0.1.8"
resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-0.1.8.tgz#c550b2ab5427f6b3f21f5afead88c4f5587b2106"
......@@ -5643,11 +5502,7 @@ url-parse@1.0.x:
querystringify "0.0.x"
requires-port "1.0.x"
<<<<<<< HEAD
url-parse@^1.0.1, url-parse@^1.1.1:
=======
url-parse@^1.1.1:
>>>>>>> 57ef7bca47f3cdeedd684779f1b1f825bb778cec
version "1.1.7"
resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.1.7.tgz#025cff999653a459ab34232147d89514cc87d74a"
dependencies:
......@@ -5706,13 +5561,10 @@ validate-npm-package-license@^3.0.1:
vary@~1.1.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.0.tgz#e1e5affbbd16ae768dd2674394b9ad3022653140"
<<<<<<< HEAD
vendors@^1.0.0:
version "1.0.1"
resolved "https://registry.yarnpkg.com/vendors/-/vendors-1.0.1.tgz#37ad73c8ee417fb3d580e785312307d274847f22"
=======
>>>>>>> 57ef7bca47f3cdeedd684779f1b1f825bb778cec
verror@1.3.6:
version "1.3.6"
......@@ -5759,7 +5611,6 @@ vue-resource@^0.9.3:
version "0.9.3"
resolved "https://registry.yarnpkg.com/vue-resource/-/vue-resource-0.9.3.tgz#ab46e1c44ea219142dcc28ae4043b3b04c80959d"
<<<<<<< HEAD
vue-style-loader@^2.0.0:
version "2.0.5"
resolved "https://registry.yarnpkg.com/vue-style-loader/-/vue-style-loader-2.0.5.tgz#f0efac992febe3f12e493e334edb13cd235a3d22"
......@@ -5781,11 +5632,6 @@ vue-template-es2015-compiler@^1.2.2:
vue@^2.2.6:
version "2.2.6"
resolved "https://registry.yarnpkg.com/vue/-/vue-2.2.6.tgz#451714b394dd6d4eae7b773c40c2034a59621aed"
=======
vue@^2.2.4:
version "2.2.4"
resolved "https://registry.yarnpkg.com/vue/-/vue-2.2.4.tgz#d0a3a050a80a12356d7950ae5a7b3131048209cc"
>>>>>>> 57ef7bca47f3cdeedd684779f1b1f825bb778cec
watchpack@^1.2.0:
version "1.2.1"
......@@ -5825,15 +5671,9 @@ webpack-dev-middleware@^1.0.11, webpack-dev-middleware@^1.9.0:
path-is-absolute "^1.0.0"
range-parser "^1.0.3"
<<<<<<< HEAD
webpack-dev-server@^2.4.2:
version "2.4.2"
resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-2.4.2.tgz#cf595d6b40878452b6d2ad7229056b686f8a16be"
=======
webpack-dev-server@^2.3.0:
version "2.3.0"
resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-2.3.0.tgz#0437704bbd4d941a6e4c061eb3cc232ed7d06101"
>>>>>>> 57ef7bca47f3cdeedd684779f1b1f825bb778cec
dependencies:
ansi-html "0.0.7"
chokidar "^1.6.0"
......@@ -5853,18 +5693,13 @@ webpack-dev-server@^2.3.0:
webpack-dev-middleware "^1.9.0"
yargs "^6.0.0"
<<<<<<< HEAD
webpack-sources@^0.1.0:
=======
webpack-sources@^0.1.0, webpack-sources@^0.1.4:
>>>>>>> 57ef7bca47f3cdeedd684779f1b1f825bb778cec
version "0.1.4"
resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-0.1.4.tgz#ccc2c817e08e5fa393239412690bb481821393cd"
dependencies:
source-list-map "~0.1.7"
source-map "~0.5.3"
<<<<<<< HEAD
webpack-sources@^0.2.3:
version "0.2.3"
resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-0.2.3.tgz#17c62bfaf13c707f9d02c479e0dcdde8380697fb"
......@@ -5875,11 +5710,6 @@ webpack-sources@^0.2.3:
webpack@^2.3.3:
version "2.3.3"
resolved "https://registry.yarnpkg.com/webpack/-/webpack-2.3.3.tgz#eecc083c18fb7bf958ea4f40b57a6640c5a0cc78"
=======
webpack@^2.2.1:
version "2.2.1"
resolved "https://registry.yarnpkg.com/webpack/-/webpack-2.2.1.tgz#7bb1d72ae2087dd1a4af526afec15eed17dda475"
>>>>>>> 57ef7bca47f3cdeedd684779f1b1f825bb778cec
dependencies:
acorn "^4.0.4"
acorn-dynamic-import "^2.0.0"
......
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