kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity
gitlab-org--gitlab-foss/app/views/shared
History
Dmitriy Zaporozhets 91836272fe Merge branch 'mr-widget-text' into 'master' 
Improve text of MR merge widget and manual merge modal

Modal with manual merge instructions:

![Screen_Shot_2015-08-08_at_21.30.23](https://gitlab.com/gitlab-org/gitlab-ce/uploads/2bffe42e9ad76afd02efbe5816027767/Screen_Shot_2015-08-08_at_21.30.23.png)

Archived:

![archived](https://gitlab.com/gitlab-org/gitlab-ce/uploads/e1efa1d54ce7ead8de6e88ca34095c09/archived.png)

WIP:

![wip](https://gitlab.com/gitlab-org/gitlab-ce/uploads/14a831458d0946722559ec643f91678c/wip.png)

Missing target branch:

![missing_branch](https://gitlab.com/gitlab-org/gitlab-ce/uploads/340083bbacbc234906e58cf76c586a9e/missing_branch.png)

Missing source branch:

![missing_branch_source](https://gitlab.com/gitlab-org/gitlab-ce/uploads/72f80ed58efed88b2bbcf403b55b1a01/missing_branch_source.png)

Nothing to merge:

![nothing](https://gitlab.com/gitlab-org/gitlab-ce/uploads/85b0d9da87acacd53cffd0df58d8eed4/nothing.png)

Checking ability to merge:

![check](https://gitlab.com/gitlab-org/gitlab-ce/uploads/32d75322e622025610c446e8ca7d892d/check.png)

Conflicts when allowed to merge:

![conflicts](https://gitlab.com/gitlab-org/gitlab-ce/uploads/23fdb2c60a27d873b3cc8a008203eb59/conflicts.png)

Conflicts when not allowed to merge:

![conflicts_not_allowed](https://gitlab.com/gitlab-org/gitlab-ce/uploads/113462a80fc65bf48b20dc0efd808363/conflicts_not_allowed.png)

Mergeable when allowed to merge:

![accept](https://gitlab.com/gitlab-org/gitlab-ce/uploads/1b3bb1a71df21728fe9318e7a083bfba/accept.png)

Mergeable when not allowed to merge:

![not_allowed](https://gitlab.com/gitlab-org/gitlab-ce/uploads/d38fa5c96f8f9d7223bb6bc7ad36f29d/not_allowed.png)

Merge in progress:

![locked](https://gitlab.com/gitlab-org/gitlab-ce/uploads/b60dcf5eb70e6032b0e8aac766018df3/locked.png)

Merge failed:

![failed_2](https://gitlab.com/gitlab-org/gitlab-ce/uploads/3713b9a10298183935b028b658271ac9/failed_2.png)

Merged:

![merged](https://gitlab.com/gitlab-org/gitlab-ce/uploads/7f68a48dd197a71351c9a80c59c8ecbe/merged.png)

Closed:

![closed](https://gitlab.com/gitlab-org/gitlab-ce/uploads/d5ce040449b7db943bd2fbfffb607a10/closed.png)

cc @dzaporozhets @rspeicher

See merge request !1120
2015-08-11 19:24:50 +02:00
..
issuable Merge branch 'mr-widget-text' into 'master' 2015-08-11 19:24:50 +02:00
snippets Merge branch 'snippet_optional_filename' into 'master' 2015-06-20 10:47:06 +00:00
_choose_group_avatar_button.html.haml
_clone_panel.html.haml Redesign project home page 2015-07-07 15:22:56 +02:00
_commit_message_container.html.haml
_confirm_modal.html.haml Bootlint: Modals no longer need a '.hide' class 2015-06-16 13:32:33 -04:00
_event_filter.html.haml Move activity feed buttons out of event_filter into actual show views. 2015-04-23 17:11:38 +02:00
_field.html.haml Use password field default password masking. 2015-07-13 13:32:14 +02:00
_file_highlight.html.haml Simplify line numbering 2015-06-19 04:31:24 -04:00
_group_form.html.haml Improve group rename warning 2015-03-18 20:16:36 -07:00
_group_tips.html.haml
_issues.html.haml
_merge_requests.html.haml
_milestones_filter.html.haml
_no_password.html.haml
_no_ssh.html.haml
_outdated_browser.html.haml
_project.html.haml Remove visibility icon from projects list on dashboard and group page 2015-06-12 18:16:19 +02:00
_projects_list.html.haml
_promo.html.haml
_ref_switcher.html.haml
_service_settings.html.haml Move service template and project service settings into a shared view 2015-04-29 07:52:27 -07:00
_show_aside.html.haml Fix wrong placement of show-aside link 2015-04-27 00:43:02 +02:00
_sort_dropdown.html.haml
_visibility_level.html.haml Add new admin settings 2015-04-26 07:48:19 -06:00
_visibility_radios.html.haml Fork visibility level fix 2015-07-06 17:40:33 +03:00