7ae536002a
Merge branch 'master' into awardables
2016-05-25 14:41:25 +02:00
1e45fb2f2d
Fixed issue with button color when no CI enabled
...
Closes #17844
2016-05-25 11:08:00 +01:00
7880a300dc
Allows MR authors to have the source branch removed when merging the MR
2016-05-20 11:30:03 +02:00
4d6c51e228
Fix backend merge mistakes
...
[ci skip]
2016-05-19 15:00:50 -05:00
bb883387f9
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into awardables
...
# Conflicts:
# app/controllers/projects/merge_requests_controller.rb
# app/models/note.rb
# db/schema.rb
# spec/models/note_spec.rb
2016-05-18 13:05:53 -05:00
9a3ed265e9
Use `@diff_notes_disabled` instead of `@comments_allowed`
2016-05-13 17:31:58 -05:00
99d3e21f19
Extract LegacyDiffNote out of Note
2016-05-13 17:31:43 -05:00
7e6dcf9cd0
Merge branch 'master' into awardables
2016-05-11 08:47:04 +02:00
3bdc57f0a7
Create table for award emoji
2016-05-06 10:47:11 +02:00
32be8bd2b1
Fixed issue with assignee object not being returned
...
Closes #15515
2016-04-22 13:30:58 +01:00
aea9799197
Merge branch 'label-text-color-sidebar' into 'master'
...
Fixes text color on labels in sidebar
Previously the labels in the sidebar would just have `#FFF` text color which could cause problems with a light background color.
With this, the text color comes from the JSON.
See merge request !3846
2016-04-21 23:13:38 +00:00
d35dde0129
Merge branch 'remove-update-files' into 'master'
...
Removed JS update templates
See merge request !3814
2016-04-21 22:23:41 +00:00
d240666800
Merge branch 'ci-commit-as-pipeline' into 'master'
...
Ci::Commit becomes a Pipeline object
1. Ci::Commit receives context: ref, :tag.
1. One Ci::Commit describes a one Pipeline
1. Pipeline is created from `.gitlab-ci.yml`
1. Pipeline is a ordered group of builds
1. We test MR against Pipeline
1. Pipelines have a separate view (https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3703 )
1. Pipeline can be triggered from UI (https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3703 )
1. Later we change `Trigger -> TriggerRequest -> Build` to `Trigger -> Pipeline` (future)
1. We add a Pipeline Hook that will be triggered on Pipeline status change (future)
1. We extend notifications to use `Pipeline Hook` to send summary on pipeline changes (future)
After merging that I'll prepare a separate MR that will unify naming, database columns, table names:
```
Ci::Commit -> Pipeline
Ci::Build -> Build
CommitStatus -> Job
GenericCommitStatus -> ExternalJob
ci_commits -> pipelines
ci_builds -> jobs
```
This MR implements first 5 points.
This is made to solve this issue https://gitlab.com/gitlab-org/gitlab-ce/issues/14149 .
See merge request !3653
2016-04-21 08:10:37 +00:00
7f23e0b8c0
Fixes text color on labels in sidebar
2016-04-21 08:50:15 +01:00
75626d5f01
Label text color comes from JSON
...
Created issuable singleton to house the filtering
2016-04-20 17:00:12 +01:00
a845252983
get the multi filter labels feature to work on merge request, also escape characters in the templates to prevent xss attack
2016-04-20 13:55:19 +01:00
136887da4b
Removed JS update templates
2016-04-19 10:54:27 +01:00
9e68109f2d
Optimise Merge Request builds rendering
2016-04-13 16:32:42 +02:00
4af0968c43
Merge remote-tracking branch 'origin/master' into ci-commit-as-pipeline
2016-04-13 15:47:18 +02:00
52be9e20f9
Merge remote-tracking branch 'origin/master' into ci-commit-as-pipeline
...
# Conflicts:
# app/views/projects/commits/_commit.html.haml
2016-04-11 23:33:50 +02:00
5d69f5b46d
Use Ci::Commit as Pipeline
2016-04-11 23:32:54 +02:00
ce0678faa5
Rubocop fix
2016-04-11 17:20:47 +01:00
b87cc5f224
Preparing build status
2016-04-11 17:20:47 +01:00
1af1b6c8d3
Fixed target project update
2016-04-06 11:08:40 +01:00
c5c05f6a04
Updated UI for new merge request
...
Closes #2540
2016-04-06 11:08:40 +01:00
fee7ad8627
Merge branch 'build-updates' into 'master'
...
Build updates
Fixes #10851
See merge request !2604
2016-04-03 13:22:27 +00:00
3d4848615c
Merge branch 'patch/fix-mergerequest-diff' into 'master'
...
Fix Raw / Rendered diff producing different results on merge requests
The raw diff endpoint (`merge_requests/####.diff`) produces a diff based on `target_branch` instead of the original branching point. Same is valid for `merge_requests/####.patch`.
Fixes #14680 , #3017
See merge request !3450
2016-03-30 16:02:19 +00:00
750cd5c0e0
Add json response for user avatar in merge request
2016-03-30 07:26:09 -04:00
a9b2a2744c
Use `diff_base_commit` instead of `target_branch` to generate diffs
2016-03-29 23:59:51 -03:00
22aef62808
New dropdowns work on merge requests too!
2016-03-25 08:07:57 -04:00
6e5461c6ee
Merge branch 'master' into 2489-soft-delete-issues
2016-03-21 19:32:37 +01:00
3b088fc5b5
Minor improvements on IssuableActions
2016-03-21 16:59:35 +01:00
085538c2bd
Use the configured Kaminari "per page" default
2016-03-19 17:37:54 -04:00
98fd60f50b
Satisfy rubocop
2016-03-19 22:05:45 +01:00
7342a4566c
Dry destroy action on issuables
2016-03-19 21:24:05 +01:00
cafa408b25
Merge remote-tracking branch 'origin/master' into remove-wip
2016-03-18 23:29:18 +01:00
33aeaf6a9c
Merge request title is in the notification
...
Short commit instead of long commit sha
2016-03-18 10:26:48 +00:00
fcba255153
Commit SHA comes from JSON
...
Removed page refresh - instead clicking takes to the builds tab
2016-03-18 10:26:48 +00:00
b0e2e2e06e
Fix code style issues.
2016-03-18 10:26:48 +00:00
1a482bfbc2
Removes name from file
...
Changes `:not_found` to `nil`
2016-03-18 10:26:48 +00:00
f7e2109905
Adds notifications API to MR page.
...
When a build status changes a notification will popup.
Fixes #10851
2016-03-18 10:26:48 +00:00
51ceb3802f
Adds JSON callback, which is currently not working.
2016-03-18 10:26:48 +00:00
91880e13df
initial ajax build
2016-03-18 10:26:48 +00:00
c98089b2b2
Move the #toggle_subscription controller method to a concern
2016-03-15 18:22:03 +01:00
54ec7e9599
Improving the original label-subscribing implementation
...
1. Make the "subscribed" text in Issuable sidebar reflect the labels
subscription status
2. Current user mut be logged-in to toggle issue/MR/label subscription
2016-03-15 18:22:02 +01:00
1764e1b7cb
Use Gitlab::Git::DiffCollections
2016-03-03 18:38:44 +01:00
09ff9bc722
Easily (un)mark merge request as WIP using link
...
Fixes #3768
2016-02-26 19:36:38 -08:00
3d52e139b1
Rename Tasks to Todos
2016-02-20 12:39:27 -02:00
ce78813c2a
Create or mark task pending as soon the action happens
2016-02-20 12:12:05 -02:00
2e81b1558b
Label description and Label row
...
- Add label description
- Show label row when filtering issues or merge requests by label
2016-02-17 21:52:12 +08:00
cf1349adb7
Remember user's inline/tabular diff view preference in a cookie
2016-02-05 15:40:44 +01:00
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
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
d79c0ea271
Allow set labels from Issue/MR forms
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-07-29 21:23:54 +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
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
7435b879a6
Error message needs to be correct.
2014-07-14 12:11:01 +02:00
207bc8a0e7
Branches without parent commit cannot be merged.
2014-07-14 11:06:14 +02:00
f86afb732b
Fix dev env. Fix MR creation
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-06-26 18:40:13 +03: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
094e5efb4c
Merge pull request #6992 from skv-headless/project_commits_sql_optimization
...
notes count in 1 query for mr and commits
2014-06-24 10:38:50 +03:00
054d68a3e9
Improve MR message for huge diffs
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-06-14 12:58:08 +03:00
59e1819561
Apply soft diff limits to MergeRequest#new page
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-06-13 15:00:35 +03:00
98416ec9ab
Show proper message for new MR when satellite fails
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-06-12 21:49:45 +03:00
20b2102771
notes count in 1 query for mr and commits
2014-06-10 16:10:53 +04:00
a18ae13e98
Backport CI service refactoring from EE
...
It allows easier contribution of different CI services
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-05-28 11:35:43 +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
8eae01ea58
Compare branches in MergeRequestsController#new action
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-05-08 15:38:52 +03:00
aa6426f46d
Satellite will exist when doing automerge_check.
2014-04-11 10:22:32 +02: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
1a17289bd3
Merge branch 'remove_source_branch_button' of https://github.com/jacob-carlborg/gitlabhq into jacob-carlborg-remove_source_branch_button
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Conflicts:
app/assets/javascripts/merge_requests.js.coffee
app/assets/stylesheets/sections/merge_requests.scss
app/controllers/projects/merge_requests_controller.rb
2014-04-06 13:54:54 +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
36b065e634
Feature: reopen closed merge request
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-28 22:43:16 +02:00
5d6e4bd2d8
Fix gitlab ci widget for forks
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-26 13:18:27 +02:00
1ff1b6d816
Merge pull request #5719 from jacob-carlborg/mr_target
...
By default, target original repository if it's a fork when creating new MR.
2014-02-26 12:33:48 +02:00
645e8d4705
Move services for collecting items to Finders
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-25 19:15:08 +02:00
9439cb5526
By default, target original repository if fork when creating new MR.
2014-02-24 22:06:25 +01:00
1c61ac1c64
Refactor MR code reload
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-18 20:17:26 +02:00
702128892b
Allow change assignee/milestone from MergeRequest show page
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-18 16:24:27 +02:00
abb3121308
Show only people who have assigned merge requests in assignee dropdown
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-02-13 13:59:07 +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
28e13634dc
Merge branch 'improve/mr_diff'
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Conflicts:
features/steps/project/project_fork.rb
features/steps/project/project_forked_merge_requests.rb
features/steps/project/project_issue_tracker.rb
features/steps/project/project_markdown_render.rb
features/steps/shared/project.rb
2014-01-23 14:38:23 +02:00
ccae561f9b
Fix selectbox when submit MR from fork to origin
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-23 10:08:26 +02:00
4d56c359d3
Merge pull request #6075 from skv-headless/remove_deprecated_finders
...
Remove deprecated finders
2014-01-22 11:04:56 -08: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
193a5ed3c3
Render MR diff correctly
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-22 15:20:40 +02:00
e583df5443
Dont override project_id params when use issues/mr filtering
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-20 14:16:12 +02:00
a3f645ef51
Remove deprecated finders
2014-01-19 23:39:56 +04:00
234b86c97f
Use FilteringService for project issuus, mrs
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-15 16:32:44 +02:00
38d8d749d7
Merge branch 'feature/merge_commit_message' of /home/git/repositories/gitlab/gitlabhq
2014-01-15 10:36:12 +00:00
2940785c17
Add sort dropdown to merge requests list
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-14 20:55:59 +02:00
8781459124
Use params[:merge_commit_message] in MergeRequestController for automerge
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-13 17:21:59 +02:00
f554aa38d5
Update commentable controllers with new note vars
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-25 22:32:48 +02:00
f7e7dc7ebb
Make note anchors actually work
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-25 13:32:43 +02:00
1231a3678a
Dont allow change of MR target or source projects after it was created
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-20 09:48:43 +02:00
f811495429
Add button for removing source branch for merged MR's.
2013-12-19 14:02:54 +01: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
e3464a54d8
Remove .js format for MergeRequest controller
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2013-12-02 14:27:36 +02:00
052a7cc9cd
Merge branch 'patch-2' of https://github.com/zzet/gitlabhq into zzet-patch-2
...
Conflicts:
app/controllers/projects/merge_requests_controller.rb
2013-09-26 22:19:01 +03:00
01ff084a4d
Improved large commit handling.
...
Previously, only number of changed files mattered. Now, number of lines to render in the diff are also taken into account.
A hard limit is set, above which diffs are not rendered and users are not allowed to override that. This prevents high server
resource usage with huge commits.
Related to #1745 , #2259
In addition, handle large commits for MergeRequests and Compare controllers.
Also fixes a bug where diffs are loaded twice, if user goes directly to merge_requests/:id/diffs URL.
2013-09-07 14:44:03 +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
c1583c6d74
Find issues and Mr by iid in controller
2013-08-19 22:12:04 +03:00
3281021e8b
Rewrite issues/mr filtering logic
2013-08-10 20:25:53 +03:00
ca52f84841
Update chosen, improve ui, fix MR fork tests
2013-08-08 15:14:59 +03:00
fb8a3e319a
Update logic for validates_merge_request for tree of MR
...
For case:
Merge request №1: branch "feature" to "release" and remove "feature" branch
Merge request №2: branch "release" to "master" and remove "release" branch
Merge request №1 - broken :(
2013-07-31 20:31:34 +04:00
0a013adc4d
Fix an issue with edits sending user back to @source_project
...
-Form was for @source_project rather then @project.
-add spinach test for edit submission on forked project
Change-Id: I807a5077608b7e910f4bc83c5d3e82c378f70a9e
2013-07-17 22:48:03 -04:00
0e82c98174
Fix merge_requests_controller
...
-update new to be simplified (set values from parms via rails) instead of doing it by hand
-change def merge_request to look up the merge request against the current @project
Change-Id: I778c91b87c6da84b73f8f59013c27b74d290d8b1
2013-07-17 22:48:03 -04: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
bbef8bb589
MR on fork validation error
...
Wasn't setting fields so validations would fail
Change-Id: I0363c57bf6c8b9937cc1b4140d09071d7c5168c2
2013-07-17 22:45:03 -04:00
489fa5d726
MR on Fork multiple fixes
...
-Disable observers post test run
-Allow db:seed_fu RAILS_ENV=test to be run more than once without error
-fix diffs_in_between, was passing in the default_options for grit, but grit in this case doesn't take options, fixed the test to actually fail if the incorrect diffs are returned
-make notes/commits render against proper project
-MR discussion file links should reference note's project
-Added tests for commit links on edit merge request
-fixes edit issues (canceling an edited mr, updating an edited mr)
-updates tests with checks for source code updates
-still forked_merge_requests.feature (project_forked_merge_requests) test not passing (commented out -- "stable" not being set)
MR API: error on bad target_project
-If the target project id is specified and it is not the same as the project the request is being made on (the source), and the it isn't a fork of that project, error out, otherwise use it as the target
-Fixes some busted (but hidden) test cases
Conflicts:
app/views/merge_requests/show/_diffs.html.haml
spec/features/notes_on_merge_requests_spec.rb
Change-Id: I20e595c156d0e8a63048baaead7be6330c738a05
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
2ed7cbfba4
Move projects controllers/views in Projects module
2013-06-23 19:47:22 +03:00
ZJ van de Weg
Phil Hughes
Jeroen Jacobs
Fatih Acet
Douwe Maan
Robert Speicher
Yorick Peterse
Kamil Trzciński
Arinde Eniola
Douwe Maan
Jacob Schatz
Gabriel Mazetto
Jacob Schatz
Robert Speicher
Rémy Coutable
Jacob Vosmaer
Douglas Barbosa Alexandre
Tap
kkm
Zeger-Jan van de Weg
Dmitriy Zaporozhets
Jose Corcuera
Valery Sizov
Valery Sizov
Drew Blessing
Anton Baklanov
Nikita Verkhovin
Jeroen van Baarsen
Vinnie Okada
Ciro Santilli
Marin Jankovski
skv
Jacob Carlborg
Drew Blessing
Boyan Tabakov
ash wilson
Andrew Kumanyaev
Izaak Alpert
Izaak Alpert