Commit Graph
17 Commits
Author SHA1 Message Date
Douwe Maan 9bd074d4cf Use display: inline where appropriate 2015-08-06 14:55:03 +02:00
Douwe Maan c015f96ba4 Cache all events 2015-08-06 13:15:33 +02:00
Robert Speicher e860dedd1c Push event: Nest link in strong tag, not vice-versa
Closes #1022
2015-06-02 15:05:44 -04:00
Douwe Maan 722e393589 Add Create Merge Request buttons to commits page and push event. 2015-05-09 22:26:52 +02:00
Douwe Maan 9d938fd77d List new commits for newly pushed branch in activity view. 2015-03-18 14:28:50 +01:00
Vinnie Okada 9e9ce95d62 Merge branch 'master' into rails-4.1.9
Conflicts:
	app/views/dashboard/_project.html.haml
	app/views/events/event/_common.html.haml
	app/views/explore/projects/_project.html.haml
	app/views/groups/_projects.html.haml
	app/views/projects/_home_panel.html.haml
	app/views/projects/_issues_nav.html.haml
	app/views/projects/issues/_discussion.html.haml
	app/views/projects/issues/_issues.html.haml
	app/views/projects/issues/show.html.haml
	app/views/projects/merge_requests/_discussion.html.haml
	app/views/projects/merge_requests/_show.html.haml
	app/views/projects/milestones/index.html.haml
	app/views/projects/notes/_edit_form.html.haml
	app/views/shared/_issuable_filter.html.haml
2015-02-19 20:53:05 -07:00
Vinnie Okada 76aad9b76e Upgrade to Rails 4.1.9
Make the following changes to deal with new behavior in Rails 4.1.2:

* Use nested resources to avoid slashes in arguments to path helpers.
2015-02-14 11:09:23 -07:00
Douwe Maan 522efa43fe Refactor event title generation for more consistent messages.
Example: "User joined project Namespace / Project" rather than "User joined project at Namespace / Project"
2015-02-13 12:02:58 +01:00
Dmitriy Zaporozhets 0189be0831 Use short_id instead of [0..N] for short version of commit sha
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-10-10 15:39:48 +03:00
Dmitriy Zaporozhets c456231690 Use css truncation on dashboard 2014-05-26 23:26:41 +03:00
Dmitriy Zaporozhets e8d1e827d8 Remove unnecessary tag 2013-10-10 12:14:21 +03:00
Dmitriy Zaporozhets 13fec18ac9 Truncate some text from dashboard events 2013-09-11 22:46:37 +03:00
Dmitriy Zaporozhets ff4471a3cd Get rid of event decorator. Use event data hash instead commit objects to increase perfomance 2013-04-05 19:47:12 +03:00
Dmitriy Zaporozhets 8826077471 Refactor css lists. Use well-list class 2012-12-18 06:14:05 +03:00
Dmitriy Zaporozhets f1dfc27c5d Replace project with namespace for events 2012-12-09 16:03:24 +02:00
Riyad Preukschas 93bc1ff108 Merge branch 'master' into fix-messages-for-deleted-things 2012-10-02 14:04:34 +02:00
Dmitriy Zaporozhets 69751aac32 Refactoring event views 2012-10-01 16:58:13 +03:00