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
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
4f0bfdb500
Merge branch 'strong-parameters' into 'master'
...
Strong parameters
Replace protected_attributes with strong parameters.
Fixes #1340
2014-06-30 17:01:22 +00:00
b5007c1565
Rename MergeRequest#lock! to #lock_mr!
...
As a warning from the StateMachine gem points out to us, there already
exists a method ActiveRecord#lock!. This change renames the `lock` and
`unlock` events defined on MergeRequest to `lock_mr` and `unlock_mr`.
2014-06-26 14:09:17 +02:00
1dab15940d
Remove protected_atrributes gem and start moving to strong params
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-06-26 14:30:07 +03:00
3f1ece2690
Detect closing issues in Merge Request description
2014-06-13 17:25:44 +02:00
ffd50e8cf5
Add merged mrs list to milestone page
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-06-05 16:28:13 +03:00
affd376f7a
Dont show remove source branch ckecbox/button if you dont have such
...
permissions for MR page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-05-27 18:51:41 +03:00
1f1c59b61d
Merge pull request #6778 from dblessing/feature/mr_labels
...
Merge Request Labels
2014-05-13 14:43:46 +03:00
5f25cdfe19
Implement Merge Request Labels
2014-05-13 06:41:36 -05:00
23de3551ab
Add MergeRequest#target_project_namespace
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-05-08 15:37:36 +03:00
36f861f1b1
Re-annotate models
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-04-09 15:05:03 +03:00
d92e4830f7
Allow people to remove source branch of fork project in MR
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-04-07 19:11:02 +03:00
9b598fa62d
Fix MR fork validation and services load
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-04-03 10:36:10 +03:00
9ee697dd68
Use MergeRequest services in API and controllers
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-04-02 21:51:53 +03:00
f08464c055
Remove author_id_of_changes from app
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-03-25 14:01:52 +02:00
55fbe71ad1
Fix error with reopened merge request not properly reloading
...
If you reopen a Merge Request and then try to update the source branch
it won't properly reload the code since the "reload_code" method still
checks if the MR is "opened" and not just "open" (which includes reopened)
2014-03-12 08:54:42 +02:00
36b065e634
Feature: reopen closed merge request
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-28 22:43:16 +02:00
1c61ac1c64
Refactor MR code reload
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-18 20:17:26 +02:00
1e106756fa
For form MR render only namespace name
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-15 14:36:58 +02:00
f416b2f5cf
Fix bug with merge request branch select
...
Merge request target branch select is broken if you submit form and have
some errors on page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-31 13:24:38 +02:00
Robert Speicher
Douwe Maan
Ben Bodenmiller
DJ Mountney
Dmitriy Zaporozhets
Steven Burgart
Ciro Santilli
Vinnie Okada
Kirill Zaitsev
jubianchi
Jeroen van Baarsen
Christian Taedcke
Jacob Vosmaer
Drew Blessing
Daniel Cestari