diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2018-09-06 21:06:55 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2018-09-06 21:06:55 +0000 |
| commit | 915306ec50c50b3b1b0793150a7cb4f31fbbee75 (patch) | |
| tree | c9f6a045ee02003ca9b715783692cb1d623f619d /app/assets/images | |
| parent | c353773787407158b6319b6944dee57a6e3522b9 (diff) | |
| parent | 7aa6766cd15036dcfb5391b3fd7bffb9069ffbcf (diff) | |
| download | gitlab-ce-915306ec50c50b3b1b0793150a7cb4f31fbbee75.tar.gz | |
Merge branch 'master' into 'alerts-for-built-in-metrics'
# Conflicts:
# db/schema.rb
Diffstat (limited to 'app/assets/images')
| -rw-r--r-- | app/assets/images/auth_buttons/auth0_64.png | bin | 0 -> 1815 bytes |
| -rw-r--r-- | app/assets/images/auth_buttons/azure_64.png | bin | 695 -> 199 bytes |
| -rw-r--r-- | app/assets/images/auth_buttons/bitbucket_64.png | bin | 2161 -> 1299 bytes |
| -rw-r--r-- | app/assets/images/auth_buttons/google_64.png | bin | 4366 -> 1625 bytes |
| -rw-r--r-- | app/assets/images/auth_buttons/jwt_64.png | bin | 0 -> 2457 bytes |
| -rw-r--r-- | app/assets/images/auth_buttons/shibboleth_64.png | bin | 0 -> 2993 bytes |
6 files changed, 0 insertions, 0 deletions
diff --git a/app/assets/images/auth_buttons/auth0_64.png b/app/assets/images/auth_buttons/auth0_64.png Binary files differnew file mode 100644 index 00000000000..5ad59659380 --- /dev/null +++ b/app/assets/images/auth_buttons/auth0_64.png diff --git a/app/assets/images/auth_buttons/azure_64.png b/app/assets/images/auth_buttons/azure_64.png Binary files differindex 85de7793440..168a9c81395 100644 --- a/app/assets/images/auth_buttons/azure_64.png +++ b/app/assets/images/auth_buttons/azure_64.png diff --git a/app/assets/images/auth_buttons/bitbucket_64.png b/app/assets/images/auth_buttons/bitbucket_64.png Binary files differindex b3d022a5a70..0edf7f52a11 100644 --- a/app/assets/images/auth_buttons/bitbucket_64.png +++ b/app/assets/images/auth_buttons/bitbucket_64.png diff --git a/app/assets/images/auth_buttons/google_64.png b/app/assets/images/auth_buttons/google_64.png Binary files differindex 720824230a5..389c1cd54ca 100644 --- a/app/assets/images/auth_buttons/google_64.png +++ b/app/assets/images/auth_buttons/google_64.png diff --git a/app/assets/images/auth_buttons/jwt_64.png b/app/assets/images/auth_buttons/jwt_64.png Binary files differnew file mode 100644 index 00000000000..ca97ae47002 --- /dev/null +++ b/app/assets/images/auth_buttons/jwt_64.png diff --git a/app/assets/images/auth_buttons/shibboleth_64.png b/app/assets/images/auth_buttons/shibboleth_64.png Binary files differnew file mode 100644 index 00000000000..d4c752f9400 --- /dev/null +++ b/app/assets/images/auth_buttons/shibboleth_64.png |
