Robert Speicher
|
5c7b91e29b
|
Single quotes/icon helper in views
|
2015-05-06 13:00:11 -04:00 |
|
Robert Speicher
|
922497560e
|
Update task list behavior for Notes
|
2015-05-06 12:58:27 -04:00 |
|
Stan Hu
|
b8c9257fb1
|
Fix bug where editing a comment with "+1" or "-1" would cause a server error
Closes #1151
|
2015-03-02 15:26:00 -08:00 |
|
Douwe Maan
|
0283fff591
|
Merge branch 'master' into extend_markdown_upload
# Conflicts:
# app/views/projects/issues/_form.html.haml
# app/views/projects/merge_requests/_form.html.haml
# app/views/projects/merge_requests/_new_submit.html.haml
# app/views/projects/milestones/_form.html.haml
# app/views/projects/notes/_form.html.haml
# app/views/projects/wikis/_form.html.haml
# config/routes.rb
# spec/controllers/projects_controller_spec.rb
|
2015-02-24 14:54:39 +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 |
|
Douwe Maan
|
ab401a6132
|
Remove note attachment file selector.
|
2015-02-17 22:23:31 +01:00 |
|
Hannes Rosenögger
|
9bf8480b4a
|
Generalize the image upload in markdown
This commit generalizes the image upload via drag and drop so it supports all files.
It also adds access control for these files.
|
2015-02-17 22:20:44 +01:00 |
|
Douwe Maan
|
080449f8af
|
Make sure Markdown previews always use the same styling as the eventual destination.
|
2015-02-17 17:58:08 +01: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 |
|
Dmitriy Zaporozhets
|
cad685e70b
|
Refactor zen mode. Make it works in diffs
|
2015-01-15 00:15:12 -08:00 |
|
Dmitriy Zaporozhets
|
4babc50eb7
|
Huge set of fixes for comments logic
|
2015-01-14 22:42:58 -08:00 |