Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Sharkey
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Essem
Sharkey
Commits
9bc17974
Commit
9bc17974
authored
6 years ago
by
MeiMei
Committed by
syuilo
6 years ago
Browse files
Options
Downloads
Patches
Plain Diff
未利用時はTwitterでログインを表示しない (#2156)
parent
a8f14209
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/client/app/common/views/components/signin.vue
+4
-3
4 additions, 3 deletions
src/client/app/common/views/components/signin.vue
src/client/app/config.ts
+2
-0
2 additions, 0 deletions
src/client/app/config.ts
webpack.config.ts
+2
-1
2 additions, 1 deletion
webpack.config.ts
with
8 additions
and
4 deletions
src/client/app/common/views/components/signin.vue
+
4
−
3
View file @
9bc17974
...
...
@@ -12,13 +12,13 @@
</ui-input>
<ui-input
v-if=
"user && user.twoFactorEnabled"
v-model=
"token"
type=
"number"
required
/>
<ui-button
type=
"submit"
:disabled=
"signing"
>
{{
signing
?
'
%i18n:@signing-in%
'
:
'
%i18n:@signin%
'
}}
</ui-button>
<p
style=
"margin: 8px 0;"
>
%i18n:@or%
<a
:href=
"`$
{apiUrl}/signin/twitter`">%i18n:@signin-with-twitter%
</a></p>
<p
style=
"margin: 8px 0;"
v-if=
"twitterIntegration"
>
%i18n:@or%
<a
:href=
"`$
{apiUrl}/signin/twitter`">%i18n:@signin-with-twitter%
</a></p>
</form>
</
template
>
<
script
lang=
"ts"
>
import
Vue
from
'
vue
'
;
import
{
apiUrl
,
host
}
from
'
../../../config
'
;
import
{
apiUrl
,
host
,
twitterIntegration
}
from
'
../../../config
'
;
export
default
Vue
.
extend
({
props
:
{
...
...
@@ -36,7 +36,8 @@ export default Vue.extend({
password
:
''
,
token
:
''
,
apiUrl
,
host
host
,
twitterIntegration
};
},
methods
:
{
...
...
This diff is collapsed.
Click to expand it.
src/client/app/config.ts
+
2
−
0
View file @
9bc17974
...
...
@@ -22,6 +22,7 @@ declare const _CODENAME_: string;
declare
const
_LICENSE_
:
string
;
declare
const
_GOOGLE_MAPS_API_KEY_
:
string
;
declare
const
_WELCOME_BG_URL_
:
string
;
declare
const
_TWITTER_INTEGRATION_
:
boolean
;
export
const
host
=
_HOST_
;
export
const
hostname
=
_HOSTNAME_
;
...
...
@@ -47,3 +48,4 @@ export const codename = _CODENAME_;
export
const
license
=
_LICENSE_
;
export
const
googleMapsApiKey
=
_GOOGLE_MAPS_API_KEY_
;
export
const
welcomeBgUrl
=
_WELCOME_BG_URL_
;
export
const
twitterIntegration
=
_TWITTER_INTEGRATION_
;
This diff is collapsed.
Click to expand it.
webpack.config.ts
+
2
−
1
View file @
9bc17974
...
...
@@ -95,7 +95,8 @@ const consts = {
_URL_
:
config
.
url
,
_LICENSE_
:
licenseHtml
,
_GOOGLE_MAPS_API_KEY_
:
config
.
google_maps_api_key
,
_WELCOME_BG_URL_
:
config
.
welcome_bg_url
_WELCOME_BG_URL_
:
config
.
welcome_bg_url
,
_TWITTER_INTEGRATION_
:
config
.
twitter
!=
null
};
const
_consts
:
{
[
key
:
string
]:
any
}
=
{};
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment