Merge branch 'slack_landing_page' into 'master'
Slack application landing page Closes #3027 See merge request gitlab-org/gitlab-ee!2415
Showing
1.46 MB
This source diff could not be displayed because it is too large. You can view the blob instead.
... | @@ -75,6 +75,7 @@ | ... | @@ -75,6 +75,7 @@ |
"webpack-stats-plugin": "^0.1.5" | "webpack-stats-plugin": "^0.1.5" | ||
}, | }, | ||
"devDependencies": { | "devDependencies": { | ||
"@gitlab-org/gitlab-svgs": "^1.0.2", | |||
"babel-plugin-istanbul": "^4.0.0", | "babel-plugin-istanbul": "^4.0.0", | ||
"eslint": "^3.10.1", | "eslint": "^3.10.1", | ||
"eslint-config-airbnb-base": "^10.0.1", | "eslint-config-airbnb-base": "^10.0.1", | ||
... | @@ -83,7 +84,6 @@ | ... | @@ -83,7 +84,6 @@ |
"eslint-plugin-import": "^2.2.0", | "eslint-plugin-import": "^2.2.0", | ||
"eslint-plugin-jasmine": "^2.1.0", | "eslint-plugin-jasmine": "^2.1.0", | ||
"eslint-plugin-promise": "^3.5.0", | "eslint-plugin-promise": "^3.5.0", | ||
"gitlab-svgs": "https://gitlab.com/gitlab-org/gitlab-svgs.git", | |||
"istanbul": "^0.4.5", | "istanbul": "^0.4.5", | ||
"jasmine-core": "^2.6.3", | "jasmine-core": "^2.6.3", | ||
"jasmine-jquery": "^2.1.1", | "jasmine-jquery": "^2.1.1", | ||
... | ... |