01f238893a
Rename MWBS service to Merge When Pipeline Succeeds
2016-11-21 10:22:09 +01:00
317c388347
Ensure labels are loaded on "show" methods of MR
...
Previously, they were only being loaded on the actual `show` action, but
not the actions representing the tabs (commits, builds, etc).
2016-11-11 14:06:43 -04:00
3f02914460
Complete and improve specs
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-11-04 14:58:40 +01:00
1db9f826c1
Add setting to only allow merge requests to be merged when all discussions are resolved
...
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-11-04 14:58:40 +01:00
c1212beaa4
Use deployment IID when saving refs
2016-10-20 14:17:22 +02:00
86dcb79be3
Merge branch 'master' into merge-conflicts-editor-2
2016-10-17 10:56:55 +01:00
cf15af3135
Add test, fix merge error
2016-10-14 12:28:19 +02:00
3764fd4b41
Add blob_ace_mode to conflict content response
2016-10-13 14:16:35 -05:00
54bfe70795
Add more tests to check conflicts resolution
2016-10-13 14:16:35 -05:00
7529bbae94
Add JSON Schema
2016-10-13 14:16:34 -05:00
9727366b5a
Make RuboCop happy
2016-10-13 14:16:34 -05:00
3f71c43e88
Allow setting content for resolutions
...
When reading conflicts:
1. Add a `type` field. `text` works as before, and has `sections`;
`text-editor` is a file with ambiguous conflict markers that can only
be resolved in an editor.
2. Add a `content_path` field pointing to a JSON representation of the
file's content for a single file.
3. Hitting `content_path` returns a similar datastructure to the `file`,
but without the `content_path` and `sections` fields, and with a
`content` field containing the full contents of the file (with
conflict markers).
When writing conflicts:
1. Instead of `sections` being at the top level, they are now in a
`files` array. This matches the read format better.
2. The `files` array contains file hashes, each of which must contain:
a. `new_path`
b. `old_path`
c. EITHER `sections` (which works as before) or `content` (with the
full content of the resolved file).
2016-10-13 14:16:34 -05:00
6606642f8f
fixup! Added link to bulk assign issues to MR author. (Issue #18876 )
2016-10-10 16:19:46 +01:00
8d2de73a83
fixup! Added link to bulk assign issues to MR author. (Issue #18876 )
2016-10-07 17:16:42 +01:00
492b4332a4
Added link to bulk assign issues to MR author. (Issue #18876 )
2016-10-06 13:37:37 +01:00
ddbe676dc3
Add a /wip slash command
...
It toggles the 'WIP' prefix in the MR title.
2016-10-03 09:36:21 +02:00
d86c666662
Refresh todos count cache when an Issue/MR is deleted
2016-09-08 15:50:07 -03:00
6b02c82cfe
Improve grammar
2016-08-30 13:05:40 +02:00
c9c2503c51
User can edit closed MR with deleted fork
...
Add test for closed MR without fork
Add view test visibility of Reopen and Close buttons
Fix controller tests and validation method
Fix missing space
Remove unused variables from test
closed_without_fork? method refactoring
Add information about missing fork
When closed MR without fork can't edit target branch
Tests for closed MR edit view
Fix indentation and rebase, refactoring
2016-08-30 13:05:40 +02:00
ce7eb4e492
Add more tests for conflicts
2016-08-12 23:24:48 +03:00
46f8e6421a
Remove undo endpoint
...
This reverts commit 2536fea8db0967a817615eb3e951eb6ba22f8ede.
2016-08-12 23:24:48 +03:00
3b84cfdc74
Use same resolution format on FE and BE
2016-08-12 23:24:46 +03:00
99e00856eb
REMOVE THIS COMMIT: allow undoing last resolution
2016-08-12 23:24:44 +03:00
f2f844693e
Handle conflict resolution errors in controller
2016-08-12 23:24:44 +03:00
14a4b17d1c
Allow resolving conflicts in MR controller
2016-08-12 23:24:43 +03:00
a1c7961217
Handle multiple merge conflict files in collection
2016-08-12 23:24:43 +03:00
519275c110
fixes part1 of files to start using active tense
2016-08-09 15:06:23 +01:00
8f359ea917
Move to Gitlab::Diff::FileCollection
...
Instead calling diff_collection.count use diff_collection.size which is cache on the diff_collection
2016-08-03 07:00:20 +02:00
cd7c2cb6dd
Cache highlighted diff lines for merge requests
...
Introducing the concept of SafeDiffs which relates
diffs with UI highlighting.
2016-08-03 07:00:19 +02:00
5266ae87c4
Support renames in diff_for_path actions
2016-07-11 09:31:34 +01:00
e462e12278
Tidy up spec action names
2016-07-08 18:11:47 +01:00
b6b26692ea
Collapse large diffs by default
...
When rendering a list of diff files, skip those where the diff is over
10 KB and provide an endpoint to render individually instead.
2016-07-08 10:56:55 +01:00
ddec2ed0df
Add send_git_patch helper
2016-07-06 18:51:01 -04:00
6ce25e7b4c
Rename MergeRequest methods that return commits or shas to be more clear and consistent
2016-07-06 18:50:58 -04:00
9e211091a8
Enable Style/EmptyLines cop, remove redundant ones
2016-07-01 21:56:17 +02:00
5423e6e2d5
Merge branch 'zj-workhorse-format-patch' into 'master'
...
Workhorse to serve email diffs
See merge request !4590
2016-06-29 02:26:38 +00:00
c31f876a27
Workhorse to serve email diffs
...
Depends on the changes in Workhorse (gitlab-org/gitlab-workhorse!48 ).
2016-06-28 14:26:38 +02:00
abca19da8b
Use HTTP matchers if possible
2016-06-27 20:10:42 +02:00
e3d464d82a
Fix a wrong MR status when merge_when_build_succeeds & project.only_allow_merge_if_build_succeeds are true
...
The issue was that `MergeRequest#mergeable?` returns false when the CI
state is not success and project.only_allow_merge_if_build_succeeds is
true. In this case `Projects::MergeRequestsController#merge` would
return the `:failed` status when enabling `merge_when_build_succeeds`,
thus leading to a weird state and the MR never automatically merged.
The fix is to disable the CI state check in the controller safeguard
that early return the `:failed` status.
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-06-24 18:33:02 +02:00
a9857f8c2f
Add send_git_diff helper
2016-06-08 14:30:15 +02:00
afa21054fa
Merge branch 'zj-workhorse-to-serve-diffs' into 'master'
...
Workhorse to serve raw diffs
Fixes (partially) #13999
Dependent on: gitlab-org/gitlab-workhorse!45
See merge request !4130
2016-06-07 12:50:29 +00:00
01e1139f68
Workhorse to serve raw diffs
2016-06-03 18:43:22 +02:00
20c7144ed2
Rename all `[ci_]commit` to `[ci_]pipeline` in specs and features
2016-06-03 16:22:26 +02:00
f680eca912
Don't allow merges with new commits
...
Set a `sha` parameter on the MR form. If this doesn't match the HEAD of
the source branch when the form is submitted, show a warning (like with
a merge conflict) and don't merge the branch.
2016-06-01 20:34:41 +01:00
c370dce01c
Enable Style/RedundantParentheses rubocop cop
...
See #17478
2016-05-30 15:07:18 +02:00
8530ce4c6f
Clarify that the diff view setting always comes from the cookie
...
This invalidates one test, which we've removed.
2016-04-19 17:47:58 -04:00
a64f1c7636
Add changelog entry, improve specs and model code
2016-04-12 15:52:03 -03:00
476cf23fc3
Allow to close invalid merge request
2016-04-11 19:00:59 -03:00
808bcf5bc6
Fixed MergeRequestController spec
2016-03-30 00:02:32 -03:00
3b088fc5b5
Minor improvements on IssuableActions
2016-03-21 16:59:35 +01:00
1d77822816
minor improvements and fixed specs
2016-03-19 21:24:05 +01:00
7342a4566c
Dry destroy action on issuables
2016-03-19 21:24:05 +01:00
212e83bab3
Soft delete issuables
2016-03-19 21:23:03 +01:00
2770de9617
Reopened MRs should also be considered as open.
2016-02-17 21:15:13 -05:00
551ce0f245
Add spec for assigning view param from cookie
2016-02-05 16:03:20 -05:00
f6d816f9fe
Add a controller test for the new 'diff_view' cookie
2016-02-05 15:40:44 +01:00
12fdc13ad3
Fix 500 error when creating a merge request that removes a submodule
2015-12-04 17:35:14 -02:00
3d0efa8e0a
Add ignore white space option in merge request diff
...
fix this issue(https://gitlab.com/gitlab-org/gitlab-ce/issues/1393 ).
Add ignore whitespace optoin to Commits Compare view
2015-11-13 16:53:53 +09:00
f40b99d02e
Merge branch 'master' into rubocop-for-tests
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Conflicts:
spec/features/issues_spec.rb
spec/models/forked_project_link_spec.rb
spec/models/hooks/service_hook_spec.rb
spec/models/hooks/web_hook_spec.rb
spec/models/project_services/hipchat_service_spec.rb
spec/requests/api/project_members_spec.rb
spec/requests/api/projects_spec.rb
spec/requests/api/system_hooks_spec.rb
spec/services/archive_repository_service_spec.rb
spec/support/matchers.rb
spec/tasks/gitlab/backup_rake_spec.rb
2015-06-23 10:44:03 +02:00
359ed48638
Fix Style/AlignHash cop violations
2015-06-22 22:24:39 -07:00
bf71d53f63
Change `to_not` calls to `not_to`
...
Both work, but now we're consistent across the entire app.
2015-06-22 12:13:49 +02:00
bc027c5183
Load the Merge Request > Commits tab lazily
2015-06-17 16:59:51 -04:00
5c78d7fce8
Move Projects::MergeRequestsController spec to its correct location
2015-06-17 16:37:11 -04:00
Grzegorz Bizon
Alex Sanford
Rémy Coutable
Rodolfo Santos
Z.J. van de Weg
Sean McGivern
Alfredo Sumaran
James Edwards-Jones
James
Thomas Balthazar
Douglas Barbosa Alexandre
Katarzyna Kobierska
tiagonbotelho
Paco Guzman
Douwe Maan
Robert Speicher
Jacob Vosmaer (GitLab)
Kamil Trzcinski
Robert Speicher
Felipe Artur
Gabriel Mazetto
Rubén Dávila
Minsik Yoon
Dmitriy Zaporozhets
Stan Hu