Douwe Maan 10387f6b8a Merge branch 'master' into tmp-reference-pipeline-and-caching ...

# Conflicts:
#	spec/lib/gitlab/markdown/autolink_filter_spec.rb
#	spec/lib/gitlab/markdown/commit_range_reference_filter_spec.rb
#	spec/lib/gitlab/markdown/commit_reference_filter_spec.rb
#	spec/lib/gitlab/markdown/cross_project_reference_spec.rb
#	spec/lib/gitlab/markdown/emoji_filter_spec.rb
#	spec/lib/gitlab/markdown/external_issue_reference_filter_spec.rb
#	spec/lib/gitlab/markdown/external_link_filter_spec.rb
#	spec/lib/gitlab/markdown/issue_reference_filter_spec.rb
#	spec/lib/gitlab/markdown/label_reference_filter_spec.rb
#	spec/lib/gitlab/markdown/merge_request_reference_filter_spec.rb
#	spec/lib/gitlab/markdown/redactor_filter_spec.rb
#	spec/lib/gitlab/markdown/reference_gatherer_filter_spec.rb
#	spec/lib/gitlab/markdown/relative_link_filter_spec.rb
#	spec/lib/gitlab/markdown/sanitization_filter_spec.rb
#	spec/lib/gitlab/markdown/snippet_reference_filter_spec.rb
#	spec/lib/gitlab/markdown/syntax_highlight_filter_spec.rb
#	spec/lib/gitlab/markdown/table_of_contents_filter_spec.rb
#	spec/lib/gitlab/markdown/task_list_filter_spec.rb
#	spec/lib/gitlab/markdown/upload_link_filter_spec.rb
#	spec/lib/gitlab/markdown/user_reference_filter_spec.rb

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

..

ci

Merge branch 'master' into merge-if-green

2015-12-08 22:34:03 +01:00

concerns

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

2015-12-07 14:48:53 +01:00

hooks

Add custom UrlValidator

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

members

Re-annotate models

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

network

Merge pull request #7999 from cirosantilli/append-inplace

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

project_services

Add custom UrlValidator

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

.gitkeep

init commit

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

ability.rb

Signed in admin should be able to add/remove himself to a project

2015-12-01 20:53:43 -02:00

abuse_report.rb

Streamline the "Report button"

2015-09-29 21:47:01 +02:00

application_setting.rb

Add custom UrlValidator

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

audit_event.rb

Re-annotate models

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

broadcast_message.rb

Add custom ColorValidator

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

commit_range.rb

Satisfy Rubocop

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

commit_status.rb

Merge branch 'master' into merge-if-green

2015-11-18 11:58:01 +01: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

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

global_label.rb

Refactor global and group milestones logic

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

global_milestone.rb

Merge branch 'gsmethells/gitlab-ce-sort-by-due-date'

2015-12-07 13:45:16 +01:00

group.rb

Group methods for filtering public/visible groups

2015-11-18 13:05:45 +01:00

identity.rb

Validate presence of provider field in Identity

2015-06-23 11:21:23 +02:00

issue.rb

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

2015-12-01 15:53:32 +01: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

Refactor ability changes

2015-11-17 15:49:37 +01:00

merge_request_diff.rb

Add ignore white space option in merge request diff

2015-11-13 16:53:53 +09:00

merge_request.rb

Merge remote-tracking branch 'origin/mr-broken'

2015-12-09 21:06:04 +01:00

milestone.rb

Use "Any Label" and "Any Milestone" in selects rather than the ambiguous "Any" option

2015-12-02 14:10:43 +01:00

namespace.rb

Add custom NamespaceNameValidator

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

note.rb

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

2015-12-10 14:04:34 +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

Make ProjectWiki touch Project#last_activity_at after wiki actions

2015-11-16 13:08:25 -05:00

project.rb

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

2015-12-10 14:04:34 +01: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

Default target branch to patch-n when editing file in protected branch

2015-12-08 16:42:10 +01:00

security_event.rb

Re-annotate models

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

sent_notification.rb

Add custom LineCodeValidator

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

service.rb

Improve invalidation of stored service password if the endpoint URL is changed

2015-10-15 12:07:59 +02: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

Rename MarkdownHelper to MarkupHelper

2015-05-18 22:51:56 +02:00

user.rb

Update annotations

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

users_star_project.rb

Touch project when toggling stars to update cache

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

wiki_page.rb

Fix dots in Wiki slug causing errors

2015-03-21 18:33:51 -07:00