8710739e4e
Correctly find last known blob for file deleted in MR.
2015-10-20 14:24:02 +02:00
9f9f0c35ec
Show merge requests which close current issue
2015-10-16 09:46:59 +02:00
b0164771ec
Simplify code around (cross)-references
2015-10-12 11:54:46 +02:00
05fdd12fd9
Improve error message when merging fails
2015-10-01 09:45:47 +03:00
d80750b50f
Fix error when MR source branch no longer exists.
2015-09-22 17:49:45 +02:00
3a001a9290
Fetch merge request ref if it is missing when visit MR page
...
This will fix merge problem for merge requests between forks created
before 8.0
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-21 16:25:59 +02:00
3e259ea8bc
Revert "Merge branch 'revert-satellites' into 'master'
"
...
This reverts commit 5daf44b7c82f706fbd23
2015-08-11 14:33:31 +02:00
9f10943c1a
Revert "Merge branch 'drop-satellites'"
...
This reverts commit 957e849f416b9dbe9f5a
2015-08-11 10:28:42 +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
d63371ad78
Update controller filters
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-26 16:44:21 +02:00
342d553709
Rename abilities to correspond contoller/model action names
...
write_ was renamed to create_
modify_ was renamed to update_
So now in update action we have next code
def create
can?(current_user, :create_issue, @issue)
end
def update
can?(current_user, :update_issue, @issue)
end
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-26 15:55:56 +02:00
a3f64b195e
Improve performance for merge_request#show page
...
* store @participants in variable
* store result of subscribed? call into variable
In total it reduce amount of SQL queries for merge_request with 10
comments/participants twice.
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-24 12:56:10 +02:00
bc027c5183
Load the Merge Request > Commits tab lazily
2015-06-17 16:59:51 -04:00
946b4ceda3
Improve variables in mr widget
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-11 18:45:12 +02:00
8893ac4ba4
Fix rubocop
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-11 18:35:43 +02:00
00600a592b
Extract merge request widget JS to separate class
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-11 18:27:03 +02:00
d2d8037b1a
Refactor merge request widget step 2
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-11 15:14:50 +02:00
f46b367068
Add MergeRequests#commits action and route
...
/:namespace_id/:project_id/merge_requests/:id/commits(.:format)
2015-05-29 00:09:28 -04:00
241f5971ba
Add search issues/MR by number
2015-05-18 13:09:13 +06: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
8ed7ac9d44
Use project.commit convenience method.
2015-04-24 12:29:36 +02:00
5a4ebfb47a
Fixed the Rails/ActionFilter cop
...
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
2015-04-20 15:39:37 +02:00
4830b2be5e
Refactor GitAccess to use instance variables.
2015-03-24 14:11:48 +01:00
e5fe14b2fb
Link to CI with ref
2015-03-20 19:19:29 +02:00
1b437ec349
tests
2015-03-16 21:38:41 +02:00
410d25c8ca
rename table subscribe; make it polymorfic
2015-03-16 15:22:50 +02:00
9698b36c1c
Subscription
2015-03-15 19:44:59 +02:00
ec02cdf205
Merge branch 'master' into mr-filter-by-title
...
Conflicts:
app/controllers/projects/merge_requests_controller.rb
2015-03-12 16:29:03 -07:00
80b2f3fb86
Implement merge requests search
...
It is same search like we have at issues page. It allows to quickly
filter merge requests based on title or desription. I copy-pasted some
js code from Issues.js. In future search (filtering) logic should be
refactoed into one class for merge requests and issues
2015-03-12 16:20:58 -07:00
f0cbbd70bb
Use same constant for amount of items per page
2015-03-12 15:37:00 -07:00
5f40253f76
Remove annoying notice messages when create/update merge request
2015-03-11 16:07:33 -07:00
be94e13552
Add assignee icon to milestone merge requests.
2015-03-06 14:08:40 +01:00
6ac0a0217c
Fix syntax issue
2015-02-26 16:44:52 -08:00
128012dba8
More use of shortcut routes
2015-02-25 19:50:01 -08:00
76aad9b76e
Upgrade to Rails 4.1.9
...
Make the following changes to deal with new behavior in Rails 4.1.2:
* Use nested resources to avoid slashes in arguments to path helpers.
2015-02-14 11:09:23 -07:00
8952fc015f
Apply default scope to labels and remove one for notes
2015-02-05 20:29:41 -08:00
ab7a79bf3b
developer can push to protected branches
2015-01-20 17:34:23 -08:00
9c03c1c545
Make automerge via satellite
2015-01-09 19:10:01 -08:00
016981c009
Refactor issuable list pages
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-12-24 11:04:33 +02:00
47634e392f
Refactor issues and merge requests lists
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-12-23 18:49:39 +02:00
e0f30c605b
Add author filter for issues & merge requests pages
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-12-05 17:13:07 +02: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
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
4ebe718d69
Merge branch 'factor-commit-msg-textarea' of https://github.com/cirosantilli/gitlabhq into cirosantilli-factor-commit-msg-textarea
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Conflicts:
app/views/projects/blob/_remove.html.haml
2014-10-03 13:34:25 +03:00
8e33f9460c
Show test coverage results in MR if available
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-10-02 18:17:47 +03:00
3098e7a453
Factor commit message textareas.
2014-10-02 12:03:30 +02:00
0f12e051c0
Remove statement without effect.
2014-09-30 17:53:54 +02:00
Douwe Maan
Zeger-Jan van de Weg
Valery Sizov
Dmitriy Zaporozhets
Robert Speicher
Nikita Verkhovin
Jeroen van Baarsen
Vinnie Okada
Valery Sizov
Ciro Santilli