Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
gitlab-ce
Commits
326b827c
Commit
326b827c
authored
Aug 04, 2015
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
parents
e9ba1185
58c76605
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
2 deletions
+5
-2
app/views/projects/merge_requests/widget/open/_missing_branch.html.haml
...ects/merge_requests/widget/open/_missing_branch.html.haml
+4
-2
doc/raketasks/README.md
doc/raketasks/README.md
+1
-0
No files found.
app/views/projects/merge_requests/widget/open/_missing_branch.html.haml
View file @
326b827c
...
...
@@ -6,9 +6,11 @@
%span
.label.label-inverse
=
@merge_request
.
source_branch
does not exist in
%span
.label.label-info
=
@merge_request
.
source_project_path
%br
%strong
Please close this merge request and open a new merge request to change source branches.
-
else
%span
.label.label-inverse
=
@merge_request
.
target_branch
does not exist in
%span
.label.label-info
=
@merge_request
.
target_project_path
%br
%strong
Please close this merge request or change branches with existing one
%strong
Please close this merge request or change to another target branch.
doc/raketasks/README.md
View file @
326b827c
...
...
@@ -7,3 +7,4 @@
-
[
User management
](
user_management.md
)
-
[
Web hooks
](
web_hooks.md
)
-
[
Import
](
import.md
)
of git repositories in bulk
-
[
Rebuild authorized_keys file
](
http://doc.gitlab.com/ce/raketasks/maintenance.html#rebuild-authorized_keys-file
)
task for administrators
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment