delta/gitlab/gitlab-ce.git/app/assets/javascripts, branch api-internal-errors

Merge branch 'userpage-activity-scroll'

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

Conflicts:
	app/controllers/users_controller.rb

Add inifinite scroll to user activity on user page

2015-03-22T22:40:26+00:00

Improve contribution calendar per day info

2015-03-22T21:52:44+00:00

Replace commits calendar with contributions calendar

2015-03-22T06:48:08+00:00

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

Improve issue sidebar position

2015-03-20T22:33:13+00:00

Remove upvotes js logic since it does not work as expected anyway

2015-03-20T19:34:21+00:00

add canceled CI status

2015-03-19T16:27:24+00:00

Improve comment toggle button in diff

2015-03-19T00:53:43+00:00

Merge branch 'commit_calendar_activity' into 'master'

2015-03-18T13:05:07+00:00

Extend commit calendar to actually show what commits were made on a date

## What does this MR do?
This MR extends the commit calendar so it acutally shows what commits were made on a date and in which project.
It is based on the optimizations @dzaporozhets made for the calendar.

## Are there points in the code the reviewer needs to double check?
The UI and how the links are generated i guess. That feels hacky at the moment :/

## Screenshot:
![commit_calendar_extend_display](https://gitlab.com/uploads/gitlab-org/gitlab-ce/5bf1631660/commit_calendar_extend_display.png)

I assume that i have to refactor this a bit more to make it a cleaner implementation, so please give me feedback on what needs to be changed :)

See merge request !326

enable line wrapping by default and remove the checkbox to change it

2015-03-18T07:46:53+00:00