Stan Hu
5e4384ec9b
Support editing target branch of merge request
...
Closes https://github.com/gitlabhq/gitlabhq/issues/7105
See: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/130
2015-05-29 04:08:08 -07:00
Robert Speicher
38637e7d08
Change one-character variable name
...
[ci skip]
2015-05-27 03:34:14 -04:00
Robert Speicher
1aa3921dd8
Add a note when an Issue or Merge Request's title changes
2015-05-26 21:49:04 -04:00
Arthur Gautier
a927bf56b1
Call merge request web hook for each commits
...
Call merge request web hook every times a new commit hits the
source branch
Signed-off-by: Arthur Gautier <baloo@gandi.net>
2015-05-13 09:33:20 +02:00
Douwe Maan
663b3c968f
Condense commits already in target branch when updating merge request source branch.
2015-03-06 18:09:00 +01:00
Jeroen van Baarsen
0c4a70a306
Updated rspec to rspec 3.x syntax
...
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
2015-02-12 19:17:35 +01:00
Nikita Verkhovin
8681cb3137
Add labels notes
2015-02-08 22:35:41 +06:00
Dmitriy Zaporozhets
ed8c3e2d73
Remove unnecessary reload in test
2015-01-26 16:10:34 -08:00
Dmitriy Zaporozhets
9d85ea3acf
Organize event order execution when update issue or mr
2015-01-25 22:49:05 -08:00
jubianchi
4ffdb83e71
Add action property to merge request hook
2015-01-20 10:50:24 +01:00
Dmitriy Zaporozhets
ee9849b736
Improve mr refresh service tests
2015-01-06 18:05:10 -08:00
Dmitriy Zaporozhets
2139e3519b
Refactor merge request refresh logic on push
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-11-11 16:49:26 +02:00
Jacob Vosmaer
780d868fec
Revert "Merge branch 'fix-email-threading' into 'master'"
...
This reverts commit 97fd990ecd
, reversing
changes made to f451a697e0
.
Conflicts:
app/mailers/emails/notes.rb
app/mailers/emails/projects.rb
2014-06-18 13:41:12 +02:00
Pierre de La Morinerie
466b768bb3
Send notification emails to the "project", and put people in Cc
...
This fixes email threading in Mail.app, that doesn't like when a thread
doesn't have stable recipients.
For instance, here is a possible sender-recipient combinations before:
From: A
To: Me
New issue
From: B
To: Me
Reply on new issue
From: A
To: Me
Another reply
Mail.app doesn't see B as a participant to the original email thread,
and decides to break the thread: it will group all messages from A
together, and separately all messages from B.
This commit makes the thread look like this:
From: A
To: gitlab/project
Cc: Me
New issue
From: B
To: gitlab/project
Cc: Me
Reply on new issue
From: A
To: gitlab/project
Cc: Me
Another reply
Mail.app sees a common recipient, and group the thread correctly.
2014-06-10 17:09:15 +02:00
Dmitriy Zaporozhets
860f159d41
Add note when MR assignee changes. Add more tests to MR services
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-04-03 18:16:05 +03:00