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
|
20397091f1
|
Show iid in event feed and uatocomplete as default id for issues, mr
|
2013-08-19 22:12:59 +03:00 |
|
Dmitriy Zaporozhets
|
ffa234bc80
|
Dont render event body if empty
|
2013-08-16 15:40:55 +03:00 |
|
Dmitriy Zaporozhets
|
f4ae433d90
|
Increase event title font size on dashboard activity feed
|
2013-04-06 15:53:35 +03:00 |
|
Riyad Preukschas
|
640d51f4b6
|
Fix GFM in events
Fixes #2563
|
2013-01-16 18:09:49 +01:00 |
|
Riyad Preukschas
|
19560a4b5f
|
Fix displaying events for deleted things
|
2012-10-12 13:37:44 +02:00 |
|
Dmitriy Zaporozhets
|
69751aac32
|
Refactoring event views
|
2012-10-01 16:58:13 +03:00 |
|