Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/models/group.rb
	app/models/project.rb
	features/steps/shared/project.rb

Upgrade devise from 3.0.4 to 3.2.4

See merge request !960

Rework counters

* Use one style for counters in sidebar
* show amount of assigned/authored/all entities in sidebar
* fixes UI overflow for small screens

See merge request !961

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Fix gitlab_markdown_helper method header typo. rquest => request.

Add LDAP key sync to CHANGELOG-EE

Prevent html injection

Commits page renders commit description with single_format method which allows html tags. So commit message with html tags brokers Commits page. See screenshot

![Screenshot 2014-07-10 11.16.40](https://dev.gitlab.org/uploads/gitlab/gitlabhq/6606e1bac0/Screenshot_2014-07-10_11.16.40.png)

See merge request !959

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Group milestones description

Fixes #1403

See merge request !958

Get Reply button as clicked target in notes.js.coffee

See issue #401

This is a small fix to properly find the reply button as the click target when an element inside the button is clicked (e.g. in this case, the ``<i class="icon-comment">`` element in the button, using the jQuery ``.closest(...)`` function.

Previously, the clicked element was assumed to be the button itself, which caused the comment form to spawn within the button when it was clicked (see the issue for screenshots & other details).

This is to fix the issue where the icon-comment icon is clicked in the
Reply button of a note; the icon is used as the target and incorrectly
assumed to be the button itself, which causes the reply form to spawn
inside the button.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

LDAP key logging

See merge request !125

Browse file

Fixes #1335

See merge request !951

Active highlight

This will highlight active page regardless of the action we use.

See merge request !957

For some reason I needed to add a reload statement in the specs.

This allows us to keep Person#entry private, and it makes
Access#update_ssh_keys a little shorter.

Synchronise SSH keys with LDAP + specs

Please see MR !7 for reference.

Please see http://feedback.gitlab.com/forums/176466-general/suggestions/5704654-synchronise-ssh-keys-with-ldap for reference.

I added specs as well as fixed some bugs.

This MR is made of two (squashed) commits on purpose, as it is the only fair way to give @jolla credit for his work too.

Update highlight.js to 8.1

Pack version including all supported languages. Yay for Haml, Clojure, Go and Erlang support!

Fixes #1411.

See merge request !956