Tomasz Maczukin 768721dc58 Merge branch 'master' into ci/api-triggers ...

* master: (150 commits)
  fixes margin and padding
  Update mailroom/postfix documentation [ci skip]
  Fix css mess around git clone panel. Align it properly
  Fix missing padding for user/group pages
  Fix parse_gollum_tags matcher
  Update documentation on Banzai::Filter::GollumTagsFilter
  Add tests for the wiki pipeline
  Refactoring Banzai::Filter::GollumTagsFilter
  Make sure the .git is at the end on Gitlab::GithubImport::WikiFormatter
  Remove GollumTagsPipeline
  Refactoring Gitlab::GithubImport::Importer
  Remove unnecessary brackets on WIKI_SLUG_ID route constraints
  Move js function to removing accents to vendor/assets/javascripts
  Update CHANGELOG
  Use the WikiPipeline when rendering the wiki markdown content
  Add Banzai::Filter::GollumTagsFilter for parsing Gollum's tags in HTML
  Relax constraints for wiki slug
  Import GitHub wiki into GitLab
  Move Ci::Build#available_statuses to AVAILABLE_STATUSES constant in CommitStatus
  Revert changes to how the notes are paginated in the API
  ...

Conflicts:
	doc/api/README.md
	lib/api/entities.rb

2016-01-14 21:58:17 +01:00

..

ci

Merge branch 'master' into ci/api-triggers

2016-01-14 21:58:17 +01:00

concerns

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

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

hooks

Use CGI.escape instead of URI.escape, because URI is obsoleted.

2016-01-12 18:20:03 +08: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

Merge branch 'fix/reference_filter_uri_decode_error_for_master' into 'master'

2016-01-13 14:21:32 +00:00

.gitkeep

init commit

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

ability.rb

Improvements, readability for artifacts browser

2016-01-14 12:48:16 +01:00

abuse_report.rb

Block the reported user before destroying the record

2016-01-12 20:59:55 -05:00

application_setting.rb

Annotate models

2016-01-06 13:09:55 +00: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

Show referenced MRs & Issues only when the current viewer can access them

2016-01-13 11:59:10 +01: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

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 branch 'group-issues-sorting' into 'master'

2016-01-11 15:28:41 +00: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

Move complex view condition to a model method

2016-01-13 16:37: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

Add Banzai::Filter::GollumTagsFilter for parsing Gollum's tags in HTML

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

project.rb

Fix the undefinded variable error in Project's safe_import_url method

2016-01-13 17:01:05 -08: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

Add support for ref and path to commits filtering

2016-01-07 15:16:11 +01: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

Annotate models

2016-01-06 13:09:55 +00: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

fixed LDAP activation on login to use new ldap_blocked state

2016-01-14 03:31:27 -02: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