Commit Graph
1798 Commits
Author SHA1 Message Date
Pierre de La Morinerie 7ba0b502d3 Add a "View in GitLab" link in notification emails
When an email notification concerns a specific object (issue, note,
merge request, etc.), add a link to the footer of the email that opens
the item's page in a web browser.

Rationale:

* The link is predictable: always the same text, always at the same
location, like any reliable tool.

* It allows to remove the inline-title in many emails, and leave only
the actual content of the message.
2014-03-03 16:58:44 +01:00
Jacob Vosmaer d6b0ac96f7 Invoke Kernel#system with separate arguments 2014-03-03 08:40:30 +01:00
Jacob Vosmaer b30b9c9c46 Replace shell commands with FileUtils 2014-03-03 08:40:30 +01:00
Jacob Vosmaer dd703b3e2a Remove duplicate code 2014-03-03 08:40:29 +01:00
Jason Blanchard 3ada1d7ec3 Added option to remove issue assignee on project issue page and issue edit page 2014-03-02 13:10:45 -05:00
Jacob Vosmaer 46b1c63b7a Make backup version blocker test more robust
Assuming that VERSION != VERSION.reverse is not robust. This will fail
at e.g. version 6.6.6.
2014-02-28 12:11:43 +01:00
Jacob Vosmaer b36751c897 Use VERSION contanst in backup specs 2014-02-28 11:57:58 +01:00
Dmitriy Zaporozhets 63d0c0b93b Merge branch 'gitlab_popen_array' into 'master'
Change Gitlab::Popen to only accept arrays as commands
2014-02-26 15:38:56 +00:00
Dmitriy Zaporozhets 345b3d4b72 Update tests and fix Finders readme
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-25 19:21:53 +02:00
Dmitriy Zaporozhets ffce379a67 Fix email test
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-25 17:49:20 +02:00
Dmitriy Zaporozhets f7ca46b5a3 Dont test models methods in security specs
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-25 17:14:03 +02:00
Dmitriy Zaporozhets c3a3f80af9 Merge branch 'cleaner-email-headers' into 'master'
Cleaner headers in Notification Emails

Make the informations available in the notification email headers (sender, recipient, subject, etc.) more readable and meaningful.

* Remove the email subject prefix
* Don't write the project namespace in email subjects
* Write the issue/merge request title in the notification email subject
* Make the email appear as sent from the action author (the actual email address is still `gitlab@gitlab.com`)

For instance, this is the notification email for a new issue comment before:

> From: gitlab@gitlab.com
> To: myemailaddress@gmail.com
> Subject: GitLab | GitLab HQ / GitLab-Shell | New note for issue #1234

And after :

> From: Nick Brown &lt;gitlab@gitlab.com&gt;
> To: myemailaddress@gmail.com
> Subject: GitLab-Shell |  Add local update hook  (#1234)

The recipient of the notification can easily get the gist of the message without even opening it — just by looking at how it appears in her inbox. None of the actual email addresses (From, To, Reply-to) changes, just the display name.

Having a consistent subject for all notification emails sent about some resource also allow good email clients to group the discussion by thread (although grouping in Mail.app still needs some work).
2014-02-25 13:34:06 +00:00
Dmitriy Zaporozhets 75eed4eb83 Implement project collection service
Main purpose is move big amount of methods from user, group, project
models and place filtering logic in one place.
It also fixes 500 error on group page for PostgreSQL

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-25 14:36:36 +02:00
Jacob Vosmaer 8016cefafe Make the Gitlab::Popen path argument optional 2014-02-25 11:58:22 +01:00
Jacob Vosmaer 0432bdf19e Change Gitlab::Popen to use arrays for commands 2014-02-25 11:57:42 +01:00
Dmitriy Zaporozhets 9f20580ed7 Merge pull request #6375 from cirosantilli/link-with-id
Blob and tree gfm links to anchors work.
2014-02-25 10:58:24 +02:00
Dmitriy Zaporozhets 79dd7beebd Merge branch 'feature/public_groups' into 'master'
Public Groups

This is the initial work (meaning no tests) for making groups public if they have a public project (or internal for logged in users). This allows issues and merge requests to be viewed, but _not_ group membership. As part of this I have also added back the link in the public project title section (it was removed as it didn't make sense before).

This addesses the following suggestions/issues:

http://feedback.gitlab.com/forums/176466-general/suggestions/5314461-groups-containing-one-or-more-public-projects-shou
Issue #32
https://github.com/gitlabhq/gitlabhq/issues/5203
as well as a few closed issues.

This also changes the public user page to only show groups that are accessible to the user in some manner.
2014-02-24 19:37:13 +00:00
Pierre de La Morinerie 5818cf063b Don't send an email for "mentioned in" notes
Currently, an email is sent every time a mentionable is referenced
by an issue, a commit or a merge request: if I comment "This MR is
related to #5", watchers get one email for the comment, and another
one stating "Issue #5 was mentioned by issue #13".

This is annoying — but the biggest issue is when pushing an existing
branch. Every issue referenced by commit messages in this branch will
get a new mention (which is fine), and dozens of emails will be sent
for all these new mentions (which is not).

This commit fixes the spam by avoiding to send an email when a new
mention is created. In most cases the email notification for the
mentioner is enough.
2014-02-24 15:34:56 +01:00
Dmitriy Zaporozhets 76ad6046f9 Fix tests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-24 13:50:06 +02:00
Ciro Santillli 90bdcac6b1 Blob and tree gfm links to anchors work.
Fixes #6046
2014-02-23 09:47:52 +01:00
Andrew Kumanyaev ec225ae1cb Update merge_request_observer_spec.rb 2014-02-21 20:25:29 +03:00
Binsztock RémyandOlivier Gonzalez e7382de108 Add Gemnasium Service for Gitlab
Conflicts:

	db/schema.rb
2014-02-21 16:25:22 +01:00
Jason Hollingsworth 2f69213e3f Allow access to groups with public projects.
Fixed Group avatars to only display when user has read
permissions to at least one project in the group.
2014-02-20 09:26:38 -06:00
Pierre de La Morinerie 96dded3ec8 Send emails from the author
This changes the email "From" field from "gitlab@example.com" to either:

* "John Doe <gitlab@example.com>" if the author of the action is known,
* "GitLab <gitlab@example.com>" otherwise.

Rationale: this allow mails to appear as if they were sent by the
author. It appears in the mailbox more like a real discussion between
the sender and the receiver ("John sent: we should refactor this") and
less like a robot notifying about something.
2014-02-19 18:25:18 +01:00
Pierre de La Morinerie 44ab156ef4 Remove the email subject prefix
This changes email subjects from:

    GitLab | Team / Project | Note for issue #1234

to:

    Team / Project | Note for issue #1234

Rationale:

* Emails should be as meaningful as possible, and emphasize content over
chrome. The "GitLab" name is more chrome than content.

* Users can tell an email coming from GitLab by the sender or the header
in the email content.

* An organization that works mainly with GitLab knows that
every SVC email comes from GitLab. For these organizations, having
"GitLab" in front of every email is just noise hiding the meaningful
information.
2014-02-19 18:25:18 +01:00
Dmitriy Zaporozhets ededfd2d29 Fix tests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-19 10:35:24 +02:00
Dmitriy Zaporozhets 9d637d576c Fix tests 2014-02-18 14:21:13 +00:00
Dmitriy Zaporozhets 6cf39fe10d Extract commits API to separate file
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-18 12:41:21 +02:00
Dmitriy Zaporozhets ddbe978041 Complete api files CRUD
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-18 12:27:02 +02:00
Dmitriy Zaporozhets 883c86a59e Fix notification specs
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-18 09:04:30 +02:00
Jason Hollingsworth 29cfd33d94 Add email aliases for users
Emails are used to associate commits with users. The emails
are not verified and don't have to be valid email addresses. They
are assigned on a first come, first serve basis.

Notifications are sent when an email is added.
2014-02-13 22:59:39 -06:00
Dmitriy Zaporozhets 1bcf0aa2e6 Merge pull request #6297 from jojosch/user-public-ssh-keys-newline
Split the user ssh keys by newline, not the characters "\n"
2014-02-11 21:07:52 +02:00
Dmitriy Zaporozhets c61512d4e1 Merge branch 'header-anchors' of github.com:cirosantilli/gitlab-elearn into cirosantilli-header-anchors
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
2014-02-11 20:32:21 +02:00
Johannes Schleifenbaum f10153818b Split the user ssh keys by newline, not the characters "\n"
before:
GET /user.keys

ssh-rsa ...\nssh-rsa ...\nssh-rsa ...

after:
GET /user.keys

ssh-rsa ...
ssh-rsa ...
sha-rsa ...
2014-02-11 19:24:23 +01:00
Dmitriy Zaporozhets aef782888f Merge pull request #5261 from devaroop/retrieve_ssh_keys_by_ssh
ssh keys publically available for sysadmins via http, the github way
2014-02-11 18:41:10 +02:00
GitLab 4b9c28bccd remove unwanted spaces, reduce diff, clean before merge 2014-02-11 21:12:27 +05:30
Ciro Santillli 61748c993d Headers have ids and link to their own id. 2014-02-11 16:23:33 +01:00
Dmitriy Zaporozhets 5e30f4d54c Fix dashboard atom feed
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-10 17:32:36 +02:00
Dmitriy Zaporozhets ec437ad999 Add more tests for FilteringService
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-10 15:23:19 +02:00
Dmitriy Zaporozhets bed05a1381 Fix submodule_helper specs
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-10 13:02:26 +02:00
Dmitriy Zaporozhets 54b8921534 Merge branch 'feature/submodule-links' into 'master'
Better submodule links

Detect if submodule is hosted on this GitLab server, gitlab.com or github.com.
Hash links directly to commit in repo.
2014-02-08 19:47:11 +00:00
Dmitriy Zaporozhets 4ecf30cd5b Fix bug with cross-reference note on commit
It should not set noteable_id if noteable_type is Commit
We have Note#commit_id for this

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-07 12:34:30 +02:00
GitLab b1492a2a62 sync with upstream for ease to merge 2014-02-06 19:47:21 +05:30
GitLab 1c9a41e0d5 adding tests for the ssh keys feature 2014-02-06 14:42:59 +05:30
Jason Hollingsworth fcc906e6aa Better submodule links.
Detect if submodule is hosted on this GitLab server, gitlab.com or github.com.
Hash links directly to commit in repo.
2014-02-05 20:44:14 -06:00
Andrey Kumanyaev 53bdcb53ae Fix relative links in markdown. Related to #6182 2014-01-29 17:48:59 +04:00
Dmitriy Zaporozhets a184fcf368 Merge pull request #6178 from Popl7/add_group_avatars
added group avatars
2014-01-28 00:26:18 -08:00
Dmitriy Zaporozhets b6454591cc Merge branch 'highlight-js' into 'master'
Highlight.Js

Replace pygments code highlight with client-side library - highlight.js

http://highlightjs.org/
2014-01-28 07:58:59 +00:00
Steven Thonus 251df827a5 added group avatars 2014-01-28 08:38:00 +01:00
Dmitriy Zaporozhets 891ea6f6e6 Improve highlight for notes
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-27 18:18:18 +02:00