Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into orderable-issues
This commit is contained in:
commit
710e4df933
|
@ -23,7 +23,7 @@
|
|||
}
|
||||
},
|
||||
"rules": {
|
||||
"filenames/match-regex": [2, "^[a-z0-9_]+(.js)?$"],
|
||||
"filenames/match-regex": [2, "^[a-z0-9_]+$"],
|
||||
"no-multiple-empty-lines": ["error", { "max": 1 }]
|
||||
}
|
||||
}
|
||||
|
|
|
@ -421,6 +421,7 @@ pages:
|
|||
- public
|
||||
only:
|
||||
- master@gitlab-org/gitlab-ce
|
||||
- master@gitlab-org/gitlab-ee
|
||||
|
||||
# Insurance in case a gem needed by one of our releases gets yanked from
|
||||
# rubygems.org in the future.
|
||||
|
@ -437,3 +438,4 @@ cache gems:
|
|||
- vendor/cache
|
||||
only:
|
||||
- master@gitlab-org/gitlab-ce
|
||||
- master@gitlab-org/gitlab-ee
|
||||
|
|
|
@ -0,0 +1 @@
|
|||
0.3.0
|
|
@ -1 +1 @@
|
|||
1.3.0
|
||||
1.4.0
|
||||
|
|
2
Gemfile
2
Gemfile
|
@ -344,7 +344,7 @@ gem 'oauth2', '~> 1.2.0'
|
|||
gem 'paranoia', '~> 2.2'
|
||||
|
||||
# Health check
|
||||
gem 'health_check', '~> 2.2.0'
|
||||
gem 'health_check', '~> 2.6.0'
|
||||
|
||||
# System information
|
||||
gem 'vmstat', '~> 2.3.0'
|
||||
|
|
|
@ -336,7 +336,7 @@ GEM
|
|||
thor
|
||||
tilt
|
||||
hashie (3.5.5)
|
||||
health_check (2.2.1)
|
||||
health_check (2.6.0)
|
||||
rails (>= 4.0)
|
||||
hipchat (1.5.2)
|
||||
httparty
|
||||
|
@ -895,7 +895,7 @@ DEPENDENCIES
|
|||
grape-entity (~> 0.6.0)
|
||||
haml_lint (~> 0.21.0)
|
||||
hamlit (~> 2.6.1)
|
||||
health_check (~> 2.2.0)
|
||||
health_check (~> 2.6.0)
|
||||
hipchat (~> 1.5.0)
|
||||
html-pipeline (~> 1.11.0)
|
||||
html2text
|
||||
|
|
|
@ -0,0 +1,10 @@
|
|||
import 'jquery';
|
||||
|
||||
// bootstrap jQuery plugins
|
||||
import 'bootstrap-sass/assets/javascripts/bootstrap/affix';
|
||||
import 'bootstrap-sass/assets/javascripts/bootstrap/alert';
|
||||
import 'bootstrap-sass/assets/javascripts/bootstrap/dropdown';
|
||||
import 'bootstrap-sass/assets/javascripts/bootstrap/modal';
|
||||
import 'bootstrap-sass/assets/javascripts/bootstrap/tab';
|
||||
import 'bootstrap-sass/assets/javascripts/bootstrap/transition';
|
||||
import 'bootstrap-sass/assets/javascripts/bootstrap/tooltip';
|
|
@ -0,0 +1,2 @@
|
|||
import './jquery';
|
||||
import './bootstrap';
|
|
@ -0,0 +1,11 @@
|
|||
import 'jquery';
|
||||
|
||||
// common jQuery plugins
|
||||
import 'jquery-ujs';
|
||||
import 'vendor/jquery.endless-scroll';
|
||||
import 'vendor/jquery.caret';
|
||||
import 'vendor/jquery.atwho';
|
||||
import 'vendor/jquery.scrollTo';
|
||||
import 'vendor/jquery.nicescroll';
|
||||
import 'vendor/jquery.waitforimages';
|
||||
import 'select2/select2';
|
|
@ -36,6 +36,7 @@
|
|||
/* global Shortcuts */
|
||||
|
||||
import GroupsList from './groups_list';
|
||||
import ProjectsList from './projects_list';
|
||||
|
||||
const ShortcutsBlob = require('./shortcuts_blob');
|
||||
const UserCallout = require('./user_callout');
|
||||
|
@ -98,6 +99,14 @@ const UserCallout = require('./user_callout');
|
|||
case 'dashboard:todos:index':
|
||||
new gl.Todos();
|
||||
break;
|
||||
case 'dashboard:projects:index':
|
||||
case 'dashboard:projects:starred':
|
||||
case 'explore:projects:index':
|
||||
case 'explore:projects:trending':
|
||||
case 'explore:projects:starred':
|
||||
case 'admin:projects:index':
|
||||
new ProjectsList();
|
||||
break;
|
||||
case 'dashboard:groups:index':
|
||||
case 'explore:groups:index':
|
||||
new GroupsList();
|
||||
|
@ -163,9 +172,6 @@ const UserCallout = require('./user_callout');
|
|||
case 'dashboard:activity':
|
||||
new gl.Activities();
|
||||
break;
|
||||
case 'dashboard:projects:starred':
|
||||
new gl.Activities();
|
||||
break;
|
||||
case 'projects:commit:show':
|
||||
new Commit();
|
||||
new gl.Diff();
|
||||
|
@ -208,6 +214,7 @@ const UserCallout = require('./user_callout');
|
|||
shortcut_handler = new ShortcutsNavigation();
|
||||
new NotificationsForm();
|
||||
new NotificationsDropdown();
|
||||
new ProjectsList();
|
||||
break;
|
||||
case 'groups:group_members:index':
|
||||
new gl.MemberExpirationDate();
|
|
@ -0,0 +1,45 @@
|
|||
/**
|
||||
* Makes search request for content when user types a value in the search input.
|
||||
* Updates the html content of the page with the received one.
|
||||
*/
|
||||
export default class FilterableList {
|
||||
constructor(form, filter, holder) {
|
||||
this.filterForm = form;
|
||||
this.listFilterElement = filter;
|
||||
this.listHolderElement = holder;
|
||||
}
|
||||
|
||||
initSearch() {
|
||||
this.debounceFilter = _.debounce(this.filterResults.bind(this), 500);
|
||||
|
||||
this.listFilterElement.removeEventListener('input', this.debounceFilter);
|
||||
this.listFilterElement.addEventListener('input', this.debounceFilter);
|
||||
}
|
||||
|
||||
filterResults() {
|
||||
const form = this.filterForm;
|
||||
const filterUrl = `${form.getAttribute('action')}?${$(form).serialize()}`;
|
||||
|
||||
$(this.listHolderElement).fadeTo(250, 0.5);
|
||||
|
||||
return $.ajax({
|
||||
url: form.getAttribute('action'),
|
||||
data: $(form).serialize(),
|
||||
type: 'GET',
|
||||
dataType: 'json',
|
||||
context: this,
|
||||
complete() {
|
||||
$(this.listHolderElement).fadeTo(250, 1);
|
||||
},
|
||||
success(data) {
|
||||
this.listHolderElement.innerHTML = data.html;
|
||||
|
||||
// Change url so if user reload a page - search results are saved
|
||||
return window.history.replaceState({
|
||||
page: filterUrl,
|
||||
|
||||
}, document.title, filterUrl);
|
||||
},
|
||||
});
|
||||
}
|
||||
}
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue