Sean McGivern
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
Grzegorz Bizon
c370dce01c
Enable Style/RedundantParentheses rubocop cop
...
See #17478
2016-05-30 15:07:18 +02:00
Robert Speicher
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
Felipe Artur
a64f1c7636
Add changelog entry, improve specs and model code
2016-04-12 15:52:03 -03:00
Felipe Artur
476cf23fc3
Allow to close invalid merge request
2016-04-11 19:00:59 -03:00
Gabriel Mazetto
808bcf5bc6
Fixed MergeRequestController spec
2016-03-30 00:02:32 -03:00
Zeger-Jan van de Weg
3b088fc5b5
Minor improvements on IssuableActions
2016-03-21 16:59:35 +01:00
Zeger-Jan van de Weg
1d77822816
minor improvements and fixed specs
2016-03-19 21:24:05 +01:00
Zeger-Jan van de Weg
7342a4566c
Dry destroy action on issuables
2016-03-19 21:24:05 +01:00
Zeger-Jan van de Weg
212e83bab3
Soft delete issuables
2016-03-19 21:23:03 +01:00
Rubén Dávila
2770de9617
Reopened MRs should also be considered as open.
2016-02-17 21:15:13 -05:00
Robert Speicher
551ce0f245
Add spec for assigning view param from cookie
2016-02-05 16:03:20 -05:00
Rémy Coutable
f6d816f9fe
Add a controller test for the new 'diff_view' cookie
2016-02-05 15:40:44 +01:00
Douglas Barbosa Alexandre
12fdc13ad3
Fix 500 error when creating a merge request that removes a submodule
2015-12-04 17:35:14 -02:00
Minsik Yoon
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
Dmitriy Zaporozhets
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
Stan Hu
359ed48638
Fix Style/AlignHash cop violations
2015-06-22 22:24:39 -07:00
Robert Speicher
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
Robert Speicher
bc027c5183
Load the Merge Request > Commits tab lazily
2015-06-17 16:59:51 -04:00
Robert Speicher
5c78d7fce8
Move Projects::MergeRequestsController spec to its correct location
2015-06-17 16:37:11 -04:00
