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
Dmitriy Zaporozhets
Sebastian Ziebell
Andrew8xx8
Riyad Preukschas
Sergio Visinoni
Valeriy Sizov
Dmitriy Zaporozhets
Andrey Kumanyaev
Nihad Abbasov
Robert Speicher
Sytse Sijbrandij