Robert Speicher ed2a8ba600 Merge 8-2-stable into 8-2-stable-ee ...

Conflicts remaining:

- app/controllers/groups/group_members_controller.rb
- app/controllers/projects/project_members_controller.rb
- app/models/ability.rb
- app/models/member.rb
- app/models/project.rb

2015-11-19 10:33:18 -05:00

..

groups

Make UI more compact

2015-09-04 11:17:25 +02:00

issuable

Merge remote-tracking branch 'ce/master' into ce-to-ee

2015-11-13 12:34:34 -05:00

projects

Replace CoffeeScript block into JavaScript in Views.

2015-11-10 19:17:37 +08:00

snippets

Update style of snippet detail page

2015-10-18 12:54:02 +02:00

_choose_group_avatar_button.html.haml

Refactor buttons

2015-03-14 00:29:32 -07:00

_clone_panel.html.haml

Merge branch 'mirror-repository' into 'master'

2015-11-18 16:50:49 -05:00

_commit_message_container.html.haml

Quick Submit all the things!

2015-10-07 15:23:42 -04:00

_confirm_modal.html.haml

Bootlint: Modals no longer need a '.hide' class

2015-06-16 13:32:33 -04:00

_event_filter.html.haml

Redesign activity feed on dashboard and project pages

2015-09-03 13:46:11 +02:00

_field.html.haml

Hide password in the service settings form

2015-10-02 12:48:57 +03:00

_file_highlight.html.haml

Add user_color_scheme class to file_highlight

2015-08-26 11:34:28 -07:00

_git_hooks_form.html.haml

add missing space

2015-08-05 15:04:35 +00:00

_group_form.html.haml

Improve group rename warning

2015-03-18 20:16:36 -07:00

_group_tips.html.haml

Factor group tips

2014-10-20 23:43:51 +02:00

_import_form.html.haml

Merge 8-2-stable into 8-2-stable-ee

2015-11-19 10:33:18 -05:00

_issues.html.haml

Upgrade to Rails 4.1.9

2015-02-14 11:09:23 -07:00

_logo.svg

Animate the logo on hover

2015-10-21 08:59:30 +02:00

_merge_requests.html.haml

Upgrade to Rails 4.1.9

2015-02-14 11:09:23 -07:00

_milestones_filter.html.haml

REmove icons from milestone filters

2015-09-04 15:28:04 +02:00

_mirror_status.html.haml

Merge branch 'mirror-repository' into 'master'

2015-11-18 16:50:49 -05:00

_mirror_update_button.html.haml

Merge branch 'mirror-repository' into 'master'

2015-11-18 16:50:49 -05:00

_no_password.html.haml

LDAP users don't need to set a password to Git over HTTP.

2015-02-23 20:04:18 -08:00

_no_ssh.html.haml

Apply some styles from flatly theme

2015-03-07 00:28:53 -08:00

_outdated_browser.html.haml

check browser version, blacklisting outdated IE (version < 10)

2014-12-24 16:22:08 +01:00

_promo.html.haml

Change twitter handle from gitlabhq -> gitlab

2014-12-01 17:45:25 +01:00

_ref_switcher.html.haml

Upgrade to Rails 4.1.9

2015-02-14 11:09:23 -07:00

_service_settings.html.haml

Move service template and project service settings into a shared view

2015-04-29 07:52:27 -07:00

_show_aside.html.haml

Fix wrong placement of show-aside link

2015-04-27 00:43:02 +02:00

_sort_dropdown.html.haml

Merge branch 'link-to-button' of https://github.com/cirosantilli/gitlabhq into cirosantilli-link-to-button

2015-03-02 15:28:22 -08:00

_visibility_level.html.haml

Add new admin settings

2015-04-26 07:48:19 -06:00

_visibility_radios.html.haml

Fork visibility level fix

2015-07-06 17:40:33 +03:00