Merge branch 'master' into social-master

Signed-off-by: Roland Haeder <roland@mxchange.org>
Conflicts:
actions/replies.php
classes/Notice.php
lib/noticeform.php
plugins/WebFinger/WebFingerPlugin.php

Merge branch 'master' of git.gnu.io:Quix0r/gnu-social

Signed-off-by: Roland Haeder <roland@mxchange.org>
Conflicts:
actions/apifriendshipsdestroy.php
actions/apifriendshipsexists.php
actions/apifriendshipsshow.php
actions/replies.php
actions/showstream.php
classes/Notice.php
lib/docfile.php
lib/noticeform.php
plugins/APC/APCPlugin.php
plugins/Adsense/AdsensePlugin.php
plugins/Aim/AimPlugin.php
plugins/Aim/lib/aimmanager.php
plugins/Blog/BlogPlugin.php
plugins/Directory/actions/groupdirectory.php
plugins/Directory/actions/userdirectory.php
plugins/Irc/IrcPlugin.php
plugins/Irc/extlib/phergie/Tests/Phergie/Plugin/HandlerTest.php
plugins/Irc/lib/ircmanager.php
plugins/OStatus/classes/Ostatus_profile.php
plugins/Share/actions/apitimelineretweetedtome.php
plugins/Spotify/SpotifyPlugin.php
plugins/TinyMCE/TinyMCEPlugin.php
plugins/VideoThumbnails/VideoThumbnailsPlugin.php
plugins/WebFinger/WebFingerPlugin.php
plugins/XCache/XCachePlugin.php
plugins/YammerImport/actions/yammeradminpanel.php
plugins/YammerImport/actions/yammerauth.php
plugins/YammerImport/lib/yammerimporter.php

Correct content now ... :-(

Signed-off-by: Roland Haeder <roland@mxchange.org>

*** Privacy Leak fixed: ***
- isCurrentProfileInScope() is now more asked if the current profile is allowed
  to see the given notice. It was possible (with upstream master) to see private
  messages in RSS and (possible) JSON feeds

Signed-off-by: Roland Haeder <roland@mxchange.org>

Added missing isPrivateScope().

Signed-off-by: Roland Haeder <roland@mxchange.org>

My fault ...

Signed-off-by: Roland Haeder <roland@mxchange.org>

Merge remote-tracking branch 'upstream/master' into social-master

Misses this file to merge. I like the comments.

Signed-off-by: Roland Haeder <roland@mxchange.org>

Translation contained bad HTML

latest php-gettext from https://code.launchpad.net/~danilo/php-gettext/

If /var/run was unwritable stopdaemons did not find pid file

Merge remote-tracking branch 'upstream/master' into social-master

Signed-off-by: Roland Haeder <roland@mxchange.org>
Conflicts:
actions/apifriendshipsdestroy.php
actions/apifriendshipsexists.php
actions/apifriendshipsshow.php
actions/replies.php
actions/showstream.php
classes/File.php
classes/Notice.php
lib/docfile.php
lib/framework.php
lib/noticeform.php
plugins/APC/APCPlugin.php
plugins/Adsense/AdsensePlugin.php
plugins/Aim/AimPlugin.php
plugins/Aim/lib/aimmanager.php
plugins/Blog/BlogPlugin.php
plugins/Blog/classes/Blog_entry.php
plugins/Directory/actions/groupdirectory.php
plugins/Directory/actions/userdirectory.php
plugins/Irc/IrcPlugin.php
plugins/Irc/extlib/phergie/Tests/Phergie/Plugin/HandlerTest.php
plugins/Irc/lib/ircmanager.php
plugins/OStatus/OStatusPlugin.php
plugins/OStatus/classes/Ostatus_profile.php
plugins/Share/actions/apitimelineretweetedtome.php
plugins/Spotify/SpotifyPlugin.php
plugins/TinyMCE/TinyMCEPlugin.php
plugins/VideoThumbnails/VideoThumbnailsPlugin.php
plugins/WebFinger/WebFingerPlugin.php
plugins/XCache/XCachePlugin.php
plugins/YammerImport/actions/yammeradminpanel.php
plugins/YammerImport/actions/yammerauth.php
plugins/YammerImport/lib/yammerimporter.php

filename is never used for indexing so let's make it text

varchar is pretty limited so let's avoid it if we can

We're logging this already elsewhere

ImPlugin classes generally require background daemons in CLI

If someone designs an ImPlugin which _doesn't_ require the queues to be
handled in background daemons then they can set the requires_cli property
to false in their class.

OpportunisticQM shouldn't try to handle what it can't find

Fix "unique notice form ID" code for reply forms

Don't use <object> for application/ogg

...this was actually because it would autoplay in Iceweasel/Firefox
despite all parameters for autoplay/autostart being set to false or 0.

enclosures in Atom were not included

Revert "Inverse logic error in OembedPlugin"

This reverts commit 9ab996d9e6bee90e2f96a2a17e453a6deebd4a96.

Merge branch 'nightly'

Conflicts:
INSTALL

File_thumbnail->getUrl now gives Attachment_thumbnail action URL

That in turn redirects to the statically stored file.

Allow oEmbed data from all sites by default

Inverse logic error in OembedPlugin

bad URL is a clientError

oEmbed Action logic simplified (early return)

oEmbed helper never finished because of "break 2;"

No more needed (for this fix) but maybe later. So I always only comment them out.

Signed-off-by: Roland Haeder <roland@mxchange.org>

typo fixed ...

Signed-off-by: Roland Haeder <roland@mxchange.org>

Opps, PEAR sucks. Need to call find() before fetch() ... :-(

Signed-off-by: Roland Haeder <roland@mxchange.org>

Merge branch 'fixes/private_scope_on_tags' into social-master

Needed to add notice_id to selected fields ... :-(

Signed-off-by: Roland Haeder <roland@mxchange.org>

Merge branch 'fixes/private_scope_on_tags' into social-master

fetch() must work to get this check passed.

Signed-off-by: Roland Haeder <roland@mxchange.org>

Merge branch 'fixes/private_scope_on_tags' into social-master

??? Not Notice_tag?

Signed-off-by: Roland Haeder <roland@mxchange.org>

Merge branch 'fixes/private_scope_on_tags' into social-master

??? Not callable?

Signed-off-by: Roland Haeder <roland@mxchange.org>

Merge branch 'fixes/private_scope_on_tags' into social-master

Introduced isCurrentProfileInScope() which shall check if current profile is
allowed (in scope of) to see the tag.

Signed-off-by: Roland Haeder <roland@mxchange.org>

Merge branch 'fixes/private_scope_on_tags' into social-master

Grrr, not fixed. So adding debug lines.

Signed-off-by: Roland Haeder <roland@mxchange.org>

Merge branch 'fixes/private_scope_on_tags' into social-master

Possible hack for tags from private dents in public profile or wrong scope (both privacy leak).

Signed-off-by: Roland Haeder <roland@mxchange.org>

Profile::current() suits better here.

Signed-off-by: Roland Haeder <roland@mxchange.org>

Save some memory + added type-hint.

Signed-off-by: Roland Haeder <roland@mxchange.org>

Added debug lines, the first attempt didn't work and I have *no* development system now. :-(

Signed-off-by: Roland Haeder <roland@mxchange.org>

Check scope, else a privacy leaks happens this way:

1) Bob and Alice follow each other and write private notices
   (this->scope=2) to each other.
2) Bob uses tags in his private notice to alice (which she can
   read from him).
3) Alice adds that notice (with tags) to her favorites
   ("faving") it.
4) The tags from Bob's private notice becomes visible in Alice's
   profile.

This has the simple background that the scope is not being
re-checked. This has to be done here at this point because given
above scenario is a privacy leak as the tags may be *really*
private (nobody else shall see them) such as initmate words or
very political words.

Signed-off-by: Roland Haeder <roland@mxchange.org>

Filter out img, video and audio tags in notice HTML

Because we don't want to auto-fetch items from a remote server. Such
items should be delivered as attachment metadata and portrayed in the
way the local instance chooses.

Choices for portrayal are either simply nullifying this and embedding
the data, linking the file remotely requiring a manual click or maybe
use remote oEmbed data etc. to download files locally so no remote
requests have to be made.

Marcus Moeller fixed some layout bugs I introduced

imitate ->boolean with $def=false

php5-intl is required

No need to do pkeyGet if not repeated (thanks hannes)

Kind of reverts commit d9ed2a0

repeated did not always find the Notice (deleted?)

Add repeated_id to SimpleStatusArray for Qvitter's benefit

Moving some more repeat stuff into the Share plugin

Notice properties set in bad order on activityobject saving

Share never actually set the repeat_of value

Event fixes for activityhandlerplugin

repeat actions to Share plugin

Merge branch 'nightly' into repeat_as_shareplugin

ImageFile->resize now totally replaced with resizeTo

Repeats shown in threaded noticelist now handled by plugin

Finalize move of 'repeat' Command

Why did I keep these functions from FavoritePlugin?

Receiving Share activity fixes

Forgot to translate 'self' to 'Ostatus_profile' etc.

Share plugin now handles showing form in NoticeOptionItems

Move share command interpretation to SharePlugin

Some fixes to the SharePlugin.php file came along

Remove unnecessary require lines and definitions

ProfileNoticeList and ProfileNoticeListItem are in their own files now too

Add ProfileNoticeList[Item] as separate lib class files

Moving Ostatus_profile processShare to SharePlugin

Merge branch 'nightly' into repeat_as_shareplugin

Repeat confirmation dialogbox fix

until we use jQuery UI dialog stuff

Initial work on making the Share verb handled in plugin

ImageFile $id argument is only for File objects

Remember to eliminate the Avatar/group logo call to ImageFile->resize!

Merge branch 'master' into social-master

Merge branch 'master' of gitorious.org:social/mainline

Signed-off-by: Roland Haeder <roland@mxchange.org>

Same as last commit, don't give ID if it's not for a File object

ImageFile should not have an $id set if not a File

javascript fixes for reply form fetching

It doesn't update the ID properly yet, which should be done to avoid
creating duplicate forms which are identical to HTML parsers...

FormAction wants getInstructions to be protected

only showInstructions is public

Merge branch 'master' into social-master

Signed-off-by: Roland Haeder <roland@mxchange.org>

Added checked type-hints

Signed-off-by: Roland Haeder <roland@mxchange.org>
Conflicts:
classes/Notice.php

Signed-off-by: Roland Haeder <roland@mxchange.org>

more descriptive setting name

SiteNoticeInSidebar widget did not define divId()

ActivityVerb is a core plugin

FavoritePlugin is now an "ActivityVerbHandlerPlugin"

Let the creator decide which HTML tag to use for NoticeListItem

Notice elements don't need to be floating...

Maybe it was originally meant to be without a comma between .notice and .profile?

Move AlreadyFulfilled check to Fave::addNew

Merge branch 'master' into social-master

The conflict was difference at default value (null versus better array() ).

Conflicts:
lib/docfile.php

Signed-off-by: Roland Haeder <roland@mxchange.org>

Added basic language support for sending out invitations:
- This allows for example sending German mails from an English instance
- Added some checked type-hints (all around language stuff)

Some code improvement:
- array $foo=null and then an is_null($foo) makes no sense,
  better use array $foo=array() directly.
- onTitle()'s parameter $paths now always must be an array

Signed-off-by: Roland Haeder <roland@mxchange.org>
This conflict was because 'master' has StatusNet as class, but 'nigtly' already
has GNUSocial as class name.

Conflicts:
lib/docfile.php

Signed-off-by: Roland Haeder <roland@mxchange.org>

favorite and like are synonyms of each other

First ActivityVerbPlugin sketch

Notice class got exception throwing getById

Less code, more happy.

Make 'activity' a blacklisted nickname

Will add a plugin called ActivityVerb which makes activity interaction
more standardized.

The argument formatting regexps are the third argument

Delete Faves onProfileDeleteRelated instead of User

Merge branch 'nightly', beginning of 1.2.x

Conflicts:
plugins/APC/locale/APC.pot
plugins/APC/locale/ast/LC_MESSAGES/APC.po
plugins/APC/locale/be-tarask/LC_MESSAGES/APC.po
plugins/APC/locale/br/LC_MESSAGES/APC.po
plugins/APC/locale/de/LC_MESSAGES/APC.po
plugins/APC/locale/es/LC_MESSAGES/APC.po
plugins/APC/locale/eu/LC_MESSAGES/APC.po
plugins/APC/locale/fr/LC_MESSAGES/APC.po
plugins/APC/locale/gl/LC_MESSAGES/APC.po
plugins/APC/locale/he/LC_MESSAGES/APC.po
plugins/APC/locale/ia/LC_MESSAGES/APC.po
plugins/APC/locale/id/LC_MESSAGES/APC.po
plugins/APC/locale/it/LC_MESSAGES/APC.po
plugins/APC/locale/mk/LC_MESSAGES/APC.po
plugins/APC/locale/ms/LC_MESSAGES/APC.po
plugins/APC/locale/nb/LC_MESSAGES/APC.po
plugins/APC/locale/nl/LC_MESSAGES/APC.po
plugins/APC/locale/pl/LC_MESSAGES/APC.po
plugins/APC/locale/pt/LC_MESSAGES/APC.po
plugins/APC/locale/pt_BR/LC_MESSAGES/APC.po
plugins/APC/locale/ru/LC_MESSAGES/APC.po
plugins/APC/locale/tl/LC_MESSAGES/APC.po
plugins/APC/locale/uk/LC_MESSAGES/APC.po
plugins/APC/locale/zh_CN/LC_MESSAGES/APC.po
plugins/Adsense/locale/Adsense.pot
plugins/Adsense/locale/be-tarask/LC_MESSAGES/Adsense.po
plugins/Adsense/locale/br/LC_MESSAGES/Adsense.po
plugins/Adsense/locale/ca/LC_MESSAGES/Adsense.po
plugins/Adsense/locale/de/LC_MESSAGES/Adsense.po
plugins/Adsense/locale/es/LC_MESSAGES/Adsense.po
plugins/Adsense/locale/eu/LC_MESSAGES/Adsense.po
plugins/Adsense/locale/fr/LC_MESSAGES/Adsense.po
plugins/Adsense/locale/gl/LC_MESSAGES/Adsense.po
plugins/Adsense/locale/he/LC_MESSAGES/Adsense.po
plugins/Adsense/locale/ia/LC_MESSAGES/Adsense.po
plugins/Adsense/locale/it/LC_MESSAGES/Adsense.po
plugins/Adsense/locale/ja/LC_MESSAGES/Adsense.po
plugins/Adsense/locale/ka/LC_MESSAGES/Adsense.po
plugins/Adsense/locale/lb/LC_MESSAGES/Adsense.po
plugins/Adsense/locale/lt/LC_MESSAGES/Adsense.po
plugins/Adsense/locale/mk/LC_MESSAGES/Adsense.po
plugins/Adsense/locale/ms/LC_MESSAGES/Adsense.po
plugins/Adsense/locale/nb/LC_MESSAGES/Adsense.po
plugins/Adsense/locale/nl/LC_MESSAGES/Adsense.po
plugins/Adsense/locale/pl/LC_MESSAGES/Adsense.po
plugins/Adsense/locale/pt/LC_MESSAGES/Adsense.po
plugins/Adsense/locale/pt_BR/LC_MESSAGES/Adsense.po
plugins/Adsense/locale/ru/LC_MESSAGES/Adsense.po
plugins/Adsense/locale/sv/LC_MESSAGES/Adsense.po
plugins/Adsense/locale/tl/LC_MESSAGES/Adsense.po
plugins/Adsense/locale/tr/LC_MESSAGES/Adsense.po
plugins/Adsense/locale/uk/LC_MESSAGES/Adsense.po
plugins/Adsense/locale/zh_CN/LC_MESSAGES/Adsense.po
plugins/Aim/locale/Aim.pot
plugins/Aim/locale/af/LC_MESSAGES/Aim.po
plugins/Aim/locale/ca/LC_MESSAGES/Aim.po
plugins/Aim/locale/de/LC_MESSAGES/Aim.po
plugins/Aim/locale/es/LC_MESSAGES/Aim.po
plugins/Aim/locale/eu/LC_MESSAGES/Aim.po
plugins/Aim/locale/fi/LC_MESSAGES/Aim.po
plugins/Aim/locale/fr/LC_MESSAGES/Aim.po
plugins/Aim/locale/gl/LC_MESSAGES/Aim.po
plugins/Aim/locale/ia/LC_MESSAGES/Aim.po
plugins/Aim/locale/it/LC_MESSAGES/Aim.po
plugins/Aim/locale/mk/LC_MESSAGES/Aim.po
plugins/Aim/locale/ms/LC_MESSAGES/Aim.po
plugins/Aim/locale/nl/LC_MESSAGES/Aim.po
plugins/Aim/locale/pl/LC_MESSAGES/Aim.po
plugins/Aim/locale/pt/LC_MESSAGES/Aim.po
plugins/Aim/locale/sv/LC_MESSAGES/Aim.po
plugins/Aim/locale/tl/LC_MESSAGES/Aim.po
plugins/Aim/locale/uk/LC_MESSAGES/Aim.po
plugins/Blog/locale/Blog.pot
plugins/Blog/locale/ar/LC_MESSAGES/Blog.po
plugins/Blog/locale/br/LC_MESSAGES/Blog.po
plugins/Blog/locale/ca/LC_MESSAGES/Blog.po
plugins/Blog/locale/de/LC_MESSAGES/Blog.po
plugins/Blog/locale/es/LC_MESSAGES/Blog.po
plugins/Blog/locale/eu/LC_MESSAGES/Blog.po
plugins/Blog/locale/fr/LC_MESSAGES/Blog.po
plugins/Blog/locale/gl/LC_MESSAGES/Blog.po
plugins/Blog/locale/ia/LC_MESSAGES/Blog.po
plugins/Blog/locale/it/LC_MESSAGES/Blog.po
plugins/Blog/locale/lt/LC_MESSAGES/Blog.po
plugins/Blog/locale/mk/LC_MESSAGES/Blog.po
plugins/Blog/locale/nl/LC_MESSAGES/Blog.po
plugins/Blog/locale/tl/LC_MESSAGES/Blog.po
plugins/Blog/locale/tr/LC_MESSAGES/Blog.po
plugins/Irc/locale/Irc.pot
plugins/Irc/locale/ca/LC_MESSAGES/Irc.po
plugins/Irc/locale/de/LC_MESSAGES/Irc.po
plugins/Irc/locale/es/LC_MESSAGES/Irc.po
plugins/Irc/locale/eu/LC_MESSAGES/Irc.po
plugins/Irc/locale/fi/LC_MESSAGES/Irc.po
plugins/Irc/locale/fr/LC_MESSAGES/Irc.po
plugins/Irc/locale/gl/LC_MESSAGES/Irc.po
plugins/Irc/locale/ia/LC_MESSAGES/Irc.po
plugins/Irc/locale/it/LC_MESSAGES/Irc.po
plugins/Irc/locale/ja/LC_MESSAGES/Irc.po
plugins/Irc/locale/mk/LC_MESSAGES/Irc.po
plugins/Irc/locale/nl/LC_MESSAGES/Irc.po
plugins/Irc/locale/sv/LC_MESSAGES/Irc.po
plugins/Irc/locale/tl/LC_MESSAGES/Irc.po
plugins/Irc/locale/tr/LC_MESSAGES/Irc.po
plugins/Irc/locale/uk/LC_MESSAGES/Irc.po
plugins/Spotify/locale/Spotify.pot
plugins/Spotify/locale/de/LC_MESSAGES/Spotify.po
plugins/Spotify/locale/es/LC_MESSAGES/Spotify.po
plugins/Spotify/locale/fr/LC_MESSAGES/Spotify.po
plugins/Spotify/locale/gl/LC_MESSAGES/Spotify.po
plugins/Spotify/locale/he/LC_MESSAGES/Spotify.po
plugins/Spotify/locale/ia/LC_MESSAGES/Spotify.po
plugins/Spotify/locale/mk/LC_MESSAGES/Spotify.po
plugins/Spotify/locale/nl/LC_MESSAGES/Spotify.po
plugins/Spotify/locale/sv/LC_MESSAGES/Spotify.po
plugins/Spotify/locale/tl/LC_MESSAGES/Spotify.po
plugins/TinyMCE/locale/TinyMCE.pot
plugins/TinyMCE/locale/ca/LC_MESSAGES/TinyMCE.po
plugins/TinyMCE/locale/de/LC_MESSAGES/TinyMCE.po
plugins/TinyMCE/locale/eo/LC_MESSAGES/TinyMCE.po
plugins/TinyMCE/locale/es/LC_MESSAGES/TinyMCE.po
plugins/TinyMCE/locale/fr/LC_MESSAGES/TinyMCE.po
plugins/TinyMCE/locale/gl/LC_MESSAGES/TinyMCE.po
plugins/TinyMCE/locale/he/LC_MESSAGES/TinyMCE.po
plugins/TinyMCE/locale/ia/LC_MESSAGES/TinyMCE.po
plugins/TinyMCE/locale/id/LC_MESSAGES/TinyMCE.po
plugins/TinyMCE/locale/ja/LC_MESSAGES/TinyMCE.po
plugins/TinyMCE/locale/mk/LC_MESSAGES/TinyMCE.po
plugins/TinyMCE/locale/ms/LC_MESSAGES/TinyMCE.po
plugins/TinyMCE/locale/nb/LC_MESSAGES/TinyMCE.po
plugins/TinyMCE/locale/nl/LC_MESSAGES/TinyMCE.po
plugins/TinyMCE/locale/pt/LC_MESSAGES/TinyMCE.po
plugins/TinyMCE/locale/pt_BR/LC_MESSAGES/TinyMCE.po
plugins/TinyMCE/locale/ru/LC_MESSAGES/TinyMCE.po
plugins/TinyMCE/locale/tl/LC_MESSAGES/TinyMCE.po
plugins/TinyMCE/locale/uk/LC_MESSAGES/TinyMCE.po
plugins/XCache/locale/XCache.pot
plugins/XCache/locale/ast/LC_MESSAGES/XCache.po
plugins/XCache/locale/br/LC_MESSAGES/XCache.po
plugins/XCache/locale/de/LC_MESSAGES/XCache.po
plugins/XCache/locale/es/LC_MESSAGES/XCache.po
plugins/XCache/locale/eu/LC_MESSAGES/XCache.po
plugins/XCache/locale/fi/LC_MESSAGES/XCache.po
plugins/XCache/locale/fr/LC_MESSAGES/XCache.po
plugins/XCache/locale/gl/LC_MESSAGES/XCache.po
plugins/XCache/locale/he/LC_MESSAGES/XCache.po
plugins/XCache/locale/ia/LC_MESSAGES/XCache.po
plugins/XCache/locale/id/LC_MESSAGES/XCache.po
plugins/XCache/locale/mk/LC_MESSAGES/XCache.po
plugins/XCache/locale/ms/LC_MESSAGES/XCache.po
plugins/XCache/locale/nb/LC_MESSAGES/XCache.po
plugins/XCache/locale/nl/LC_MESSAGES/XCache.po
plugins/XCache/locale/pl/LC_MESSAGES/XCache.po
plugins/XCache/locale/pt/LC_MESSAGES/XCache.po
plugins/XCache/locale/pt_BR/LC_MESSAGES/XCache.po
plugins/XCache/locale/ru/LC_MESSAGES/XCache.po
plugins/XCache/locale/tl/LC_MESSAGES/XCache.po
plugins/XCache/locale/tr/LC_MESSAGES/XCache.po
plugins/XCache/locale/uk/LC_MESSAGES/XCache.po
plugins/YammerImport/locale/YammerImport.pot
plugins/YammerImport/locale/br/LC_MESSAGES/YammerImport.po
plugins/YammerImport/locale/de/LC_MESSAGES/YammerImport.po
plugins/YammerImport/locale/es/LC_MESSAGES/YammerImport.po
plugins/YammerImport/locale/eu/LC_MESSAGES/YammerImport.po
plugins/YammerImport/locale/fr/LC_MESSAGES/YammerImport.po
plugins/YammerImport/locale/gl/LC_MESSAGES/YammerImport.po
plugins/YammerImport/locale/ia/LC_MESSAGES/YammerImport.po
plugins/YammerImport/locale/mk/LC_MESSAGES/YammerImport.po
plugins/YammerImport/locale/ms/LC_MESSAGES/YammerImport.po
plugins/YammerImport/locale/nl/LC_MESSAGES/YammerImport.po
plugins/YammerImport/locale/pl/LC_MESSAGES/YammerImport.po
plugins/YammerImport/locale/ru/LC_MESSAGES/YammerImport.po
plugins/YammerImport/locale/tl/LC_MESSAGES/YammerImport.po
plugins/YammerImport/locale/tr/LC_MESSAGES/YammerImport.po
plugins/YammerImport/locale/uk/LC_MESSAGES/YammerImport.po

Merge commit 'refs/merge-requests/56' of https://gitorious.org/social/mainline into merge-requests/56