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
1338c7dd71
Fix mr update issue if merge_request_diff missing
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-24 14:38:02 +02:00
48f741eed9
MergeRequests services
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-24 14:18:32 +02:00
380342784d
Fix MR spinach tests
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-23 12:55:43 +02:00
4b3afe2325
Always create merge_request_diff if MR created
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-22 20:22:20 +02:00
51ea42e238
Improve commit render performnace for MR show page
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-22 15:54:53 +02:00
79bfbe5918
Remove commits/diff store login from MergeRequest model
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-22 15:20:20 +02:00
09d5868c22
Fix mr controller specs
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-14 10:47:28 +02:00
db966364de
MergeRequest#automerge accepts custom message now. MergeRequest#merge_commit_message generate default one
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-13 17:20:30 +02:00
63723ef6df
Fix dashboard event caching
2013-12-13 13:40:45 -06:00
cb599a09be
Allow close of broken MR
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-12 12:20:54 +02:00
6c3459978d
Add new methods to MR to check if source or target branch exists
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-12 11:34:42 +02:00
b658489f27
Fix bugs when discussion visible in wrong project
...
Because notes scope was not limited by project in
MergeRequest#mr_and_commit_notes it causes comments from project A
appears in discussions for MR in project B.
2013-10-07 14:49:01 +03:00
e219cf7246
Annotate!
2013-10-01 15:15:28 +03:00
76a0739454
Add description to MergeRequest model
2013-09-09 16:32:43 +03:00
c8a115c0e3
Link issues from comments and automatically close them
...
Any mention of Issues, MergeRequests, or Commits via GitLab-flavored markdown
references in descriptions, titles, or attached Notes creates a back-reference
Note that links to the original referencer. Furthermore, pushing commits with
commit messages that match a (configurable) regexp to a project's default
branch will close any issues mentioned by GFM in the matched closing phrase.
If accepting a merge request would close any Issues in this way, a banner is
appended to the merge request's main panel to indicate this.
2013-08-25 18:58:41 -04:00
8dd37afe34
Reannotate
2013-08-21 12:34:02 +03:00
625fb2f29d
Add iids to milestones. Moved iids logic to separate concern
2013-08-21 12:16:26 +03:00
7047a44a26
Sett iid on create. Use iid as value to_param
2013-08-19 22:10:56 +03:00
7fefb0397e
Fix filter context. Dont duplicate target project name for MR
2013-08-08 17:29:31 +03:00
f4978bc08e
Fix unmerged diff for non-fork MR
2013-08-08 12:44:33 +03:00
4537623d12
Merge branch 'master' into karlhungus-mr-on-fork
...
Conflicts:
app/contexts/filter_context.rb
app/contexts/search_context.rb
app/models/merge_request.rb
app/models/note.rb
app/views/shared/_merge_requests.html.haml
spec/controllers/commit_controller_spec.rb
spec/services/notification_service_spec.rb
2013-08-08 12:22:09 +03:00
b92655663c
Update main calls to gitlab_git
2013-08-05 16:51:04 +03:00
d99594273d
Style changes from review with @randx
...
-Some changes around calling origional methods for !for_fork? merge requests. Other changes to follow
Change-Id: I009c716ce2475b9efa3fd07aee9215fca7a1c150
2013-07-17 22:48:03 -04:00
0ef055a4ae
MR on fork: Email fixes, style fixes
...
-Removed many extra spaces I added
-Fixed email templates to be consistent/better looking
GITLAB-894, GITLAB-895, (GITLAB-858)
Change-Id: I35c1a8e0e22af7de26d54e5c3da987fa7bb3921e
2013-07-17 22:46:38 -04:00
09112dbb1d
Rebase on master
...
Trying to retrigger travis
Change-Id: Ifd86fb4c6b2791ad176230254fbf69a9ade979fb
2013-07-17 22:45:03 -04:00
5d56da6bdd
MR on fork: Some cleanup, test updates
...
-The forked merge request test now tests it's componenets again, and seems to work every time (did this by reordering the branch updates so their is more time for update_branches to run) -- this could still technically fail, but after several runs it doesn't seem to.
-Removed todo in merge_request, pushed wrapping of grit down to the satellite
-updated action test to check flock status, made it nolonger pending
-moved all logging on failure to helper method in satellite
GITLAB-592
Change-Id: If0554ca35eedc3d3e8461f7d93d4b3939fa2cd75
2013-07-17 22:42:51 -04:00
3d7194f011
Merge Request on forked projects
...
The good:
- You can do a merge request for a forked commit and it will merge properly (i.e. it does work).
- Push events take into account merge requests on forked projects
- Tests around merge_actions now present, spinach, and other rspec tests
- Satellites now clean themselves up rather then recreate
The questionable:
- Events only know about target projects
- Project's merge requests only hold on to MR's where they are the target
- All operations performed in the satellite
The bad:
- Duplication between project's repositories and satellites (e.g. commits_between)
(for reference: http://feedback.gitlab.com/forums/176466-general/suggestions/3456722-merge-requests-between-projects-repos )
Fixes:
Make test repos/satellites only create when needed
-Spinach/Rspec now only initialize test directory, and setup stubs (things that are relatively cheap)
-project_with_code, source_project_with_code, and target_project_with_code now create/destroy their repos individually
-fixed remote removal
-How to merge renders properly
-Update emails to show project/branches
-Edit MR doesn't set target branch
-Fix some failures on editing/creating merge requests, added a test
-Added back a test around merge request observer
-Clean up project_transfer_spec, Remove duplicate enable/disable observers
-Ensure satellite lock files are cleaned up, Attempted to add some testing around these as well
-Signifant speed ups for tests
-Update formatting ordering in notes_on_merge_requests
-Remove wiki schema update
Fixes for search/search results
-Search results was using by_project for a list of projects, updated this to use in_projects
-updated search results to reference the correct (target) project
-udpated search results to print both sides of the merge request
Change-Id: I19407990a0950945cc95d62089cbcc6262dab1a8
2013-07-17 22:41:30 -04:00
63e532eff0
Cache MR diffs result. Improve diff output
2013-07-08 20:12:35 +03:00
6e35aceff2
Annotated
2013-06-19 15:40:33 +03:00
940c05086e
Check for existing MR only for opened/reopened MR
2013-06-14 17:19:26 +03:00
a59fe739fe
IMprove MR validation logic
2013-06-14 15:17:47 +03:00
977146f568
Prevent creating several open merge requests for same branches
2013-06-14 15:03:22 +03:00
44275e5066
Fix huge MR exceptions. Fixed link to diff for it
2013-05-22 14:06:08 +03:00
71033c9efb
handle broken diffs gracefully
2013-05-22 09:50:09 +03:00
6a4a17f339
Remove native git calls from MR. Dump diff as array, not class
2013-04-15 19:01:36 +03:00
03f41e2820
Gitlab::Git::Tree & Blob added
2013-04-02 22:37:20 +03:00
5f4445c3d3
store commits for MR as array of hashes
2013-04-02 21:30:36 +03:00
af657b0509
reset st_commits before setting new value to prevent error when old st_commits is broken
2013-04-02 11:32:41 +03:00
bbfbff3add
Extend models functionality with old decorator methods. Use Repository model
2013-03-31 23:48:12 +03:00
154e54b46e
Remove grit logic from app/
2013-03-31 18:49:58 +03:00
21b1fee92c
reannotated
2013-03-15 15:16:02 +02:00
3374027e3a
Merge branch 'master' into fixes/api, code clean up and tests fixed
...
Conflicts:
doc/api/projects.md
spec/requests/api/projects_spec.rb
2013-03-07 14:51:56 +01:00
b3d648b4e8
Prevent duplicate merge events
2013-02-27 17:48:51 +02:00
d7b667fee2
Merge branch 'state-machine-stage-2' of https://github.com/Undev/gitlabhq into Undev-state-machine-stage-2
...
Conflicts:
app/models/merge_request.rb
2013-02-26 10:38:40 +02:00
4a137651ec
Fix merge request closed filter. Fixed one more test
2013-02-21 14:11:24 +02:00
6d68923edc
human_merge_status replaced by human_merge_status_name
2013-02-20 17:50:29 +04:00
52e0df5c23
class.self methods moved to scopes
2013-02-20 17:50:24 +04:00
e2d94e0719
State machine added for merge_status field
2013-02-20 17:49:48 +04:00
155703c613
Merge branch 'state-machine' of https://github.com/Undev/gitlabhq into Undev-state-machine
...
Conflicts:
app/models/issue.rb
app/models/merge_request.rb
2013-02-19 11:01:19 +02:00
bfc359ca61
Fix project filter for MR on dashboard
2013-02-19 09:43:41 +02:00
d27ed43daa
Hash syntax improved
2013-02-18 17:22:18 +04:00
29f70acc98
Merge Request uses StateMachine now
2013-02-18 14:43:50 +04:00
b45e9aefd3
Merge Request uses StateMachine now
2013-02-18 14:43:50 +04:00
8db3920c01
State renamed to merge_status
2013-02-18 14:43:49 +04:00
839957cf56
Constants in Events looks good now
2013-02-13 15:48:16 +04:00
da03a5c7e2
more refactoring using models/concerns
2013-01-03 09:06:07 +02:00
40a956eb68
Few more fixes after removing roles
2013-01-03 00:01:08 +02:00
9ada678819
Split commit_id and noteable_id for Note
2012-12-18 20:02:00 +02:00
ca936d2784
Improve CI integration for merge requests
2012-12-11 06:14:05 +03:00
b3834bc9b0
Remove MergeRequest#to_raw and replace it with #to_diff and #to_patch
2012-11-25 00:05:47 +01:00
95c23b2f97
Annotated. schema updated
2012-11-19 21:24:05 +03:00
e4cf99db46
Refactor milestones related functionality. Added seeds for Milestine and MR
2012-10-30 09:22:24 +02:00
f417a265d7
Finalize milestones for Merge Requests
2012-10-29 23:45:11 +02:00
ecdf778e80
Merge branch 'public_submission_milestones_for_mr' of https://github.com/piffio/gitlabhq into piffio-public_submission_milestones_for_mr
...
Conflicts:
app/views/merge_requests/_form.html.haml
2012-10-29 21:37:46 +02:00
a7d0816933
Add Milestone information in Merge Requests
...
Step 1:
* Add milestone_id in the model for merge_requests
* Make it possible to create or update a Merge Request with an attached
Milestone detail
* Add the possibility to filter by Milestone and / or Assignee in the
Merge Requests listing page
2012-10-26 16:12:40 +02:00
8c89beb6f9
Change argument order for satellite actions to always start with the user
2012-10-26 00:26:47 +02:00
78235edda8
Renamed Gitlab::Merge to Gitlab::Satellite::MergeAction
2012-10-26 00:19:01 +02:00
d4e3664067
Fix bug in MergeRequest#mark_as_unmergable
2012-10-20 15:27:34 +02:00
122769e358
Refactor Gitlab::Merge
...
* Refactor and document methods
* Rename merge to merge!
* Fixes #1544
2012-10-20 15:25:48 +02:00
3b5c7b6e9a
minor code style fixing
2012-10-12 20:07:23 +03:00
6dc8c0eac2
Make MRs also count and display its commits' notes
2012-10-10 01:31:36 +02:00
41e53eb980
Annotated
2012-10-09 11:14:17 +03:00
df7c52489a
simple refactoring
2012-10-09 04:10:04 +04:00
841e4fbd08
cosmetical cleanup of models
2012-09-27 02:05:53 -07:00
2a4359a572
annotate models
2012-09-27 02:05:53 -07:00
afc4a75499
Use Rails.root.join where appropriate
2012-09-26 16:32:26 -04:00
83efcabc82
set activerecord whitelist_attributes to true
2012-09-26 11:18:35 -07:00
40eec08c99
Merge pull request #1409 from riyad/update-votes
...
Update votes for issues and merge requests
2012-09-11 23:08:19 -07:00
a2a0060034
Rename Upvote role to Votes
2012-09-08 16:05:48 +02:00
ad3a88cfd3
Prepared for gitolite v3
2012-08-29 02:03:04 +03:00
9ec4c2d214
Show only the commits that are newer in the merge request.
2012-08-21 23:07:11 +02:00
7754189187
Fully embrace Ruby 1.9 hash syntax
...
Didn't bother with files in db/, config/, or features/
2012-08-10 18:25:15 -04:00
f36f0dac9d
Consolidate functionality shared between Issue and MergeRequest
...
Any associations, validations, delegates, scopes and methods that
were exactly the same in both Issue and MergeRequest models have been
moved to a new IssueCommonality module (role) that gets included by each
class.
There was actually quite a bit of duplication, because MergeRequests are
basically just specialized Issues.
2012-08-08 21:44:33 -04:00
7a4c958882
Add empty IssueCommonality module; include in Issue and MergeRequest
2012-08-08 21:26:56 -04:00
8803350023
CHANGELOG updated. Fixed MR bug. Logger improved
2012-07-17 08:23:16 +03:00
a3bb9ca1fa
Feature: Unassigned Merge Requests
2012-07-17 08:19:16 +03:00
0a6b64e6a9
MR: Handle broken diff ex. in case its too huge
2012-07-05 22:59:37 +03:00
264ee0c5a1
Tabs styled. MR Get Patch
2012-07-05 01:26:23 +03:00
6abc649590
Reannotated
2012-06-26 21:23:09 +03:00
75cf927d3b
Issues & MR legend
2012-06-21 08:29:53 +03:00
0a70aca3b1
Models Refactoring: Move methods to roles
2012-06-07 15:44:57 +03:00
d6ed9920d6
#888 prevent to remove source_branch
2012-06-05 00:11:07 +03:00
3b41b1839b
ability to remove source branch after merge
2012-06-05 00:11:07 +03:00
3272620f72
lib/ refactoring. Module Gitlabhq renamed to Gitlab
2012-05-26 13:37:49 +03:00
8269a3a735
Auto-merge: checking via AJAX
2012-04-16 22:08:03 +03:00
f145450415
fixed mr unmergable method
2012-03-31 13:48:30 +03:00
90748cf724
Merge Button v1 complete
2012-03-30 20:49:34 +03:00
3824f9b372
Unverify MR on every push. Ajax for MR accept. better UI
2012-03-30 08:15:04 +03:00
411d84f385
Better merge handling. show if MR can be accepted or not
2012-03-30 08:05:04 +03:00
cd74f9da91
Link for auto merge, db field for MR
2012-03-30 00:27:42 +03:00
2ec12c9bb8
Impoved merge requests show page. Minor style improvements across project
2012-03-16 01:45:46 +02:00
5d2bd5ec3a
Simple search implementation
2012-03-16 01:14:39 +02:00
7b75f3cfd3
show who merged request
2012-03-15 23:32:00 +02:00
5a3f23f395
Persist Merge Request diff. Auto merge request close on push
2012-03-15 00:57:43 +02:00
2d00f2dfe4
Added 'x notes' and +1 counters to issues and merge requests. Refs #549
2012-03-15 00:51:03 +02:00
3676838dc9
Rspec test repo replaced.\nMerge Requests improved
2012-03-13 23:54:49 +02:00
94befdd502
Events improved. Open/close issue, merge request events displayed
2012-03-07 00:13:43 -08:00
cff9519127
Dashboard perfomance improved. Filter for projects page
2011-12-20 08:24:14 +02:00
54fb0f8589
Merge branch 'notification_refactoring'
2011-12-19 15:17:11 +02:00
a66d9b4c76
annotate model
2011-12-18 16:09:16 +02:00
10df55e11d
Added missing dependent for notes assoc
2011-12-18 12:10:20 +02:00
79b64ef4ac
fixed merge request diff
2011-11-29 20:06:37 +02:00
6d460aa2d6
merge request entity
2011-11-28 09:39:43 +02:00
Dmitriy Zaporozhets
Jeroen van Baarsen
Christian Taedcke
Jacob Vosmaer
Drew Blessing
Daniel Cestari
Drew Blessing
ash wilson
Izaak Alpert
Izaak Alpert
Sebastian Ziebell
Andrew8xx8
Riyad Preukschas
Sergio Visinoni
Valeriy Sizov
Dmitriy Zaporozhets
Andrey Kumanyaev
Nihad Abbasov
Robert Speicher
Sytse Sijbrandij
Ariejan de Vroom