Dmitriy Zaporozhets dc78ee4e8b Merge branch 'ignore-binary-files-in-git-grep' into 'master' ...

Ignore binary files in code search to prevent Error 500

Leaving out the -I option in "git grep" would cause an Error 500 because the
resulting line would include "Binary file X matches", which would cause the project search results to crash with the following error:

```
ActionView::Template::Error (wrong argument type nil (expected Regexp)):
    1: - blob = @project.repository.parse_search_result(blob)
    2: .blob-result
    3:   .file-holder
    4:     .file-title
  app/models/repository.rb:742:in `sub'
  app/models/repository.rb:742:in `block in parse_search_result_from_grep'
  app/models/repository.rb:741:in `each_line'
  app/models/repository.rb:741:in `parse_search_result_from_grep'
  app/models/repository.rb:682:in `parse_search_result'
  app/views/search/results/_blob.html.haml:1:in `_app_views_search_results__blob_html_haml__1959871337755590783_162450160'
  app/views/search/_results.html.haml:20:in `_app_views_search__results_html_haml__2198486911700532411_58329920'
  app/views/search/show.html.haml:7:in `_app_views_search_show_html_haml___1698304427272645201_62235300'
```

See merge request !2565

2016-01-23 18:11:08 +00:00

..

ci

Add method that calculates total size for artifacts subfolder

2016-01-20 21:55:13 +01:00

concerns

Merge branch 'unsubscribe-from-thread-from-email-footer' into 'master'

2016-01-14 14:38:55 +00:00

hooks

Raise hook url limit

2016-01-15 00:35:12 +03:00

members

Use consistent markup and styling for highlighting across blobs, diffs, blame and snippets

2016-01-21 14:23:53 +01:00

network

Merge pull request #7999 from cirosantilli/append-inplace

2015-01-21 23:07:15 -08:00

project_services

Greatly improve external_issue_tracker performance

2016-01-19 14:03:20 +01:00

.gitkeep

init commit

2011-10-09 00:36:38 +03:00

ability.rb

Give reporters the ability to download artifacts.

2016-01-15 12:01:19 +01:00

abuse_report.rb

Use a more sensible message for the AbuseReport uniqueness validation

2016-01-16 16:50:43 -05:00

application_setting.rb

Merge branch 'feature/check-against-rbl-only' into 'master'

2016-01-20 14:24:20 -05:00

audit_event.rb

Re-annotate models

2015-08-03 01:52:54 +09:00

broadcast_message.rb

Move BroadcastMessage#status to a helper since it's presentational

2016-01-13 11:49:59 -05:00

commit_range.rb

Satisfy Rubocop

2015-12-02 10:54:24 +01:00

commit_status.rb

Merge branch 'ci/api-builds' into 'master'

2016-01-14 16:29:15 +00:00

commit.rb

Merge branch 'master' into tmp-reference-pipeline-and-caching

2015-12-10 14:04:34 +01:00

deploy_key.rb

Re-annotate models

2015-05-03 13:38:27 -07:00

deploy_keys_project.rb

Clean up code.

2015-04-03 12:28:47 +02:00

diff_line.rb

Refactor Parallel Diff feature and add scrollbars

2014-03-27 09:15:25 +13:00

email.rb

Allow primary email to be set to an email that you've already added.

2015-04-30 16:17:03 +02:00

event.rb

Don't show project fork event as imported

2015-12-02 10:56:05 +01:00

external_issue.rb

Add reference_pattern to Referable models

2015-05-26 15:48:32 -04:00

forked_project_link.rb

Use strong params for 5 more models

2014-06-26 15:00:09 +03:00

generic_commit_status.rb

Annotate models

2016-01-06 13:09:55 +00:00

global_label.rb

Refactor global and group milestones logic

2015-11-16 14:07:38 +01:00

global_milestone.rb

Add two custom Date/Time conversion formats

2016-01-07 20:01:08 -05:00

group.rb

Annotate models

2016-01-06 13:09:55 +00:00

identity.rb

Codestyle changes

2016-01-12 12:29:10 -02:00

issue.rb

Backport some changes from EE

2016-01-22 11:24:44 +02:00

jira_issue.rb

Backport JIRA service

2015-12-18 14:19:48 -06:00

key.rb

Only publish ssh key-type and key

2015-08-04 14:33:18 +02:00

label_link.rb

Annotate models

2014-08-25 12:25:02 +03:00

label.rb

Add custom ColorValidator

2015-12-07 16:57:26 -05:00

lfs_object.rb

Update annotations

2015-12-08 21:00:01 -08:00

lfs_objects_project.rb

Update annotations

2015-12-08 21:00:01 -08:00

member.rb

Creator should be added as a master of the project on creation

2016-01-20 20:06:28 -02:00

merge_request_diff.rb

Save and use actual diff base commit for MR diff highlighting

2016-01-20 18:44:27 +01:00

merge_request.rb

Save and use actual diff base commit for MR diff highlighting

2016-01-20 18:44:27 +01:00

milestone.rb

Add two custom Date/Time conversion formats

2016-01-07 20:01:08 -05:00

namespace.rb

Annotate models

2016-01-06 13:09:55 +00:00

note.rb

Make sure non-highlighted diffs are still escaped

2016-01-22 01:47:17 +01:00

notification.rb

Added Global to the drop downs and updated the label of the button to show the current level instead of Notifications

2015-09-16 19:46:24 -05:00

personal_snippet.rb

annotate

2014-10-09 18:22:20 +03:00

project_import_data.rb

Re-annotate models

2015-05-03 13:38:27 -07:00

project_snippet.rb

annotate

2014-10-09 18:22:20 +03:00

project_team.rb

Improve ProjectTeam#max_member_access performance

2015-10-15 12:05:01 +02:00

project_wiki.rb

Backport some changes from EE

2016-01-22 11:24:44 +02:00

project.rb

Backport some changes from EE

2016-01-22 11:24:44 +02:00

protected_branch.rb

Use project.commit convenience method.

2015-04-24 12:29:36 +02:00

release.rb

Annotate models

2015-11-13 19:22:46 +01:00

repository.rb

Ignore binary files in code search to prevent Error 500

2016-01-22 08:17:54 -08:00

security_event.rb

Re-annotate models

2015-08-03 01:52:54 +09:00

sent_notification.rb

#can_unsubscribe? -> #?unsubscribable?

2016-01-11 14:23:45 +01:00

service.rb

Greatly improve external_issue_tracker performance

2016-01-19 14:03:20 +01:00

snippet.rb

Autolink first so we don't pick up numeric anchors as issue references.

2015-12-01 15:53:32 +01:00

subscription.rb

tests

2015-03-16 21:38:41 +02:00

tree.rb

Validate README format before displaying

2016-01-05 11:06:18 -02:00

user.rb

Allow LDAP users to change their email if it was not set by the LDAP server

2016-01-19 16:25:38 +01:00

users_star_project.rb

Touch project when toggling stars to update cache

2015-12-03 16:08:08 -02:00

wiki_page.rb

Relax constraints for wiki slug

2016-01-14 12:09:31 -02:00