577f2fb47a
Save and use actual diff base commit for MR diff highlighting
2016-01-20 18:44:27 +01:00
f7240e03a6
Fix autocomplete for new issues/MRs/snippets
2016-01-15 11:29:53 +01:00
097faeb481
Get "Merge when build succeeds" to work when commits were pushed to MR target branch while builds were running
2016-01-05 16:30:03 +01:00
b5230bbe7c
Merge branch 'fix-merge-immediately' into 'master'
...
Fix 'Merge Immediately' button
Fixes #4125
See merge request !2117
2015-12-16 17:51:25 +00:00
9908da17c1
Merge branch 'fix-endpoint-not-setting-var' into 'master'
...
Fix endpoint not setting needed @ci_commit
/cc @DouweM
See merge request !2112
2015-12-16 16:39:35 +00:00
5843d09f07
Fix 'Merge Immediately' button
2015-12-16 17:38:58 +01:00
95c03f245f
Fix endpoint not setting needed @ci_commit
2015-12-16 15:20:53 +01:00
c810234357
Merge branch 'ci-project-migrate' into 'master'
...
Ci Project migrate
- This doesn't migrate: allow_git_fetch, coverage_regex, timeout. Since this are project configuration settings I would propose to migrate them to `.gitlab-ci.yml`.
- This requires offline migrations.
- It simplifies database models making all CI objects to be attached to: Project.
- It removes Ci::Project, but makes /ci/projects working by adding method: Project.find_by_ci_id for backward compatibility (badges, triggers).
- We should add default `timeout` to Application Settings.
- It misses specs.
- It is based on ci-services-migrate for now.
- It removes CI events.
- It removes administrator CI projects overview.
- It removes CI application settings.
In 8.4 or 8.5 we can remove redundant tables and columns.
See merge request !1987
2015-12-14 10:35:40 +00:00
c6c244315a
Implement new sidebar for merge request page
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-12-11 20:11:23 +01:00
73b04bebad
Fix errors
2015-12-11 18:02:09 +01:00
28351806aa
Give merge request widget the vars it desires
2015-12-09 09:59:30 +01:00
eab086bde1
Merge branch 'master' into merge-if-green
...
# Conflicts:
# app/controllers/projects/merge_requests_controller.rb
# config/routes.rb
2015-12-09 09:00:25 +01:00
8fb49a4b70
Merge branch 'master' into merge-if-green
...
# Conflicts:
# app/views/projects/merge_requests/widget/_heading.html.haml
# app/views/projects/merge_requests/widget/open/_accept.html.haml
2015-12-08 22:34:03 +01:00
1567572e79
Add Builds tab to MR detail page
2015-12-08 13:11:41 +01:00
9907a7e6ed
Get ci_commit in MR controller
2015-12-08 13:06:55 +01:00
0e96d6eb10
Merge branch 'master' into merge-if-green
2015-12-07 10:06:07 +01:00
b9df1a6355
Strip attributes for Milestone and Issuable. #3428
2015-11-26 10:16:50 -05:00
8608c6325e
Refactor MergeWhenBuildSucceedsService and incorporate feedback
2015-11-23 10:11:54 +01:00
2f6f99d300
award for merge requests[ci skip]
2015-11-19 01:25:59 +02:00
fd2c0fe446
award emoji
2015-11-19 01:25:27 +02:00
53b285c9a8
Merge branch 'master' into merge-if-green
2015-11-18 11:58:01 +01:00
2f048df4a4
API support, incorporated feedback
2015-11-18 11:17:41 +01:00
752d528019
Fix trailing space issue with merge requests and issues. Fixes #2514
2015-11-10 15:41:49 -06:00
746e49fee9
Display target branch on MR list when it is different from project's default
2015-11-10 09:31:14 +02:00
63b234706d
MRs author can cancel automatic merge
2015-11-02 20:15:40 +01:00
77f8a1e392
Merge when build succeeds
2015-11-02 17:27:38 +01:00
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
Douwe Maan
Yorick Peterse
Douwe Maan
Robert Speicher
Zeger-Jan van de Weg
Kamil Trzciński
Dmitriy Zaporozhets
Jose Corcuera
Valery Sizov
Valery Sizov
Drew Blessing
Anton Baklanov
Robert Speicher
Nikita Verkhovin