delta/gitlab/gitlab-ce.git/features, branch api-internal-errors

Merge branch 'improve-contributions-calendar' into 'master'

2015-03-23T16:40:55+00:00

Replace commits calendar with contributions calendar

* count opening of issues and merge requests
* dont trigger git repository - use events from database
* count pushes instead of commits for faster and easier counting
* much-much faster since does not affected by repository size

See merge request !420

Include missing events and fix save functionality in admin service template settings form

2015-03-23T12:51:38+00:00

Closes #1275

Improve user calendar test

2015-03-23T02:47:23+00:00

Contribution calendar will use events instead of commits to count contributions

2015-03-22T21:35:27+00:00

Refactor contributions events and write tests for calendar

2015-03-22T20:55:00+00:00

Fix "Import projects from" button to show the correct instructions

2015-03-22T15:47:22+00:00

Closes #1267

Add location to user profile

2015-03-20T23:52:23+00:00

Add tooltip for comment toggle in diff. Add changelog item and fix tests

2015-03-19T03:12:19+00:00

Merge branch 'issue_subscription' into 'master'

2015-03-17T16:45:04+00:00

Subscription to issue/mr

Fixes #1911 and #1909

![joxi_screenshot_1426601822159](https://dev.gitlab.org/gitlab/gitlabhq/uploads/53021bc5783271322ab2dfba7598eaa3/joxi_screenshot_1426601822159.png)

![joxi_screenshot_1426601836423](https://dev.gitlab.org/gitlab/gitlabhq/uploads/244ff360fbd6f30980f8dad699400814/joxi_screenshot_1426601836423.png)

See merge request !1702

improve UI

2015-03-17T15:11:57+00:00