Commit Graph
1285 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 9afccaa8c6 Merge pull request #6554 from tsigo/remove-spork
Remove Spork
2014-03-25 19:40:50 +02:00
Dmitriy Zaporozhets a7aacb4dc4 Merge pull request #6586 from abner/master
added api method to return labels of a given project
2014-03-25 19:39:16 +02:00
Dmitriy Zaporozhets 72b13cc1be Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2014-03-25 09:04:22 +02:00
Dmitriy Zaporozhets 3d8ecbc94f Merge branch 'no-emails-for-mentions' into 'master'
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", the 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 added to an existing mentionable. In most cases the email notification sent by the mentioner is enough.
2014-03-24 18:52:41 +00:00
Pierre de La Morinerie 65f5496e02 Fix the merge notification email not being sent
The 'author_id_of_changes' attribute is not persisted in the database.
As we retrieve the merge request from the DB just before sending the
email, this attribute was always nil.

Also there was no tests for the merge notification code - tests have
been added.

Fix #6605
2014-03-24 15:11:35 +01:00
Dmitriy Zaporozhets d66d10970d Merge pull request #6594 from tsigo/rs-small-changes
Small changes
2014-03-24 14:58:35 +02:00
Robert Speicher 1e3b5c3787 Remove Spork 2014-03-24 08:55:27 -04:00
Robert Speicher 07833d1676 Move Project's service specs to the correct location
[ci skip]
2014-03-22 16:38:22 -04:00
Ábner Silva de Oliveira 85b5812bc2 moving labels specs to projects_spec file 2014-03-22 17:29:13 -03:00
Robert Speicher 760f827ba0 Remove code that does nothing
ping @karlhungus
2014-03-22 15:40:42 -04:00
Ábner Silva de Oliveira 44aa6b90dd added api method to return labels of a given project 2014-03-21 06:25:25 -03:00
Dmitry Medvinsky fefab47456 Fix /:username.keys response content type
Currently this method responds with `text/html`. It is kind of unusable
if you open it in a browser. The browser thinks it is HTML and renders
it as HTML, meaning new lines are dropped. So it's very hard to
distinguish where the key starts and where it ends.

This commit changes the content type header to `text/plain`.
2014-03-20 19:09:14 +04:00
Dmitriy Zaporozhets 492dc82ced Merge pull request #6557 from tsigo/faster-merge-request-features
Speed up features/notes_on_merge_requests_spec
2014-03-19 14:45:15 +02:00
Robert Speicher 1897fb00b8 Make use of project factory traits 2014-03-19 05:15:24 -04:00
Robert Speicher 65d634706c Add public/private/internal traits to :project Factory 2014-03-19 05:14:27 -04:00
Robert Speicher a90574fab2 Speed up finders/merge_requests_finder_spec
Uses the :simple merge request factory trait introduced by d166e70; cuts
execution time of this spec in half.
2014-03-19 03:57:38 -04:00
Robert Speicher 53d3294d1d Speed up features/notes_on_merge_requests_spec
This spec featured the slowest tests in the entire suite. After some
debugging, the cause was found to be the large commit diff generated by
comparing the stable and master branches.

To fix this, the seed repository was modified to create a simple branch
off of master that consists of three simple commits and minor changes.
The spec was then updated to compare master to this branch instead of
stable. The result is a spec group that runs in under 30 seconds, down
from about 90.
2014-03-19 03:57:37 -04:00
Federico Ravasio e3fc01b3ea Added Slack service integration. 2014-03-18 18:54:30 +01:00
Dmitriy Zaporozhets 493c7a6147 Merge branch 'links_within_same_repo' into 'master'
Relative links within one system

When using relative links in md in repository file it will only link within the repository.
When using relative links in md in wiki page, it will only link to wiki pages.
2014-03-17 14:06:08 +00:00
Dmitriy Zaporozhets 928b7f3bff Add tests for API project permissions info
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-03-17 15:14:27 +02:00
Marin Jankovski 656d9548bc Update markdown documentation, fix wiki spec. 2014-03-17 13:23:04 +01:00
Dmitriy Zaporozhets 7c60713e82 Move project members api to separate file
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-03-17 13:44:54 +02:00
Dmitriy Zaporozhets fddbd7b2f0 Merge branch 'issue-110' of https://gitlab.com/gmessner/gitlab-ce into gmessner/gitlab-ce-issue-110
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
2014-03-16 09:43:25 +02:00
Dmitriy Zaporozhets ac6b9fafdc Fix specs
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-03-14 12:53:05 +02:00
Robert Speicher 0983438037 TestEnv.reset_satellite_dir should run 'git clean' quietly
Removes the "Removing gitlabhq" messages cluttering spec output
2014-03-13 17:25:55 -04:00
Dmitriy Zaporozhets 56318a24b1 Merge pull request #6474 from jvanbaarsen/post-tag-hook
Add web hooks on tag
2014-03-12 09:52:34 +02:00
Dmitriy Zaporozhets c4f9dff480 Merge branch 'simplify-emails-content' into 'master'
Streamline the content of notification emails

In notification emails, the actual content of the email is often buried under several blocks of chrome — and may even be truncated or completely missing. Ideally, the notification emails would be like *real emails*: a short message of meaningful text, sent from the author of the change that triggered the notification.

This MR includes the following changes to notification emails:

* Remove much of the chrome (e.g. the "GitLab" header)
* Emphasize the content (no more small, grayed-out content)
* Add missing informations to the emails (issue description in "new issue" email, file name in "diff comment" email)
* Add a consistent "View in GitLab" link in the footer
* The assignee is displayed only if someone is assigned
* Fix a rendering bug when viewing emails with [Zimbra](http://www.zimbra.com/)

We use these patches at [Capitaine Train](http://www.capitainetrain.com), and it has been a surprisingly big productivity boost for us.

![Before and after](http://f.cl.ly/items/3n0P2c2v1P0y011c0D3e/Before%20and%20After.png)
2014-03-11 10:39:29 +00:00
Dmitriy Zaporozhets 767f7d9ae7 Merge branch 'ldap-code' into 'master'
LDAP code from EE
2014-03-11 09:28:41 +00:00
Greg Messner f84d846223 Added tests of Create and Update MR description. 2014-03-10 12:39:29 -07:00
Dmitriy Zaporozhets 3e864036e7 Fix ldap_user_auth_spec
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-03-10 19:16:43 +02:00
Robert Speicher 74d2085cdf Sort tag names using VersionSorter 2014-03-09 00:01:06 -05:00
Jeroen van Baarsen e6ceec9d60 Renamed oldrev/newrev to before/after 2014-03-06 16:15:19 +01:00
Jeroen van Baarsen 4a251849cf Added newrev and oldrev to the hook data 2014-03-06 16:08:51 +01:00
Dmitriy Zaporozhets 2ed06dc41d Fix group_icon spec
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-03-06 14:04:01 +02:00
Jeroen van Baarsen 13d2bcc3b4 Created a basic Git Tag Push service
This is the first version, and only has the most basic information about
the tag that is created.
2014-03-05 21:23:49 +01:00
Jeroen van Baarsen 9a676ccc0a Added tag_push_events to the web_hooks
* Added a scope to the web_hooks model
* Added extra checkbooks in de hooks overview window
2014-03-05 20:44:01 +01:00
Dmitriy Zaporozhets f1d8efb770 Merge branch 'shell_new_style' into 'master'
Use new style shell commands
2014-03-05 10:45:46 +00:00
Pierre de La Morinerie eeb011e34a Remove the author name from issue notes emails
Rationale: the author name is now displayed in the email "From" field;
this information is no longer needed.
2014-03-03 16:58:44 +01:00
Pierre de La Morinerie 8e421d2bcb Add the description to the "new issue" and "new merge request" emails
Previously the content of the issue or merge request was missing from
the email.
2014-03-03 16:58:44 +01:00
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