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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
86ce64f0
Commit
86ce64f0
authored
Nov 16, 2015
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq
parents
a43a218c
5be2191b
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
21 additions
and
28 deletions
+21
-28
CHANGELOG
CHANGELOG
+1
-0
app/views/devise/shared/_signin_box.html.haml
app/views/devise/shared/_signin_box.html.haml
+19
-27
lib/gitlab/markdown/relative_link_filter.rb
lib/gitlab/markdown/relative_link_filter.rb
+1
-1
No files found.
CHANGELOG
View file @
86ce64f0
...
@@ -40,6 +40,7 @@ v 8.2.0 (unreleased)
...
@@ -40,6 +40,7 @@ v 8.2.0 (unreleased)
- Make color of "Accept Merge Request" button consistent with current build status
- Make color of "Accept Merge Request" button consistent with current build status
- Add ignore white space option in merge request diff and commit and compare view
- Add ignore white space option in merge request diff and commit and compare view
- Ability to add release notes (markdown text and attachments) to git tags (aka Releases)
- Ability to add release notes (markdown text and attachments) to git tags (aka Releases)
- Relative links from a repositories README.md now link to the default branch
v 8.1.4
v 8.1.4
- Fix bug where manually merged branches in a MR would end up with an empty diff (Stan Hu)
- Fix bug where manually merged branches in a MR would end up with an empty diff (Stan Hu)
...
...
app/views/devise/shared/_signin_box.html.haml
View file @
86ce64f0
...
@@ -7,7 +7,6 @@
...
@@ -7,7 +7,6 @@
%h3
Sign in
%h3
Sign in
.login-body
.login-body
-
if
form_based_providers
.
any?
-
if
form_based_providers
.
any?
-
if
form_based_providers
.
count
>=
2
||
signin_enabled?
%ul
.nav.nav-tabs
%ul
.nav.nav-tabs
-
if
crowd_enabled?
-
if
crowd_enabled?
%li
.active
%li
.active
...
@@ -28,13 +27,6 @@
...
@@ -28,13 +27,6 @@
-
if
signin_enabled?
-
if
signin_enabled?
%div
#tab-signin
.tab-pane
%div
#tab-signin
.tab-pane
=
render
'devise/sessions/new_base'
=
render
'devise/sessions/new_base'
-
else
-
if
crowd_enabled?
=
render
'devise/sessions/new_crowd'
-
elsif
@ldap_servers
.
any?
=
render
'devise/sessions/new_ldap'
,
server:
@ldap_servers
.
first
-
elsif
signin_enabled?
=
render
'devise/sessions/new_base'
-
elsif
signin_enabled?
-
elsif
signin_enabled?
=
render
'devise/sessions/new_base'
=
render
'devise/sessions/new_base'
lib/gitlab/markdown/relative_link_filter.rb
View file @
86ce64f0
...
@@ -51,7 +51,7 @@ module Gitlab
...
@@ -51,7 +51,7 @@ module Gitlab
relative_url_root
,
relative_url_root
,
context
[
:project
].
path_with_namespace
,
context
[
:project
].
path_with_namespace
,
path_type
(
file_path
),
path_type
(
file_path
),
ref
||
'master'
,
# assume that if no ref exists we can point to master
ref
||
context
[
:project
].
default_branch
,
# if no ref exists, point to the default branch
file_path
file_path
].
compact
.
join
(
'/'
).
squeeze
(
'/'
).
chomp
(
'/'
)
].
compact
.
join
(
'/'
).
squeeze
(
'/'
).
chomp
(
'/'
)
...
...
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