Software Publico / Gitlab

26 Mar, 2014

1 commit

05c9ab94 Merge branch 'refactor-author-id-of-changes' into 'master' ... Browse Code »
```
Remove author_id_of_changes

To prevent confusion because we already have `current_user`
```
Dmitriy Zaporozhets
2014-03-26 07:01:16 +0000

25 Mar, 2014

26 commits

285ed337 Merge branch 'define-feature-request' into 'master' ... Browse Code »
```
Define Feature Request in Process doc
```
Dmitriy Zaporozhets
2014-03-25 20:07:24 +0000
74f16902 More strict wording of the bug criteria. Browse Code »

dosire
2014-03-25 20:57:58 +0100
b2e74741 Merge branch 'master' into define-feature-request ... Browse Code »
```
Conflicts:
	PROCESS.md
```
dosire
2014-03-25 20:57:21 +0100
7f67e066 More compact event feed and projects list ... Browse Code »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-03-25 20:10:08 +0200
e421772f Revert "Clearfix on well-lists. Pages affected:" ... Browse Code »
```
Because it adds extra spaces at each project row on dashboard

This reverts commit 2767abd90d94b3fd0fedfad85015abbffd7e4cd9.
```
Dmitriy Zaporozhets
2014-03-25 19:53:30 +0200
81527e9f Merge pull request #6374 from zzet/patch-10 ... Browse Code »
```
Update merge_request_observer_spec.rb
```
Dmitriy Zaporozhets
2014-03-25 19:41:47 +0200
9afccaa8 Merge pull request #6554 from tsigo/remove-spork ... Browse Code »
```
Remove Spork
```
Dmitriy Zaporozhets
2014-03-25 19:40:50 +0200
a5d7d125 Merge pull request #6577 from tombruijn/group_projects_clearfix ... Browse Code »
```
Clearfix on .well-list
```
Dmitriy Zaporozhets
2014-03-25 19:40:23 +0200
a7aacb4d Merge pull request #6586 from abner/master ... Browse Code »
```
added api method to return labels of a given project
```
Dmitriy Zaporozhets
2014-03-25 19:39:16 +0200
5fc3d746 Merge branch 'master' of github.com:gitlabhq/gitlabhq Browse Code »

Dmitriy Zaporozhets
2014-03-25 19:33:17 +0200
c21c3e57 Add bottom margin to highlighed code block in comment/wiki ... Browse Code »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-03-25 19:32:49 +0200
306d4ee7 Merge pull request #5935 from nmoura/patch-1 ... Browse Code »
```
Changed sudo by su -c in init script
```
Jacob Vosmaer
2014-03-25 15:06:54 +0100
cce80d04 Remove author_id_of_changes from spec ... Browse Code »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-03-25 14:02:55 +0200
f08464c0 Remove author_id_of_changes from app ... Browse Code »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-03-25 14:01:52 +0200
80daf9a7 Use current_user for Notification#merge_mr ... Browse Code »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-03-25 13:47:48 +0200
8bbac457 Simplify run tests command ... Browse Code »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-03-25 12:10:50 +0200
e320ee3f Merge branch 'humanize-over-titleize' into 'master' ... Browse Code »
```
Use humanize instead of titleize for MR title suggestion
```
Dmitriy Zaporozhets
2014-03-25 10:06:11 +0000
7847e108 Fix tests ... Browse Code »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-03-25 12:05:37 +0200
0aed79b5 Merge branch 'improve-archived-projects' into 'master' ... Browse Code »
```
Proper message for archived projects at MR#show page

Fixes #940
```
Dmitriy Zaporozhets
2014-03-25 09:41:35 +0000
12778fbe Merge pull request #6612 from Datacom/feature/print_styles_pr ... Browse Code »
```
Print Styles
```
Dmitriy Zaporozhets
2014-03-25 11:07:10 +0200
2677f793 Merge branch 'sidekiq_load_check' into 'master' ... Browse Code »
```
Sidekiq Load Check
```
Dmitriy Zaporozhets
2014-03-25 08:17:21 +0000
069c8a95 Merge branch 'external-issue-tracker-instructions' into 'master' ... Browse Code »
```
External Issue Tracker Instructions
```
Dmitriy Zaporozhets
2014-03-25 08:17:05 +0000
d7f1b366 Merge branch 'no-verify-for-webhooks' into 'master' ... Browse Code »
```
Inform people about the verify-none for webhooks.

Fixes #980
```
Dmitriy Zaporozhets
2014-03-25 08:15:43 +0000
72b13cc1 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce Browse Code »

Dmitriy Zaporozhets
2014-03-25 09:04:22 +0200
bbca0351 Merge pull request #6606 from kemenaran/fix-merge-notifications ... Browse Code »
```
Fix the merge notification email not being sent
```
Dmitriy Zaporozhets
2014-03-25 09:03:14 +0200
842ad4a4 Initial implementation Browse Code »

George Dewar
2014-03-25 15:58:16 +1300

24 Mar, 2014

13 commits

3d8ecbc9 Merge branch 'no-emails-for-mentions' into 'master' ... Browse Code »

 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 +0000

55be026e Merge branch 'application-js-coffee' into 'master' ... Browse Code »
```
Applications js to coffee
```
Dmitriy Zaporozhets
2014-03-24 17:37:38 +0000
775f686e Prevent discussion about is it a bug or a feature request. Browse Code »

dosire
2014-03-24 16:51:55 +0100

cec02067 Merge branch 'improve-mr-form' into 'master' ... Browse Code »

Remove assignee/milestone selects from MR form

Fixes #1079 and http://feedback.gitlab.com/forums/176466-general/suggestions/5663897-merge-request-assign-to-should-popule-with-membe

2014-03-24 15:41:53 +0000

1fe07cfb Merge branch 'attribution-for-shell-guide' into 'master' ... Browse Code »
```
Attribution For Shell Guide
```
Jacob Vosmaer
2014-03-24 15:10:40 +0000
9b8ee3e0 Merge branch 'advise-in-upgrade-guide-is-outdated' into 'master' ... Browse Code »
```
Advise In Upgrade Guide Is Outdated
```
Sytse Sijbrandij
2014-03-24 14:18:09 +0000
369bd858 We should only specify unsafe version, never give advise since it it perishable. Browse Code »

dosire
2014-03-24 15:17:43 +0100
394737b2 Use humanize instead of titleize for MR title suggestion ... Browse Code »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-03-24 16:15:57 +0200
3ef0a625 Applications js to coffee ... Browse Code »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-03-24 16:12:23 +0200

65f5496e Fix the merge notification email not being sent ... Browse Code »

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 +0100

36ea8645 Merge branch 'enable_assets_compression' into 'master' ... Browse Code »
```
Add gzip compression for assets to nginx example
```
Dmitriy Zaporozhets
2014-03-24 14:01:43 +0000
ad7277df Merge branch 'master' of github.com:gitlabhq/gitlabhq Browse Code »

Dmitriy Zaporozhets
2014-03-24 15:59:53 +0200
8af94ed7 Add gzip compression for assets to nginx example. Browse Code »

Marin Jankovski
2014-03-24 14:59:09 +0100