kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

port changes

Browse source
This commit is contained in:
Luke Bennett 2018-08-07 15:10:25 +01:00
parent 9d5d5d8648
commit 8403b38940
No known key found for this signature in database
GPG key ID: A738E9C68D3BF31A
3 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/pages/projects/settings/repository/show/mirror_repos.js
View file

@ -50,7 +50,7 @@ export default class MirrorRepos {
this.debouncedUpdateUrl = _.debounce(() => this.updateUrl(), 200); this.debouncedUpdateUrl = _.debounce(() => this.updateUrl(), 200);
this.$urlInput.on('input', () => this.debouncedUpdateUrl()); this.$urlInput.on('input', () => this.debouncedUpdateUrl());
this.$protectedBranchesInput.on('change', () => this.updateProtectedBranches()); this.$protectedBranchesInput.on('change', () => this.updateProtectedBranches());
this.$table.on('click', '.js-delete-mirror', this.deleteMirror.bind(this)); this.$table.on('click', '.js-delete-mirror', event => this.deleteMirror(event));
} }
togglePassword() { togglePassword() {

4
app/assets/stylesheets/framework/buttons.scss
View file

@ -242,10 +242,6 @@
&:not(:last-child) { &:not(:last-child) {
margin-right: 5px; margin-right: 5px;
} }
&.hide {
display: none;
}
} }
} }

3
app/views/projects/mirrors/_instructions.html.haml
View file

@ -3,7 +3,8 @@
%li %li
= _('The repository must be accessible over <code>http://</code>, = _('The repository must be accessible over <code>http://</code>,
<code>https://</code>, <code>ssh://</code> and <code>git://</code>.').html_safe <code>https://</code>, <code>ssh://</code> and <code>git://</code>.').html_safe
%li= _('The update action will time out after 10 minutes. For big repositories, use a clone/push combination.') %li= _('Include the username in the URL if required: <code>https://username@gitlab.company.com/group/project.git</code>.').html_safe
%li= _('The update action will time out after 15 minutes. For big repositories, use a clone/push combination.')
%li= _('The Git LFS objects will <strong>not</strong> be synced.').html_safe %li= _('The Git LFS objects will <strong>not</strong> be synced.').html_safe
%li %li
= _('This user will be the author of all events in the activity feed that are the result of an update, = _('This user will be the author of all events in the activity feed that are the result of an update,