Merge branch 'active_highlight' into 'master'

Active highlight

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

See merge request !957
Merge branch 'browse_file' into 'master'

Browse file

Fixes #1335

See merge request !951
More entries to CHANGELOG

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
A Developer cannot manage milestones

Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
Added .closest() to find Reply button on click; fixes #401

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.
Add milestone descriptions on the group show page.
Use heading instead of strong and line breaks in description.
Update the tests with milestones descriptions.
Merge branch 'fix/notes_reply_click_issue401' into 'master'

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).
Merge branch 'group_milestones_description' into 'master'

Group milestones description

Fixes #1403

See merge request !958
Prevent html injection on commits page by commit message

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Merge branch 'prevent-html-injection' into 'master'

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
Check for the correct param for token.
Update to accomodate devise deprecations and backward incompatible changes.
Fix gitlab_markdown_helper method header typo. rquest => request.
Merge pull request #7291 from tbpgr/fix_gitlab_markdown_helper_typo

Fix gitlab_markdown_helper method header typo. rquest => request.
Show counters in sidebar filter in same way like we did for projects page

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Merge branch 'rework-counters' into 'master'

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
Merge branch 'master' of github.com:gitlabhq/gitlabhq
Update the diagram and make clear that rails accesses the repo's via shell.