3e259ea8bc
Revert "Merge branch 'revert-satellites' into 'master'
"
...
This reverts commit 5daf44b7c82f706fbd23
2015-08-11 14:33:31 +02:00
3b02ad8467
Revert "Merge branches inside one repository using rugged instead of satellites"
...
This reverts commit d24c40ec21
2015-08-11 10:50:39 +02:00
32046983ad
Revert "Merge branch 'refactor-can-be-merge' into 'master'"
...
This reverts commit 459e6d3467804168e1de
2015-08-11 10:48:02 +02:00
9f10943c1a
Revert "Merge branch 'drop-satellites'"
...
This reverts commit 957e849f416b9dbe9f5a
2015-08-11 10:28:42 +02:00
84727fba96
Revert "Merge branch 'improve-merge-requests' into 'master'
"
...
This reverts commit 4773f38e280d5d80b735
2015-08-11 10:26:19 +02:00
8dce66234f
Fetch to mr code from fork to iid
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-07 12:35:04 +02:00
a7fded9b95
Huge refactoring for accepting merge requests
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-07-16 16:03:07 +02:00
26f5d6047d
Refactor compare and fetch logic
2015-07-15 17:28:09 +02:00
2a6f522cac
Implement merge from forks without satellites
2015-07-15 16:45:50 +02:00
a87989fb7d
Remove satellites
2015-07-15 15:45:57 +02:00
2e6bbb12f8
Refactor can_be_merged logic for merge request
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-07-01 17:24:03 +02:00
d24c40ec21
Merge branches inside one repository using rugged instead of satellites
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-07-01 16:23:58 +02:00
7524d7c082
Revert merge request states renaming
...
Replaced:
* "Accepted" with "Merged"
* "Rejected" with "Closed"
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-19 17:09:50 +02:00
946b4ceda3
Improve variables in mr widget
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-11 18:45:12 +02:00
644b6ba993
Refactor accept merge request widget
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-11 09:40:26 +02:00
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
9eec0d5436
Merge branch 'accepted-rejected-mrs' into 'master'
...
Add Accepted and Rejected tabs to MR lists.
Before, MRs were referred to as Merged or Closed, but the Merge button on the MR page read "Accept Merge Request", the activity feed even read "X accepted merge request Y", and the Closed tab on the MR index included both Merged _and_ Closed MRs. I've changed every occurrence to consistently refer to MRs as either Accepted or Rejected, which is less technical and more clearly two opposites.
Addresses internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2201 .
See merge request !702
2015-05-27 11:40:36 +00:00
1a9da9178c
Surround Project.reference_pattern in parenthesis inside other patterns
2015-05-26 15:49:22 -04:00
b88da58cb6
Add `reference_pattern` to Referable models
2015-05-26 15:48:32 -04:00
0359d41b06
Implement gfm_reference directly in Mentionable
...
Except for Note, which still overrides it.
2015-05-26 15:48:31 -04:00
c0faf91ff2
Add `to_reference` for models that support references
...
Now there is a single source of information for which attribute a model
uses to be referenced, and its special character.
2015-05-26 15:48:30 -04:00
ebe9c89082
Consistently refer to MRs as either Accepted or Rejected.
2015-05-25 17:01:14 +02:00
7e0eb486ed
Don't allow a merge request to be merged when its title starts with "WIP".
2015-04-30 15:46:36 +02:00
4f2e4c7656
Select MR commit notes from source project.
2015-04-24 12:30:37 +02:00
27af24c1c9
No longer needed to pass project argument to commit methods.
2015-04-24 12:29:36 +02:00
f517dd2606
fix stuck mr
...
fixes #348 . related to 6487419364
2015-04-14 23:11:13 -07:00
e33ddfebf2
Refactor ClosingIssueExtractor.
2015-04-03 18:03:26 +02:00
65bb0c3406
Only allow users to cross-reference and close issues they have access to.
2015-04-02 10:57:01 +02:00
70fa9d5629
Don't mark merge request as updated when merge status relative to target branch changes.
2015-03-23 17:30:19 +01:00
415517918e
Update merge_status state to allow more transitions
...
Previously you could only transition from the unchecked state to one of the others. This meant that the mark_as_unmerged call in AutoMergeService would rarily be able to actually transition the state. As it would usually have already been set to can_be_merged before it hit that service.
2015-03-19 13:51:16 -07:00
e97cdb042d
Remove old team scopes.
2015-03-15 13:50:38 +01:00
e0aa5c371e
Fix method overlap for issue sorting
2015-02-05 16:49:41 -08:00
4f1d1fc51b
Convert hashes to ruby 1.9 style
2015-02-02 19:30:09 -08:00
98ee4a1fa7
Annotate models
2015-01-22 09:40:03 -08:00
2b10520b30
Merge pull request #7999 from cirosantilli/append-inplace
...
Append in place for strings and arrays [failure unrelated]
2015-01-21 23:07:15 -08:00
5c80160218
Fix various typos
...
signe-in -> signed-in
go_to_gihub_for_permissions -> go_to_github_for_permissions
descendand -> descendant
behavour -> behaviour
recepient_email -> recipient_email
generate_fingerpint -> generate_fingerprint
dependes -> depends
Cant't -> Can't
wisit -> visit
notifcation -> notification
sufficent_scope -> sufficient_scope?
levet -> level
2015-01-18 10:29:37 -05:00
ccdf08d80a
Refactor merge request merge service
...
* Add system note when user merges MR in same way as it closes it
* Remove duplicating code
2015-01-06 16:24:47 -08:00
33c9f05c6b
Append in place for strings and arrays
2015-01-01 21:12:00 +01:00
6487419364
Automatically close merge requests that were locker for 1 day
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-12-05 16:02:08 +02:00
b23f71ec4d
Set/unset merge request locked_at timestamp after transition
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-12-05 15:49:25 +02:00
9f0083a96c
Add task lists to issues and merge requests
...
Make the Markdown parser recognize "[x]" or "[ ]" at the beginning of a
list item and turn it into a checkbox input. Users who can modify the
issue or MR can toggle the checkboxes directly or edit the Markdown to
manage the tasks. Task status is also displayed in the MR and issue
lists.
2014-10-05 22:15:27 -05:00
1c9d2e39c1
Hook attributes
2014-10-02 12:58:02 +04:00
998cd3cb63
Improve error reporting on users API
...
* users (#6878 , #3526 , #4209 ): Validation error messages are now exposed through 400 responses, 409 response are sent in case of duplicate email or username
* MRs (#5335 ): 409 responses are sent in case of duplicate merge request (source/target branches), 422 responses are sent when submiting MR fo/from unrelated forks
* issues
* labels
* projects
2014-09-16 01:25:24 +02:00
92deb451da
Annotate models
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-08-25 12:25:02 +03:00
d45a6b2941
Migrate issue/mr labels from act_as_taggable to own labels
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-07-29 19:19:26 +03:00
ddaa493ef3
Improve MR building
...
* fix 500 error when no parent for initial commit
* fix link from diff files to wrong commit
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-07-28 20:54:40 +03:00
16eea49277
Moved some behaviour to one place
...
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
2014-07-25 22:23:42 +02:00
be5b6db883
Refactor diff suppress logic and diff views
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-07-15 18:28:21 +03:00
45623089e2
Refactor MR build process
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-07-15 15:34:06 +03:00
c1b7e904ff
Add a mention of the merge request into its default commit message.
2014-07-01 21:54:19 +02:00
Dmitriy Zaporozhets
Stan Hu
Robert Speicher
Douwe Maan
Ben Bodenmiller
DJ Mountney
Steven Burgart
Ciro Santilli
Vinnie Okada
Kirill Zaitsev
jubianchi
Jeroen van Baarsen
Christian Taedcke
