summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke "Jared" Bennett <lbennett@gitlab.com>2016-06-24 16:17:28 +0100
committerLuke "Jared" Bennett <lbennett@gitlab.com>2016-06-24 16:18:40 +0100
commit47a3d1293bb9d4bca800fd5825df49d6f9f07991 (patch)
treeac7aa62bf8449fb1dc0dd3ba28c67561efbc1dcd
parent2f5e3ee6adf6575e7260a5b6decc1300afa4a49b (diff)
downloadgitlab-ce-add-autoprefixer-to-assets-pipeline.tar.gz
Added autoprefixer-rails to Gemfile and added browser config, use 'rake autoprefixer:info' to dry run and run 'rake tmp:clear' if changing the config yamladd-autoprefixer-to-assets-pipeline
-rw-r--r--Gemfile3
-rw-r--r--Gemfile.lock6
-rw-r--r--config/autoprefixer.yml13
3 files changed, 19 insertions, 3 deletions
diff --git a/Gemfile b/Gemfile
index 092ea9d69b0..0fe73db8c17 100644
--- a/Gemfile
+++ b/Gemfile
@@ -233,6 +233,9 @@ gem 'virtus', '~> 1.0.1'
gem 'net-ssh', '~> 3.0.1'
gem 'base32', '~> 0.3.0'
+# Stylesheet vendor prefixer
+gem "autoprefixer-rails", '~> 6.3.6'
+
# Sentry integration
gem 'sentry-raven', '~> 0.15'
diff --git a/Gemfile.lock b/Gemfile.lock
index ba16e4bf337..762d888ebe5 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -62,9 +62,8 @@ GEM
attr_encrypted (3.0.1)
encryptor (~> 3.0.0)
attr_required (1.0.0)
- autoprefixer-rails (6.2.3)
+ autoprefixer-rails (6.3.6.2)
execjs
- json
awesome_print (1.2.0)
axiom-types (0.1.1)
descendants_tracker (~> 0.0.4)
@@ -191,7 +190,7 @@ GEM
escape_utils (1.1.1)
eventmachine (1.0.8)
excon (0.49.0)
- execjs (2.6.0)
+ execjs (2.7.0)
expression_parser (0.9.0)
factory_girl (4.5.0)
activesupport (>= 3.0.0)
@@ -825,6 +824,7 @@ DEPENDENCIES
asana (~> 0.4.0)
asciidoctor (~> 1.5.2)
attr_encrypted (~> 3.0.0)
+ autoprefixer-rails (~> 6.3.6)
awesome_print (~> 1.2.0)
babosa (~> 1.0.2)
base32 (~> 0.3.0)
diff --git a/config/autoprefixer.yml b/config/autoprefixer.yml
new file mode 100644
index 00000000000..d15901d3e04
--- /dev/null
+++ b/config/autoprefixer.yml
@@ -0,0 +1,13 @@
+browsers:
+ # Desktop
+ - "last 2 Chrome versions"
+ - "last 2 Edge versions"
+ - "Explorer >= 11"
+ - "last 2 Firefox versions"
+ # Mobile
+ - "last 2 Android versions"
+ - "last 2 ChromeAndroid versions"
+ - "last 2 ExplorerMobile versions"
+ - "last 2 FirefoxAndroid versions"
+ - "last 2 iOS versions"
+ - "last 2 Safari versions"