diff options
| author | Job van der Voort <jobvandervoort@gmail.com> | 2015-06-11 15:04:53 +0200 |
|---|---|---|
| committer | Job van der Voort <jobvandervoort@gmail.com> | 2015-06-11 15:04:53 +0200 |
| commit | a042b0ab83b4c17c12604c488858d12838ab24fa (patch) | |
| tree | ed495769915ff3526d7246f6e1f41ae09fd1ec55 | |
| parent | bd503e5a4e0f3d31afcf64a1c6bfbd7489f4f98e (diff) | |
| parent | 7415a1a33cd230e1fd6d261d642aeea08191b0ed (diff) | |
| download | gitlab-ce-a042b0ab83b4c17c12604c488858d12838ab24fa.tar.gz | |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/assets/images/authbuttons/google_64.png | bin | 3169 -> 5281 bytes | |||
| -rw-r--r-- | app/assets/images/authbuttons/twitter_64.png | bin | 3054 -> 4835 bytes |
3 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG index c04b8f079af..9d558b15ab9 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,7 @@ Please view this file on the master branch, on stable branches it's out of date. v 7.12.0 (unreleased) + - Update oauth button logos for Twitter and Google to recommended assets - Update browser gem to version 0.8.0 for IE11 support (Stan Hu) - Fix timeout when rendering file with thousands of lines. - Add "Remember me" checkbox to LDAP signin form. diff --git a/app/assets/images/authbuttons/google_64.png b/app/assets/images/authbuttons/google_64.png Binary files differindex 94a0e089c6e..fb64f8bee68 100644 --- a/app/assets/images/authbuttons/google_64.png +++ b/app/assets/images/authbuttons/google_64.png diff --git a/app/assets/images/authbuttons/twitter_64.png b/app/assets/images/authbuttons/twitter_64.png Binary files differindex 5c9f14cb077..e3bd9169a34 100644 --- a/app/assets/images/authbuttons/twitter_64.png +++ b/app/assets/images/authbuttons/twitter_64.png |
