diff options
| author | Jose Ivan Vargas <jvargas@gitlab.com> | 2017-02-16 17:45:05 -0600 |
|---|---|---|
| committer | Jose Ivan Vargas <jvargas@gitlab.com> | 2017-02-23 15:47:23 -0600 |
| commit | 19a21107d7f4a256271306ae10bb376dfbc8bbad (patch) | |
| tree | c05f57be50d811130c4a8a2bf8e55975f88f4168 | |
| parent | 103f5a116b1ae6ecbef69d6903b26f7259f090cb (diff) | |
| download | gitlab-ce-19a21107d7f4a256271306ae10bb376dfbc8bbad.tar.gz | |
Added CHANGELOG and corrected linter errors
| -rw-r--r-- | app/assets/stylesheets/framework/variables.scss | 1 | ||||
| -rw-r--r-- | app/views/dashboard/projects/index.html.haml | 2 | ||||
| -rw-r--r-- | app/views/shared/_user_callout.html.haml | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/user-callouts.yml | 4 | ||||
| -rw-r--r-- | spec/features/user_callout_spec.rb | 2 |
5 files changed, 7 insertions, 4 deletions
diff --git a/app/assets/stylesheets/framework/variables.scss b/app/assets/stylesheets/framework/variables.scss index 1de05112fa7..ba0af072716 100644 --- a/app/assets/stylesheets/framework/variables.scss +++ b/app/assets/stylesheets/framework/variables.scss @@ -201,7 +201,6 @@ $table-permission-x-bg: #d9edf7; $username-color: #666; $description-color: #666; $profiler-border: #eee; -$user-callout-right: 120px; /* tanuki logo colors */ $tanuki-red: #e24329; diff --git a/app/views/dashboard/projects/index.html.haml b/app/views/dashboard/projects/index.html.haml index c7a8beab0d5..61212bc8490 100644 --- a/app/views/dashboard/projects/index.html.haml +++ b/app/views/dashboard/projects/index.html.haml @@ -19,4 +19,4 @@ = render "zero_authorized_projects" :javascript - var userCallout = new gl.UserCallout();
\ No newline at end of file + var userCallout = new gl.UserCallout(); diff --git a/app/views/shared/_user_callout.html.haml b/app/views/shared/_user_callout.html.haml index 079957a9867..cef431fe9e7 100644 --- a/app/views/shared/_user_callout.html.haml +++ b/app/views/shared/_user_callout.html.haml @@ -10,4 +10,4 @@ %p Change syntax themes, default project pages, and more in preferences. - = link_to "Check it out", profile_preferences_path, class: 'btn user-callout-btn'
\ No newline at end of file + = link_to "Check it out", profile_preferences_path, class: 'btn user-callout-btn' diff --git a/changelogs/unreleased/user-callouts.yml b/changelogs/unreleased/user-callouts.yml new file mode 100644 index 00000000000..f6ce06a3d8f --- /dev/null +++ b/changelogs/unreleased/user-callouts.yml @@ -0,0 +1,4 @@ +--- +title: Added user callouts to the projects dashboard and user profile +merge_request: +author: diff --git a/spec/features/user_callout_spec.rb b/spec/features/user_callout_spec.rb index 9ab22475b5e..7077ac2fc54 100644 --- a/spec/features/user_callout_spec.rb +++ b/spec/features/user_callout_spec.rb @@ -34,4 +34,4 @@ describe 'User Callouts', js: true do end expect(page).not_to have_selector('#user-callout') end -end
\ No newline at end of file +end |