Files · 16a935f28f5d9a69d0cd310d1ef035d82ee4b575 · Boxiang Sun / gitlab-ce · GitLab

History Find file

Merge branch 'leipert-resolve-fe-dependency-conflict-ce' into 'master'

Filipa Lacerda authored 6 years ago

Resolve CE/EE difference in FE dependency files

See merge request gitlab-org/gitlab-ce!26856

16a935f2

Name	Last commit	Last update
.github
.gitlab
app
bin
builds
changelogs
config
danger
db
doc
docker
fixtures/emojis
generator_templates
lib
locale
log
plugins/examples
public
qa
rubocop
scripts
shared
spec
symbol
tmp
vendor
.codeclimate.yml
.csscomb.json
.eslintignore
.eslintrc.yml
.foreman
.gitattributes
.gitignore
.gitlab-ci.yml
.haml-lint.yml
.mailmap
.nvmrc
.pkgr.yml
.prettierignore
.prettierrc
.rubocop.yml
.rubocop_todo.yml
.ruby-version
.scss-lint.yml
.stylelintrc
CHANGELOG.md
CONTRIBUTING.md
Dangerfile
Dockerfile.assets
GITALY_SERVER_VERSION
GITLAB_PAGES_VERSION
GITLAB_SHELL_VERSION
GITLAB_WORKHORSE_VERSION
Gemfile
Gemfile.lock
INSTALLATION_TYPE
LICENSE
MAINTENANCE.md
PHILOSOPHY.md
PROCESS.md
Pipfile
Pipfile.lock
Procfile
README.md
Rakefile
VERSION
babel.config.js
config.ru
docker-compose.yml
jest.config.js
package.json
yarn.lock