Skip to content

G
gitlab-ce
Commit f5bc41b3 authored by Lin Jen-Shin's avatar Lin Jen-Shin
Browse files
Options

Merge remote-tracking branch 'upstream/master' into fix-git-hooks-when-creating-file 

* upstream/master: (280 commits)
  Use declared_params helper in API
  Fixed issue boards when not logged in
  Fix typos and grammar
  Fix indentation in CI variables entry class
  Link to correct version of SanitizationFilter API docs for whitelist
  Use #to_h to convert params to a hash
  Grapify subscription API
  Change name of method for setting CI config entries
  Improve naming convention in ci configuration module
  Only turn on Sidekiq throttling if application settings exists
  Fix link to index.md in development README.md
  use single quote for consistency
  Also test on dev.gitlab [ci skip]
  Only run builds on master of CE or EE
  fix error links in help page
  Remove unneeded nil checks
  Remove hover state on location badge.
  Added ability to put emojis into repository name
  update redis server details
  fix Super User spacing
  ...
parents 92aa4028 889dcf60
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 16877 additions and 12724 deletions
.gitlab-ci.yml
View file @ f5bc41b3
......@@ -61,9 +61,10 @@ update-knapsack:
- scripts/merge-reports knapsack/spinach_report.json knapsack/spinach_node_*.json
- rm -f knapsack/*_node_*.json
only:
- master
# Execute all testing suites
- master@gitlab-org/gitlab-ce
- master@gitlab-org/gitlab-ee
- master@gitlab/gitlabhq
- master@gitlab/gitlab-ee
.use-db: &use-db
services:
......@@ -143,7 +144,10 @@ spinach 9 10: *spinach-knapsack
image: "dev.gitlab.org:5005/gitlab/gitlab-build-images:ruby-2.1-git-2.7-phantomjs-2.1"
<<: *use-db
only:
- master
- master@gitlab-org/gitlab-ce
- master@gitlab-org/gitlab-ee
- master@gitlab/gitlabhq
- master@gitlab/gitlab-ee
cache:
key: "ruby21"
paths:
......@@ -213,11 +217,24 @@ rake downtime_check: *exec
rake ee_compat_check:
<<: *exec
only:
- branches
- branches@gitlab-org/gitlab-ce
- branches@gitlab/gitlabhq
except:
- master
- tags
- /^[\d-]+-stable(-ee)?$/
allow_failure: yes
cache:
key: "ruby231-ee_compat_check_repo"
paths:
- ee_compat_check/repo/
- vendor/ruby
artifacts:
name: "${CI_BUILD_NAME}_${CI_BUILD_REF_NAME}_${CI_BUILD_REF}"
when: on_failure
expire_in: 10d
paths:
- ee_compat_check/patches/*.patch
rake db:migrate:reset:
stage: test
......@@ -273,7 +290,10 @@ bundler:audit:
stage: test
<<: *ruby-static-analysis
only:
- master
- master@gitlab-org/gitlab-ce
- master@gitlab-org/gitlab-ee
- master@gitlab/gitlabhq
- master@gitlab/gitlab-ee
script:
- "bundle exec bundle-audit check --update --ignore OSVDB-115941"
......@@ -284,6 +304,9 @@ migration paths:
SETUP_DB: "false"
only:
- master@gitlab-org/gitlab-ce
- master@gitlab-org/gitlab-ee
- master@gitlab/gitlabhq
- master@gitlab/gitlab-ee
script:
- git checkout HEAD .
- git fetch --tags
......@@ -331,7 +354,7 @@ trigger_docs:
cache: {}
artifacts: {}
script:
- "curl -X POST -F token=${DOCS_TRIGGER_TOKEN} -F ref=master -F variables[PROJECT]=ce https://gitlab.com/api/v3/projects/38069/trigger/builds"
- "curl -X POST -F token=${DOCS_TRIGGER_TOKEN} -F ref=master -F variables[PROJECT]=ce https://gitlab.com/api/v3/projects/1794617/trigger/builds"
only:
- master@gitlab-org/gitlab-ce
......
CHANGELOG.md
View file @ f5bc41b3
......@@ -4,19 +4,54 @@ entry.
## 8.14.0 (2016-11-22)
- Use separate email-token for incoming email and revert back the inactive feature. !5914
- Replace jQuery.timeago with timeago.js. !6274 (ClemMakesApps)
- Add CI notifications. Who triggered a pipeline would receive an email after the pipeline is succeeded or failed. Users could also update notification settings accordingly. !6342
- Finer-grained Git gargage collection. !6588
- Introduce better credential and error checking to `rake gitlab:ldap:check`. !6601
- Process commits using a dedicated Sidekiq worker. !6802
- Fix showing pipeline status for a given commit from correct branch. !7034
- Add query param to filter users by external & blocked type. !7109 (Yatish Mehta)
- Issues atom feed url reflect filters on dashboard. !7114 (Lucas Deschamps)
- Add setting to only allow merge requests to be merged when all discussions are resolved. !7125 (Rodolfo Arruda)
- Remove an extra leading space from diff paste data. !7133 (Hiroyuki Sato)
- Fix 404 on network page when entering non-existent git revision. !7172 (Hiroyuki Sato)
- Rewrite git blame spinach feature tests to rspec feature tests. !7197 (Lisanne Fellinger)
- Only skip group when it's actually a group in the "Share with group" select. !7262
- Introduce round-robin project creation to spread load over multiple shards. !7266
- Ensure merge request's "remove branch" accessors return booleans. !7267
- Expose label IDs in API. !7275 (Rares Sfirlogea)
- Fix invalid filename validation on eslint. !7281
- API: Ability to retrieve version information. !7286 (Robert Schilling)
- Set default Sidekiq retries to 3. !7294
- Return 400 when creating a system hook fails. !7350 (Robert Schilling)
- Use the Gitlab Workhorse HTTP header in the admin dashboard. (Chris Wright)
- Add an index for project_id in project_import_data to improve performance.
- Fix broken link to observatory cli on Frontend Dev Guide. (Sam Rose)
- Faster search inside Project.
- Clicking "force remove source branch" label now toggles the checkbox again.
- Allow to test JIRA service settings without having a repository.
- Fix: Guest sees some repository details and gets 404.
- Bump omniauth-gitlab to 1.0.2 to fix incompatibility with omniauth-oauth2.
- Fix: Todos Filter Shows All Users.
- Fix broken commits search.
- Show correct environment log in admin/logs (@duk3luk3 !7191)
- Fix Milestone dropdown not stay selected for `Upcoming` and `No Milestone` option !7117
- Diff collapse won't shift when collapsing.
- Backups do not fail anymore when using tar on annex and custom_hooks only. !5814
- Adds user project membership expired event to clarify why user was removed (Callum Dryden)
- Trim leading and trailing whitespace on project_path (Linus Thiel)
- Prevent award emoji via notes for issues/MRs authored by user (barthc)
- Adds support for the `token` attribute in project hooks API (Gauvain Pocentek)
- Change auto selection behaviour of emoji and slash commands to be more UX/Type friendly (Yann Gravrand)
- Adds an optional path parameter to the Commits API to filter commits by path (Luis HGO)
- Fix Markdown styling inside reference links (Jan Zdráhal)
- Create new issue board list after creating a new label
- Fix extra space on Build sidebar on Firefox !7060
- Fail gracefully when creating merge request with non-existing branch (alexsanford)
- Fix mobile layout issues in admin user overview page !7087
- Fix HipChat notifications rendering (airatshigapov, eisnerd)
- Removed unneeded "Builds" and "Environments" link from project titles
- Remove 'Edit' button from wiki edit view !7143 (Hiroyuki Sato)
- Cleaned up global namespace JS !19661 (Jose Ivan Vargas)
- Refactor Jira service to use jira-ruby gem
......@@ -66,16 +101,39 @@ entry.
- In all filterable drop downs, put input field in focus only after load is complete (Ido @leibo)
- Improve search query parameter naming in /admin/users !7115 (YarNayar)
- Fix table pagination to be responsive
- Fix applying GitHub-imported labels when importing job is interrupted
- Allow to search for user by secondary email address in the admin interface(/admin/users) !7115 (YarNayar)
- Updated commit SHA styling on the branches page.
- Fix 404 when visit /projects page
## 8.13.5 (2016-11-08)
- Restore unauthenticated access to public container registries
- Fix showing pipeline status for a given commit from correct branch. !7034
- Only skip group when it's actually a group in the "Share with group" select. !7262
- Introduce round-robin project creation to spread load over multiple shards. !7266
- Ensure merge request's "remove branch" accessors return booleans. !7267
- Ensure external users are not able to clone disabled repositories.
- Fix XSS issue in Markdown autolinker.
- Respect event visibility in Gitlab::ContributionsCalendar.
- Honour issue and merge request visibility in their respective finders.
- Disable reference Markdown for unavailable features.
- Fix lightweight tags not processed correctly by GitTagPushService. !6532
- Allow owners to fetch source code in CI builds. !6943
- Return conflict error in label API when title is taken by group label. !7014
- Reduce the overhead to calculate number of open/closed issues and merge requests within the group or project. !7123
- Fix builds tab visibility. !7178
- Fix project features default values. !7181
## 8.13.4
- Pulled due to packaging error.
## 8.13.3 (2016-11-02)
- Removes any symlinks before importing a project export file. CVE-2016-9086
- Fixed Import/Export foreign key issue to do with project members.
- Fix relative links in Markdown wiki when displayed in "Project" tab !7218
- Reduce the overhead to calculate number of open/closed issues and merge requests within the group or project
- Fix project features default values
- Changed build dropdown list length to be 6,5 builds long in the pipeline graph
## 8.13.2 (2016-10-31)
......@@ -266,6 +324,10 @@ entry.
- Fix broken Project API docs (Takuya Noguchi)
- Migrate invalid project members (owner -> master)
## 8.12.9 (2016-11-07)
- Fix XSS issue in Markdown autolinker
## 8.12.8 (2016-11-02)
- Removes any symlinks before importing a project export file. CVE-2016-9086
......@@ -530,6 +592,10 @@ entry.
- Fix non-master branch readme display in tree view
- Add UX improvements for merge request version diffs
## 8.11.11 (2016-11-07)
- Fix XSS issue in Markdown autolinker
## 8.11.10 (2016-11-02)
- Removes any symlinks before importing a project export file. CVE-2016-9086
......
Gemfile
View file @ f5bc41b3
......@@ -26,7 +26,7 @@ gem 'omniauth-bitbucket', '~> 0.0.2'
gem 'omniauth-cas3', '~> 1.1.2'
gem 'omniauth-facebook', '~> 4.0.0'
gem 'omniauth-github', '~> 1.1.1'
gem 'omniauth-gitlab', '~> 1.0.0'
gem 'omniauth-gitlab', '~> 1.0.2'
gem 'omniauth-google-oauth2', '~> 0.4.1'
gem 'omniauth-kerberos', '~> 0.3.0', group: :kerberos
gem 'omniauth-saml', '~> 1.7.0'
......@@ -100,7 +100,7 @@ gem 'seed-fu', '~> 2.3.5'
# Markdown and HTML processing
gem 'html-pipeline', '~> 1.11.0'
gem 'deckar01-task_list', '1.0.5', require: 'task_list/railtie'
gem 'deckar01-task_list', '1.0.6', require: 'task_list/railtie'
gem 'gitlab-markup', '~> 1.5.0'
gem 'redcarpet', '~> 3.3.3'
gem 'RedCloth', '~> 4.3.2'
......@@ -137,6 +137,7 @@ gem 'acts-as-taggable-on', '~> 4.0'
gem 'sidekiq', '~> 4.2'
gem 'sidekiq-cron', '~> 0.4.0'
gem 'redis-namespace', '~> 1.5.2'
gem 'sidekiq-limit_fetch', '~> 3.4'
# HTTP requests
gem 'httparty', '~> 0.13.3'
......@@ -152,7 +153,7 @@ gem 'settingslogic', '~> 2.0.9'
gem 'version_sorter', '~> 2.1.0'
# Cache
gem 'redis-rails', '~> 4.0.0'
gem 'redis-rails', '~> 5.0.1'
# Redis
gem 'redis', '~> 3.2'
......
Gemfile.lock
View file @ f5bc41b3
......@@ -159,7 +159,7 @@ GEM
database_cleaner (1.5.3)
debug_inspector (0.0.2)
debugger-ruby_core_source (1.3.8)
deckar01-task_list (1.0.5)
deckar01-task_list (1.0.6)
activesupport (~> 4.0)
html-pipeline
rack (~> 1.0)
......@@ -456,7 +456,7 @@ GEM
omniauth-github (1.1.2)
omniauth (~> 1.0)
omniauth-oauth2 (~> 1.1)
omniauth-gitlab (1.0.1)
omniauth-gitlab (1.0.2)
omniauth (~> 1.0)
omniauth-oauth2 (~> 1.0)
omniauth-google-oauth2 (0.4.1)
......@@ -573,23 +573,23 @@ GEM
json
redcarpet (3.3.3)
redis (3.2.2)
redis-actionpack (4.0.1)
actionpack (~> 4)
redis-rack (~> 1.5.0)
redis-store (~> 1.1.0)
redis-activesupport (4.1.5)
activesupport (>= 3, < 5)
redis-store (~> 1.1.0)
redis-actionpack (5.0.1)
actionpack (>= 4.0, < 6)
redis-rack (>= 1, < 3)
redis-store (>= 1.1.0, < 1.4.0)
redis-activesupport (5.0.1)
activesupport (>= 3, < 6)
redis-store (~> 1.2.0)
redis-namespace (1.5.2)
redis (~> 3.0, >= 3.0.4)
redis-rack (1.5.0)
redis-rack (1.6.0)
rack (~> 1.5)
redis-store (~> 1.1.0)
redis-rails (4.0.0)
redis-actionpack (~> 4)
redis-activesupport (~> 4)
redis-store (~> 1.1.0)
redis-store (1.1.7)
redis-store (~> 1.2.0)
redis-rails (5.0.1)
redis-actionpack (~> 5.0.0)
redis-activesupport (~> 5.0.0)
redis-store (~> 1.2.0)
redis-store (1.2.0)
redis (>= 2.2)
request_store (1.3.1)
rerun (0.11.0)
......@@ -685,6 +685,8 @@ GEM
redis-namespace (>= 1.5.2)
rufus-scheduler (>= 2.0.24)
sidekiq (>= 4.0.0)
sidekiq-limit_fetch (3.4.0)
sidekiq (>= 4)
simplecov (0.12.0)
docile (~> 1.1.0)
json (>= 1.8, < 3)
......@@ -840,7 +842,7 @@ DEPENDENCIES
creole (~> 0.5.0)
d3_rails (~> 3.5.0)
database_cleaner (~> 1.5.0)
deckar01-task_list (= 1.0.5)
deckar01-task_list (= 1.0.6)
default_value_for (~> 3.0.0)
devise (~> 4.2)
devise-two-factor (~> 3.0.0)
......@@ -913,7 +915,7 @@ DEPENDENCIES
omniauth-cas3 (~> 1.1.2)
omniauth-facebook (~> 4.0.0)
omniauth-github (~> 1.1.1)
omniauth-gitlab (~> 1.0.0)
omniauth-gitlab (~> 1.0.2)
omniauth-google-oauth2 (~> 0.4.1)
omniauth-kerberos (~> 0.3.0)
omniauth-saml (~> 1.7.0)
......@@ -938,7 +940,7 @@ DEPENDENCIES
redcarpet (~> 3.3.3)
redis (~> 3.2)
redis-namespace (~> 1.5.2)
redis-rails (~> 4.0.0)
redis-rails (~> 5.0.1)
request_store (~> 1.3)
rerun (~> 0.11.0)
responders (~> 2.0)
......@@ -961,6 +963,7 @@ DEPENDENCIES
shoulda-matchers (~> 2.8.0)
sidekiq (~> 4.2)
sidekiq-cron (~> 0.4.0)
sidekiq-limit_fetch (~> 3.4)
simplecov (= 0.12.0)
slack-notifier (~> 1.2.0)
spinach-rails (~> 0.2.1)
......@@ -994,4 +997,4 @@ DEPENDENCIES
wikicloth (= 0.8.1)
BUNDLED WITH
1.13.5
1.13.6
README.md
View file @ f5bc41b3
......@@ -82,6 +82,10 @@ GitLab is a Ruby on Rails application that runs on the following software:
For more information please see the [architecture documentation](https://docs.gitlab.com/ce/development/architecture.html).
## UX design
Please adhere to the [UX Guide](doc/development/ux_guide/readme.md) when creating designs and implementing code.
## Third-party applications
There are a lot of [third-party applications integrating with GitLab](https://about.gitlab.com/applications/). These include GUI Git clients, mobile applications and API wrappers for various languages.
......
app/assets/javascripts/activities.js
View file @ f5bc41b3
......@@ -13,12 +13,12 @@
}
Activities.prototype.updateTooltips = function() {
return gl.utils.localTimeAgo($('.js-timeago', '.content_list'));
gl.utils.localTimeAgo($('.js-timeago', '.content_list'));
};
Activities.prototype.reloadActivities = function() {
$(".content_list").html('');
return Pager.init(20, true);
Pager.init(20, true, false, this.updateTooltips);
};
Activities.prototype.toggleFilter = function(sender) {
......
app/assets/javascripts/application.js
View file @ f5bc41b3
......@@ -13,7 +13,6 @@
/*= require jquery-ui/sortable */
/*= require jquery_ujs */
/*= require jquery.endless-scroll */
/*= require jquery.timeago */
/*= require jquery.highlight */
/*= require jquery.waitforimages */
/*= require jquery.atwho */
......@@ -59,11 +58,28 @@
document.addEventListener('page:fetch', gl.utils.cleanupBeforeFetch);
window.addEventListener('hashchange', gl.utils.shiftWindow);
// automatically adjust scroll position for hash urls taking the height of the navbar into account
// https://github.com/twitter/bootstrap/issues/1768
window.adjustScroll = function() {
var navbar = document.querySelector('.navbar-gitlab');
var subnav = document.querySelector('.layout-nav');
var fixedTabs = document.querySelector('.js-tabs-affix');
adjustment = 0;
if (navbar) adjustment -= navbar.offsetHeight;
if (subnav) adjustment -= subnav.offsetHeight;
if (fixedTabs) adjustment -= fixedTabs.offsetHeight;
return scrollBy(0, adjustment);
};
window.addEventListener("hashchange", adjustScroll);
window.onload = function () {
// Scroll the window to avoid the topnav bar
// https://github.com/twitter/bootstrap/issues/1768
if (location.hash) {
return setTimeout(gl.utils.shiftWindow, 100);
return setTimeout(adjustScroll, 100);
}
};
......@@ -194,9 +210,6 @@
e.preventDefault();
return new ConfirmDangerModal(form, text);
});
$document.on('click', 'button', function () {
return $(this).blur();
});
$('input[type="search"]').each(function () {
var $this = $(this);
$this.attr('value', $this.val());
......@@ -238,8 +251,5 @@
// bind sidebar events
new gl.Sidebar();
// Custom time ago
gl.utils.shortTimeAgo($('.js-short-timeago'));
});
}).call(this);
app/assets/javascripts/boards/boards_bundle.js.es6
View file @ f5bc41b3
......@@ -22,6 +22,8 @@ $(() => {
gl.IssueBoardsApp.$destroy(true);
}
Store.create();
gl.IssueBoardsApp = new Vue({
el: $boardApp,
components: {
......@@ -37,16 +39,15 @@ $(() => {
issueLinkBase: $boardApp.dataset.issueLinkBase,
detailIssue: Store.detail
},
init: Store.create.bind(Store),
computed: {
detailIssueVisible () {
return Object.keys(this.detailIssue.issue).length;
}
},
},
created () {
gl.boardService = new BoardService(this.endpoint, this.boardId);
},
ready () {
mounted () {
Store.disabled = this.disabled;
gl.boardService.all()
.then((resp) => {
......@@ -60,6 +61,8 @@ $(() => {
}
});
this.state.lists = _.sortBy(this.state.lists, 'position');
Store.addBlankState();
this.loading = false;
});
......@@ -70,6 +73,9 @@ $(() => {
el: '#js-boards-seach',
data: {
filters: Store.state.filters
},
mounted () {
gl.issueBoards.newListDropdownInit();
}
});
});
app/assets/javascripts/boards/components/board.js.es6
View file @ f5bc41b3
......@@ -10,6 +10,7 @@
window.gl.issueBoards = window.gl.issueBoards || {};
gl.issueBoards.Board = Vue.extend({
template: '#js-board-template',
components: {
'board-list': gl.issueBoards.BoardList,
'board-delete': gl.issueBoards.BoardDelete,
......@@ -24,7 +25,6 @@
return {
detailIssue: Store.detail,
filters: Store.state.filters,
showIssueForm: false
};
},
watch: {
......@@ -58,10 +58,10 @@
},
methods: {
showNewIssueForm() {
this.showIssueForm = !this.showIssueForm;
this.$refs['board-list'].showIssueForm = !this.$refs['board-list'].showIssueForm;
}
},
ready () {
mounted () {
const options = gl.issueBoards.getBoardSortableDefaultOptions({
disabled: this.disabled,
group: 'boards',
......@@ -72,13 +72,9 @@
if (e.newIndex !== undefined && e.oldIndex !== e.newIndex) {
const order = this.sortable.toArray(),
$board = this.$parent.$refs.board[e.oldIndex + 1],
list = $board.list;
$board.$destroy(true);
list = Store.findList('id', parseInt(e.item.dataset.id));
this.$nextTick(() => {
Store.state.lists.splice(e.newIndex, 0, list);
Store.moveList(list, order);
});
}
......@@ -87,8 +83,5 @@
this.sortable = Sortable.create(this.$el.parentNode, options);
},
beforeDestroy () {
Store.state.lists.$remove(this.list);
}
});
})();
app/assets/javascripts/boards/components/board_blank_state.js.es6
View file @ f5bc41b3
......@@ -30,6 +30,8 @@
});
});
Store.state.lists = _.sortBy(Store.state.lists, 'position');
// Save the labels
gl.boardService.generateDefaultLists()
.then((resp) => {
......
app/assets/javascripts/boards/components/board_card.js.es6
View file @ f5bc41b3
......@@ -6,6 +6,7 @@
window.gl.issueBoards = window.gl.issueBoards || {};
gl.issueBoards.BoardCard = Vue.extend({
template: '#js-board-list-card',
props: {
list: Object,
issue: Object,
......@@ -53,11 +54,6 @@
mouseDown () {
this.showDetail = true;
},
mouseMove () {
if (this.showDetail) {
this.showDetail = false;
}
},
showIssue (e) {
const targetTagName = e.target.tagName.toLowerCase();
......
app/assets/javascripts/boards/components/board_list.js.es6
View file @ f5bc41b3
......@@ -9,6 +9,7 @@
window.gl.issueBoards = window.gl.issueBoards || {};
gl.issueBoards.BoardList = Vue.extend({
template: '#js-board-list-template',
components: {
'board-card': gl.issueBoards.BoardCard,
'board-new-issue': gl.issueBoards.BoardNewIssue
......@@ -19,20 +20,20 @@
issues: Array,
loading: Boolean,
issueLinkBase: String,
showIssueForm: Boolean
},
data () {
return {
scrollOffset: 250,
filters: Store.state.filters,
showCount: false
showCount: false,
showIssueForm: false
};
},
watch: {
filters: {
handler () {
this.list.loadingMore = false;
this.$els.list.scrollTop = 0;
this.$refs.list.scrollTop = 0;
},
deep: true
},
......@@ -51,15 +52,20 @@
});
}
},
computed: {
orderedIssues () {
return _.sortBy(this.issues, 'priority');
},
},
methods: {
listHeight () {
return this.$els.list.getBoundingClientRect().height;
return this.$refs.list.getBoundingClientRect().height;
},
scrollHeight () {
return this.$els.list.scrollHeight;
return this.$refs.list.scrollHeight;
},
scrollTop () {
return this.$els.list.scrollTop + this.listHeight();
return this.$refs.list.scrollTop + this.listHeight();
},
loadNextPage () {
const getIssues = this.list.nextPage();
......@@ -72,7 +78,7 @@
}
},
},
ready () {
mounted () {
const options = gl.issueBoards.getBoardSortableDefaultOptions({
group: 'issues',
sort: false,
......@@ -81,23 +87,27 @@
onStart: (e) => {
const card = this.$refs.issue[e.oldIndex];
card.showDetail = false;
Store.moving.issue = card.issue;
Store.moving.list = card.list;
gl.issueBoards.onStart();
},
onAdd: (e) => {
gl.issueBoards.BoardsStore.moveIssueToList(Store.moving.list, this.list, Store.moving.issue);
// Add the element back to original list to allow Vue to handle DOM updates
e.from.appendChild(e.item);
this.$nextTick(() => {
// Update the issues once we know the element has been moved
gl.issueBoards.BoardsStore.moveIssueToList(Store.moving.list, this.list, Store.moving.issue);
});
},
onRemove: (e) => {
this.$refs.issue[e.oldIndex].$destroy(true);
}
});
this.sortable = Sortable.create(this.$els.list, options);
this.sortable = Sortable.create(this.$refs.list, options);
// Scroll event on list to load more
this.$els.list.onscroll = () => {
this.$refs.list.onscroll = () => {
if ((this.scrollTop() > this.scrollHeight() - this.scrollOffset) && !this.list.loadingMore) {
this.loadNextPage();
}
......
app/assets/javascripts/boards/components/board_new_issue.js.es6
View file @ f5bc41b3
......@@ -7,7 +7,6 @@
gl.issueBoards.BoardNewIssue = Vue.extend({
props: {
list: Object,
showIssueForm: Boolean
},
data() {
return {
......@@ -15,11 +14,6 @@
error: false
};
},
watch: {
showIssueForm () {
this.$els.input.focus();
}
},
methods: {
submit(e) {
e.preventDefault();
......@@ -37,28 +31,30 @@
this.list.newIssue(issue)
.then((data) => {
// Need this because our jQuery very kindly disables buttons on ALL form submissions
$(this.$els.submitButton).enable();
$(this.$refs.submitButton).enable();
Store.detail.issue = issue;
})
.catch(() => {
// Need this because our jQuery very kindly disables buttons on ALL form submissions
$(this.$els.submitButton).enable();
$(this.$refs.submitButton).enable();
// Remove the issue
this.list.removeIssue(issue);
// Show error message
this.error = true;
this.showIssueForm = true;
});
this.cancel();
},
cancel() {
this.showIssueForm = false;
this.title = '';
this.$parent.showIssueForm = false;
}
}
},
mounted() {
this.$refs.input.focus();
},
});
})();
app/assets/javascripts/boards/components/board_sidebar.js.es6
View file @ f5bc41b3
......@@ -41,7 +41,7 @@
this.detail.issue = {};
}
},
ready () {
mounted () {
new IssuableContext(this.currentUser);
new MilestoneSelect();
new gl.DueDateSelectors();
......
app/assets/javascripts/boards/components/new_list_dropdown.js.es6
View file @ f5bc41b3
/* eslint-disable */
$(() => {
(() => {
window.gl = window.gl || {};
window.gl.issueBoards = window.gl.issueBoards || {};
const Store = gl.issueBoards.BoardsStore;
$('.js-new-board-list').each(function () {
const $this = $(this);
new gl.CreateLabelDropdown($this.closest('.dropdown').find('.dropdown-new-label'), $this.data('namespace-path'), $this.data('project-path'));
$(document).off('created.label').on('created.label', (e, label) => {
Store.new({
title: label.title,
position: Store.state.lists.length - 2,
list_type: 'label',
label: {
id: label.id,
title: label.title,
color: label.color
}
});
});
gl.issueBoards.newListDropdownInit = () => {
$('.js-new-board-list').each(function () {
const $this = $(this);
new gl.CreateLabelDropdown($this.closest('.dropdown').find('.dropdown-new-label'), $this.data('namespace-path'), $this.data('project-path'));
$this.glDropdown({
data(term, callback) {
$.get($this.attr('data-labels'))
.then((resp) => {
callback(resp);
});
},
renderRow (label) {
const active = Store.findList('title', label.title),
$li = $('<li />'),
$a = $('<a />', {
class: (active ? `is-active js-board-list-${active.id}` : ''),
text: label.title,
href: '#'
}),
$labelColor = $('<span />', {
class: 'dropdown-label-box',
style: `background-color: ${label.color}`
});
$this.glDropdown({
data(term, callback) {
$.get($this.attr('data-labels'))
.then((resp) => {
callback(resp);
});
},
renderRow (label) {
const active = Store.findList('title', label.title),
$li = $('<li />'),
$a = $('<a />', {
class: (active ? `is-active js-board-list-${active.id}` : ''),
text: label.title,
href: '#'
}),
$labelColor = $('<span />', {
class: 'dropdown-label-box',
style: `background-color: ${label.color}`
});
return $li.append($a.prepend($labelColor));
},
search: {
fields: ['title']
},
filterable: true,
selectable: true,
multiSelect: true,
clicked (label, $el, e) {
e.preventDefault();
return $li.append($a.prepend($labelColor));
},
search: {
fields: ['title']
},
filterable: true,
selectable: true,
multiSelect: true,
clicked (label, $el, e) {
e.preventDefault();
if (!Store.findList('title', label.title)) {
Store.new({
title: label.title,
position: Store.state.lists.length - 2,
list_type: 'label',
label: {
id: label.id,
if (!Store.findList('title', label.title)) {
Store.new({
title: label.title,
color: label.color
}
});
position: Store.state.lists.length - 2,
list_type: 'label',
label: {
id: label.id,
title: label.title,
color: label.color
}
});
Store.state.lists = _.sortBy(Store.state.lists, 'position');
}
}
}
});
});
});
});
};
})();
app/assets/javascripts/boards/mixins/sortable_default_options.js.es6
View file @ f5bc41b3
......@@ -23,7 +23,7 @@
fallbackOnBody: true,
ghostClass: 'is-ghost',
filter: '.board-delete, .btn',
delay: gl.issueBoards.touchEnabled ? 100 : 50,
delay: gl.issueBoards.touchEnabled ? 100 : 0,
scrollSensitivity: gl.issueBoards.touchEnabled ? 60 : 100,
scrollSpeed: 20,
onStart: gl.issueBoards.onStart,
......
app/assets/javascripts/boards/models/list.js.es6
View file @ f5bc41b3
......@@ -42,7 +42,8 @@ class List {
}
destroy () {
gl.issueBoards.BoardsStore.state.lists.$remove(this);
const index = gl.issueBoards.BoardsStore.state.lists.indexOf(this);
gl.issueBoards.BoardsStore.state.lists.splice(index, 1);
gl.issueBoards.BoardsStore.updateNewListDropdown(this.id);
gl.boardService.destroyList(this.id);
......
app/assets/javascripts/boards/stores/boards_store.js.es6
View file @ f5bc41b3
......@@ -39,6 +39,8 @@
// Remove any new issues from the backlog
// as they will be visible in the new list
list.issues.forEach(backlogList.removeIssue.bind(backlogList));
this.state.lists = _.sortBy(this.state.lists, 'position');
});
this.removeBlankState();
},
......@@ -58,6 +60,8 @@
title: 'Welcome to your Issue Board!',
position: 0
});
this.state.lists = _.sortBy(this.state.lists, 'position');
},
removeBlankState () {
this.removeList('blank');
......
app/assets/javascripts/build.js
View file @ f5bc41b3
......@@ -8,56 +8,55 @@
Build.state = null;
function Build(options) {
this.page_url = options.page_url;
this.build_url = options.build_url;
this.build_status = options.build_status;
options = options || $('.js-build-options').data();
this.pageUrl = options.pageUrl;
this.buildUrl = options.buildUrl;
this.buildStatus = options.buildStatus;
this.state = options.state1;
this.build_stage = options.build_stage;
this.hideSidebar = bind(this.hideSidebar, this);
this.toggleSidebar = bind(this.toggleSidebar, this);
this.buildStage = options.buildStage;
this.updateDropdown = bind(this.updateDropdown, this);
this.$document = $(document);
clearInterval(Build.interval);
// Init breakpoint checker
this.bp = Breakpoints.get();
this.initSidebar();
this.$buildScroll = $('#js-build-scroll');
this.populateJobs(this.build_stage);
this.updateStageDropdownText(this.build_stage);
this.populateJobs(this.buildStage);
this.updateStageDropdownText(this.buildStage);
this.sidebarOnResize();
$(window).off('resize.build').on('resize.build', this.hideSidebar);
this.$document.off('click', '.js-sidebar-build-toggle').on('click', '.js-sidebar-build-toggle', this.sidebarOnClick.bind(this));
this.$document.off('click', '.stage-item').on('click', '.stage-item', this.updateDropdown);
$('#js-build-scroll > a').off('click').on('click', this.stepTrace);
$(window).off('resize.build').on('resize.build', this.sidebarOnResize.bind(this));
$('a', this.$buildScroll).off('click.stepTrace').on('click.stepTrace', this.stepTrace);
this.updateArtifactRemoveDate();
if ($('#build-trace').length) {
this.getInitialBuildTrace();
this.initScrollButtons();
this.initScrollButtonAffix();
}
if (this.build_status === "running" || this.build_status === "pending") {
if (this.buildStatus === "running" || this.buildStatus === "pending") {
// Bind autoscroll button to follow build output
$('#autoscroll-button').on('click', function() {
var state;
state = $(this).data("state");
if ("enabled" === state) {
$(this).data("state", "disabled");
return $(this).text("enable autoscroll");
return $(this).text("Enable autoscroll");
} else {
$(this).data("state", "enabled");
return $(this).text("disable autoscroll");
return $(this).text("Disable autoscroll");
}
//
// Bind autoscroll button to follow build output
//
});
Build.interval = setInterval((function(_this) {
// Check for new build output if user still watching build page
// Only valid for runnig build when output changes during time
return function() {
if (window.location.href.split("#").first() === _this.page_url) {
if (_this.location() === _this.pageUrl) {
return _this.getBuildTrace();
}
};
//
// Check for new build output if user still watching build page
// Only valid for runnig build when output changes during time
//
})(this), 4000);
}
}
......@@ -72,20 +71,23 @@
top: this.sidebarTranslationLimits.max
});
this.$sidebar.niceScroll();
this.hideSidebar();
this.$document.off('click', '.js-sidebar-build-toggle').on('click', '.js-sidebar-build-toggle', this.toggleSidebar);
this.$document.off('scroll.translateSidebar').on('scroll.translateSidebar', this.translateSidebar.bind(this));
};
Build.prototype.location = function() {
return window.location.href.split("#")[0];
};
Build.prototype.getInitialBuildTrace = function() {
var removeRefreshStatuses = ['success', 'failed', 'canceled', 'skipped']
return $.ajax({
url: this.build_url,
url: this.buildUrl,
dataType: 'json',
success: function(build_data) {
$('.js-build-output').html(build_data.trace_html);
if (removeRefreshStatuses.indexOf(build_data.status) >= 0) {
success: function(buildData) {
$('.js-build-output').html(buildData.trace_html);
if (removeRefreshStatuses.indexOf(buildData.status) >= 0) {
return $('.js-build-refresh').remove();
}
}
......@@ -94,7 +96,7 @@
Build.prototype.getBuildTrace = function() {
return $.ajax({
url: this.page_url + "/trace.json?state=" + (encodeURIComponent(this.state)),
url: this.pageUrl + "/trace.json?state=" + (encodeURIComponent(this.state)),
dataType: "json",
success: (function(_this) {
return function(log) {
......@@ -108,8 +110,8 @@
$('.js-build-output').html(log.html);
}
return _this.checkAutoscroll();
} else if (log.status !== _this.build_status) {
return Turbolinks.visit(_this.page_url);
} else if (log.status !== _this.buildStatus) {
return Turbolinks.visit(_this.pageUrl);
}
};
})(this)
......@@ -122,12 +124,11 @@
}
};
Build.prototype.initScrollButtons = function() {
var $body, $buildScroll, $buildTrace;
$buildScroll = $('#js-build-scroll');
Build.prototype.initScrollButtonAffix = function() {
var $body, $buildTrace;
$body = $('body');
$buildTrace = $('#build-trace');
return $buildScroll.affix({
return this.$buildScroll.affix({
offset: {
bottom: function() {
return $body.outerHeight() - ($buildTrace.outerHeight() + $buildTrace.offset().top);
......@@ -136,18 +137,12 @@
});
};
Build.prototype.shouldHideSidebar = function() {
Build.prototype.shouldHideSidebarForViewport = function() {
var bootstrapBreakpoint;
bootstrapBreakpoint = this.bp.getBreakpointSize();
return bootstrapBreakpoint === 'xs' || bootstrapBreakpoint === 'sm';
};
Build.prototype.toggleSidebar = function() {
if (this.shouldHideSidebar()) {
return this.$sidebar.toggleClass('right-sidebar-expanded right-sidebar-collapsed');
}
};
Build.prototype.translateSidebar = function(e) {
var newPosition = this.sidebarTranslationLimits.max - (document.body.scrollTop || document.documentElement.scrollTop);
if (newPosition < this.sidebarTranslationLimits.min) newPosition = this.sidebarTranslationLimits.min;
......@@ -156,12 +151,20 @@
});
};
Build.prototype.hideSidebar = function() {
if (this.shouldHideSidebar()) {
return this.$sidebar.removeClass('right-sidebar-expanded').addClass('right-sidebar-collapsed');
} else {
return this.$sidebar.removeClass('right-sidebar-collapsed').addClass('right-sidebar-expanded');
}
Build.prototype.toggleSidebar = function(shouldHide) {
var shouldShow = typeof shouldHide === 'boolean' ? !shouldHide : undefined;
this.$buildScroll.toggleClass('sidebar-expanded', shouldShow)
.toggleClass('sidebar-collapsed', shouldHide);
this.$sidebar.toggleClass('right-sidebar-expanded', shouldShow)
.toggleClass('right-sidebar-collapsed', shouldHide);
};
Build.prototype.sidebarOnResize = function() {
this.toggleSidebar(this.shouldHideSidebarForViewport());
};
Build.prototype.sidebarOnClick = function() {
if (this.shouldHideSidebarForViewport()) this.toggleSidebar();
};
Build.prototype.updateArtifactRemoveDate = function() {
......@@ -169,7 +172,7 @@
$date = $('.js-artifacts-remove');
if ($date.length) {
date = $date.text();
return $date.text($.timefor(new Date(date.replace(/([0-9]+)-([0-9]+)-([0-9]+)/g, '$1/$2/$3')), ' '));
return $date.text(gl.utils.timefor(new Date(date.replace(/([0-9]+)-([0-9]+)-([0-9]+)/g, '$1/$2/$3')), ' '));
}
};
......
app/assets/javascripts/compare.js
View file @ f5bc41b3
......@@ -80,7 +80,8 @@
success: function(html) {
loading.hide();
$target.html(html);
return $('.js-timeago', $target).timeago();
var className = '.' + $target[0].className.replace(' ', '.');
gl.utils.localTimeAgo($('.js-timeago', className));
}
});
};
......
app/assets/javascripts/create_label.js.es6
View file @ f5bc41b3
......@@ -115,6 +115,8 @@
.show();
} else {
this.$dropdownBack.trigger('click');
$(document).trigger('created.label', label);
}
});
}
......
app/assets/javascripts/diff.js
View file @ f5bc41b3
......@@ -43,10 +43,6 @@
bottom: unfoldBottom,
offset: offset,
unfold: unfold,
// indent is used to compensate for single space indent to fit
// '+' and '-' prepended to diff lines,
// see https://gitlab.com/gitlab-org/gitlab-ce/issues/707
indent: 1,
view: file.data('view')
};
return $.get(link, params, function(response) {
......
app/assets/javascripts/diff_notes/components/comment_resolve_btn.js.es6
View file @ f5bc41b3
/* eslint-disable */
((w) => {
w.CommentAndResolveBtn = Vue.extend({
(() => {
const CommentAndResolveBtn = Vue.extend({
props: {
discussionId: String,
textareaIsEmpty: Boolean
},
data() {
return {
textareaIsEmpty: true
}
},
computed: {
discussion: function () {
......@@ -35,7 +39,7 @@
}
}
},
ready: function () {
mounted: function () {
const $textarea = $(`#new-discussion-note-form-${this.discussionId} .note-textarea`);
this.textareaIsEmpty = $textarea.val() === '';
......@@ -47,4 +51,6 @@
$(`#new-discussion-note-form-${this.discussionId} .note-textarea`).off('input.comment-and-resolve-btn');
}
});
Vue.component('comment-and-resolve-btn', CommentAndResolveBtn);
})(window);
app/assets/javascripts/diff_notes/components/resolve_btn.js.es6
View file @ f5bc41b3
/* eslint-disable */
((w) => {
w.ResolveBtn = Vue.extend({
(() => {
const ResolveBtn = Vue.extend({
props: {
noteId: Number,
discussionId: String,
......@@ -54,7 +54,7 @@
},
methods: {
updateTooltip: function () {
$(this.$els.button)
$(this.$refs.button)
.tooltip('hide')
.tooltip('fixTitle');
},
......@@ -89,8 +89,8 @@
});
}
},
compiled: function () {
$(this.$els.button).tooltip({
mounted: function () {
$(this.$refs.button).tooltip({
container: 'body'
});
},
......@@ -101,4 +101,6 @@
CommentsStore.create(this.discussionId, this.noteId, this.canResolve, this.resolved, this.resolvedBy);
}
});
})(window);
Vue.component('resolve-btn', ResolveBtn);
})();
app/assets/javascripts/diff_notes/components/resolve_count.js.es6
View file @ f5bc41b3
......@@ -13,6 +13,9 @@
computed: {
allResolved: function () {
return this.resolvedDiscussionCount === this.discussionCount;
},
resolvedCountText() {
return this.discussionCount === 1 ? 'discussion' : 'discussions';
}
}
});
......
app/assets/javascripts/diff_notes/components/resolve_discussion_btn.js.es6
View file @ f5bc41b3
/* eslint-disable */
((w) => {
w.ResolveDiscussionBtn = Vue.extend({
(() => {
const ResolveDiscussionBtn = Vue.extend({
props: {
discussionId: String,
mergeRequestId: Number,
......@@ -54,4 +54,6 @@
CommentsStore.createDiscussion(this.discussionId, this.canResolve);
}
});
})(window);
Vue.component('resolve-discussion-btn', ResolveDiscussionBtn);
})();
app/assets/javascripts/diff_notes/diff_notes_bundle.js.es6
View file @ f5bc41b3
......@@ -8,24 +8,35 @@
//= require_directory ./components
$(() => {
window.DiffNotesApp = new Vue({
el: '#diff-notes-app',
components: {
'resolve-btn': ResolveBtn,
'resolve-discussion-btn': ResolveDiscussionBtn,
'comment-and-resolve-btn': CommentAndResolveBtn
},
methods: {
compileComponents: function () {
const $components = $('resolve-btn, resolve-discussion-btn, jump-to-discussion');
if ($components.length) {
$components.each(function () {
DiffNotesApp.$compile($(this).get(0));
});
const COMPONENT_SELECTOR = 'resolve-btn, resolve-discussion-btn, jump-to-discussion, comment-and-resolve-btn';
window.gl = window.gl || {};
window.gl.diffNoteApps = {};
gl.diffNotesCompileComponents = () => {
const $components = $(COMPONENT_SELECTOR).filter(function () {
return $(this).closest('resolve-count').length !== 1;
});
if ($components) {
$components.each(function () {
const $this = $(this);
const noteId = $this.attr(':note-id');
const tmp = Vue.extend({
template: $this.get(0).outerHTML
});
const tmpApp = new tmp().$mount();
if (noteId) {
gl.diffNoteApps[`note_${noteId}`] = tmpApp;
}
}
$this.replaceWith(tmpApp.$el);
});
}
});
};
gl.diffNotesCompileComponents();
new Vue({
el: '#resolve-count-app',
......
app/assets/javascripts/dispatcher.js.es6
View file @ f5bc41b3
......@@ -29,6 +29,9 @@
case 'projects:boards:index':
shortcut_handler = new ShortcutsNavigation();
break;
case 'projects:builds:show':
new Build();
break;
case 'projects:merge_requests:index':
case 'projects:issues:index':
Issuable.init();
......
app/assets/javascripts/extensions/element.js.es6
View file @ f5bc41b3
/* eslint-disable */
Element.prototype.matches = Element.prototype.matches || Element.prototype.msMatches;
/* global Element */
/* eslint-disable consistent-return, max-len */
Element.prototype.matches = Element.prototype.matches || Element.prototype.msMatchesSelector;
Element.prototype.closest = function closest(selector, selectedElement = this) {
if (!selectedElement) return;
......
app/assets/javascripts/gfm_auto_complete.js.es6
View file @ f5bc41b3
......@@ -34,6 +34,8 @@
},
DefaultOptions: {
sorter: function(query, items, searchKey) {
// Highlight first item only if at least one char was typed
this.setting.highlightFirst = query.length > 0;
if ((items[0].name != null) && items[0].name === 'loading') {
return items;
}
......@@ -182,6 +184,7 @@
insertTpl: '${atwho-at}"${title}"',
data: ['loading'],
callbacks: {
sorter: this.DefaultOptions.sorter,
beforeSave: function(milestones) {
return $.map(milestones, function(m) {
if (m.title == null) {
......@@ -236,6 +239,7 @@
displayTpl: this.Labels.template,
insertTpl: '${atwho-at}${title}',
callbacks: {
sorter: this.DefaultOptions.sorter,
beforeSave: function(merges) {
var sanitizeLabelTitle;
sanitizeLabelTitle = function(title) {
......
app/assets/javascripts/issuable.js.es6
View file @ f5bc41b3
......@@ -10,6 +10,7 @@
Issuable.initSearch();
Issuable.initChecks();
Issuable.initResetFilters();
Issuable.resetIncomingEmailToken();
return Issuable.initLabelFilterRemove();
},
initTemplates: function() {
......@@ -154,6 +155,27 @@
this.issuableBulkActions.willUpdateLabels = false;
}
return true;
},
resetIncomingEmailToken: function() {
$('.incoming-email-token-reset').on('click', function(e) {
e.preventDefault();
$.ajax({
type: 'PUT',
url: $('.incoming-email-token-reset').attr('href'),
dataType: 'json',
success: function(response) {
$('#issue_email').val(response.new_issue_address).focus();
},
beforeSend: function() {
$('.incoming-email-token-reset').text('resetting...');
},
complete: function() {
$('.incoming-email-token-reset').text('reset it');
}
});
});
}
};
......
app/assets/javascripts/lib/utils/common_utils.js
View file @ f5bc41b3
......@@ -119,31 +119,12 @@
parser.href = url;
return parser;
};
gl.utils.cleanupBeforeFetch = function() {
// Unbind scroll events
$(document).off('scroll');
// Close any open tooltips
$('.has-tooltip, [data-toggle="tooltip"]').tooltip('destroy');
};
return jQuery.timefor = function(time, suffix, expiredLabel) {
var suffixFromNow, timefor;
if (!time) {
return '';
}
suffix || (suffix = 'remaining');
expiredLabel || (expiredLabel = 'Past due');
jQuery.timeago.settings.allowFuture = true;
suffixFromNow = jQuery.timeago.settings.strings.suffixFromNow;
jQuery.timeago.settings.strings.suffixFromNow = suffix;
timefor = $.timeago(time);
if (timefor.indexOf('ago') > -1) {
timefor = expiredLabel;
}
jQuery.timeago.settings.strings.suffixFromNow = suffixFromNow;
return timefor;
};
})(window);
}).call(this);
app/assets/javascripts/lib/utils/datetime_utility.js
View file @ f5bc41b3
......@@ -22,51 +22,64 @@
if (setTimeago == null) {
setTimeago = true;
}
$timeagoEls.each(function() {
var $el;
$el = $(this);
return $el.attr('title', gl.utils.formatDate($el.attr('datetime')));
var $el = $(this);
$el.attr('title', gl.utils.formatDate($el.attr('datetime')));
if (setTimeago) {
// Recreate with custom template
$el.tooltip({
template: '<div class="tooltip local-timeago" role="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>'
});
}
gl.utils.renderTimeago($el);
});
if (setTimeago) {
$timeagoEls.timeago();
$timeagoEls.tooltip('destroy');
// Recreate with custom template
return $timeagoEls.tooltip({
template: '<div class="tooltip local-timeago" role="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>'
});
}
};
w.gl.utils.shortTimeAgo = function($el) {
var shortLocale, tmpLocale;
shortLocale = {
prefixAgo: null,
prefixFromNow: null,
suffixAgo: 'ago',
suffixFromNow: 'from now',
seconds: '1 min',
minute: '1 min',
minutes: '%d mins',
hour: '1 hr',
hours: '%d hrs',
day: '1 day',
days: '%d days',
month: '1 month',
months: '%d months',
year: '1 year',
years: '%d years',
wordSeparator: ' ',
numbers: []
w.gl.utils.getTimeago = function() {
var locale = function(number, index) {
return [
['less than a minute ago', 'a while'],
['less than a minute ago', 'in %s seconds'],
['about a minute ago', 'in 1 minute'],
['%s minutes ago', 'in %s minutes'],
['about an hour ago', 'in 1 hour'],
['about %s hours ago', 'in %s hours'],
['a day ago', 'in 1 day'],
['%s days ago', 'in %s days'],
['a week ago', 'in 1 week'],
['%s weeks ago', 'in %s weeks'],
['a month ago', 'in 1 month'],
['%s months ago', 'in %s months'],
['a year ago', 'in 1 year'],
['%s years ago', 'in %s years']
][index];
};
tmpLocale = $.timeago.settings.strings;
$el.each(function(el) {
var $el1;
$el1 = $(this);
return $el1.attr('title', gl.utils.formatDate($el.attr('datetime')));
});
$.timeago.settings.strings = shortLocale;
$el.timeago();
$.timeago.settings.strings = tmpLocale;
timeago.register('gl_en', locale);
return timeago();
};
w.gl.utils.timeFor = function(time, suffix, expiredLabel) {
var timefor;
if (!time) {
return '';
}
suffix || (suffix = 'remaining');
expiredLabel || (expiredLabel = 'Past due');
timefor = gl.utils.getTimeago().format(time).replace('in', '');
if (timefor.indexOf('ago') > -1) {
timefor = expiredLabel;
} else {
timefor = timefor.trim() + ' ' + suffix;
}
return timefor;
};
w.gl.utils.renderTimeago = function($element) {
var timeagoInstance = gl.utils.getTimeago();
timeagoInstance.render($element, 'gl_en');
};
w.gl.utils.getDayDifference = function(a, b) {
......@@ -75,7 +88,7 @@
var date2 = Date.UTC(b.getFullYear(), b.getMonth(), b.getDate());
return Math.floor((date2 - date1) / millisecondsPerDay);
}
};
})(window);
......
app/assets/javascripts/lib/utils/timeago.js 0 → 100644
View file @ f5bc41b3
/**
* Copyright (c) 2016 hustcc
* License: MIT
* Version: v2.0.2
* https://github.com/hustcc/timeago.js
* This is a forked from (https://gitlab.com/ClemMakesApps/timeago.js)
**/
/* eslint-disable */
/* jshint expr: true */
!function (root, factory) {
if (typeof module === 'object' && module.exports)
module.exports = factory(root);
else
root.timeago = factory(root);
}(typeof window !== 'undefined' ? window : this,
function () {
var cnt = 0, // the timer counter, for timer key
indexMapEn = 'second_minute_hour_day_week_month_year'.split('_'),
// build-in locales: en & zh_CN
locales = {
'en': function(number, index) {
if (index === 0) return ['just now', 'right now'];
var unit = indexMapEn[parseInt(index / 2)];
if (number > 1) unit += 's';
return [number + ' ' + unit + ' ago', 'in ' + number + ' ' + unit];
},
},
// second, minute, hour, day, week, month, year(365 days)
SEC_ARRAY = [60, 60, 24, 7, 365/7/12, 12],
SEC_ARRAY_LEN = 6,
ATTR_DATETIME = 'datetime';
// format Date / string / timestamp to Date instance.
function toDate(input) {
if (input instanceof Date) return input;
if (!isNaN(input)) return new Date(toInt(input));
if (/^\d+$/.test(input)) return new Date(toInt(input, 10));
input = (input || '').trim().replace(/\.\d+/, '') // remove milliseconds
.replace(/-/, '/').replace(/-/, '/')
.replace(/T/, ' ').replace(/Z/, ' UTC')
.replace(/([\+\-]\d\d)\:?(\d\d)/, ' $1$2'); // -04:00 -> -0400
return new Date(input);
}
// change f into int, remove Decimal. just for code compression
function toInt(f) {
return parseInt(f);
}
// format the diff second to *** time ago, with setting locale
function formatDiff(diff, locale, defaultLocale) {
// if locale is not exist, use defaultLocale.
// if defaultLocale is not exist, use build-in `en`.
// be sure of no error when locale is not exist.
locale = locales[locale] ? locale : (locales[defaultLocale] ? defaultLocale : 'en');
// if (! locales[locale]) locale = defaultLocale;
var i = 0;
agoin = diff < 0 ? 1 : 0; // timein or timeago
diff = Math.abs(diff);
for (; diff >= SEC_ARRAY[i] && i < SEC_ARRAY_LEN; i++) {
diff /= SEC_ARRAY[i];
}
diff = toInt(diff);
i *= 2;
if (diff > (i === 0 ? 9 : 1)) i += 1;
return locales[locale](diff, i)[agoin].replace('%s', diff);
}
// calculate the diff second between date to be formated an now date.
function diffSec(date, nowDate) {
nowDate = nowDate ? toDate(nowDate) : new Date();
return (nowDate - toDate(date)) / 1000;
}
/**
* nextInterval: calculate the next interval time.
* - diff: the diff sec between now and date to be formated.
*
* What's the meaning?
* diff = 61 then return 59
* diff = 3601 (an hour + 1 second), then return 3599
* make the interval with high performace.
**/
function nextInterval(diff) {
var rst = 1, i = 0, d = Math.abs(diff);
for (; diff >= SEC_ARRAY[i] && i < SEC_ARRAY_LEN; i++) {
diff /= SEC_ARRAY[i];
rst *= SEC_ARRAY[i];
}
// return leftSec(d, rst);
d = d % rst;
d = d ? rst - d : rst;
return Math.ceil(d);
}
// get the datetime attribute, jQuery and DOM
function getDateAttr(node) {
if (node.getAttribute) return node.getAttribute(ATTR_DATETIME);
if(node.attr) return node.attr(ATTR_DATETIME);
}
/**
* timeago: the function to get `timeago` instance.
* - nowDate: the relative date, default is new Date().
* - defaultLocale: the default locale, default is en. if your set it, then the `locale` parameter of format is not needed of you.
*
* How to use it?
* var timeagoLib = require('timeago.js');
* var timeago = timeagoLib(); // all use default.
* var timeago = timeagoLib('2016-09-10'); // the relative date is 2016-09-10, so the 2016-09-11 will be 1 day ago.
* var timeago = timeagoLib(null, 'zh_CN'); // set default locale is `zh_CN`.
* var timeago = timeagoLib('2016-09-10', 'zh_CN'); // the relative date is 2016-09-10, and locale is zh_CN, so the 2016-09-11 will be 1天前.
**/
function Timeago(nowDate, defaultLocale) {
var timers = {}; // real-time render timers
// if do not set the defaultLocale, set it with `en`
if (! defaultLocale) defaultLocale = 'en'; // use default build-in locale
// what the timer will do
function doRender(node, date, locale, cnt) {
var diff = diffSec(date, nowDate);
node.innerHTML = formatDiff(diff, locale, defaultLocale);
// waiting %s seconds, do the next render
timers['k' + cnt] = setTimeout(function() {
doRender(node, date, locale, cnt);
}, nextInterval(diff) * 1000);
}
/**
* nextInterval: calculate the next interval time.
* - diff: the diff sec between now and date to be formated.
*
* What's the meaning?
* diff = 61 then return 59
* diff = 3601 (an hour + 1 second), then return 3599
* make the interval with high performace.
**/
// this.nextInterval = function(diff) { // for dev test
// var rst = 1, i = 0, d = Math.abs(diff);
// for (; diff >= SEC_ARRAY[i] && i < SEC_ARRAY_LEN; i++) {
// diff /= SEC_ARRAY[i];
// rst *= SEC_ARRAY[i];
// }
// // return leftSec(d, rst);
// d = d % rst;
// d = d ? rst - d : rst;
// return Math.ceil(d);
// }; // for dev test
/**
* format: format the date to *** time ago, with setting or default locale
* - date: the date / string / timestamp to be formated
* - locale: the formated string's locale name, e.g. en / zh_CN
*
* How to use it?
* var timeago = require('timeago.js')();
* timeago.format(new Date(), 'pl'); // Date instance
* timeago.format('2016-09-10', 'fr'); // formated date string
* timeago.format(1473473400269); // timestamp with ms
**/
this.format = function(date, locale) {
return formatDiff(diffSec(date, nowDate), locale, defaultLocale);
};
/**
* render: render the DOM real-time.
* - nodes: which nodes will be rendered.
* - locale: the locale name used to format date.
*
* How to use it?
* var timeago = new require('timeago.js')();
* // 1. javascript selector
* timeago.render(document.querySelectorAll('.need_to_be_rendered'));
* // 2. use jQuery selector
* timeago.render($('.need_to_be_rendered'), 'pl');
*
* Notice: please be sure the dom has attribute `datetime`.
**/
this.render = function(nodes, locale) {
if (nodes.length === undefined) nodes = [nodes];
for (var i = 0; i < nodes.length; i++) {
doRender(nodes[i], getDateAttr(nodes[i]), locale, ++ cnt); // render item
}
};
/**
* cancel: cancel all the timers which are doing real-time render.
*
* How to use it?
* var timeago = new require('timeago.js')();
* timeago.render(document.querySelectorAll('.need_to_be_rendered'));
* timeago.cancel(); // will stop all the timer, stop render in real time.
**/
this.cancel = function() {
for (var key in timers) {
clearTimeout(timers[key]);
}
timers = {};
};
/**
* setLocale: set the default locale name.
*
* How to use it?
* var timeago = require('timeago.js');
* timeago = new timeago();
* timeago.setLocale('fr');
**/
this.setLocale = function(locale) {
defaultLocale = locale;
};
return this;
}
/**
* timeago: the function to get `timeago` instance.
* - nowDate: the relative date, default is new Date().
* - defaultLocale: the default locale, default is en. if your set it, then the `locale` parameter of format is not needed of you.
*
* How to use it?
* var timeagoLib = require('timeago.js');
* var timeago = timeagoLib(); // all use default.
* var timeago = timeagoLib('2016-09-10'); // the relative date is 2016-09-10, so the 2016-09-11 will be 1 day ago.
* var timeago = timeagoLib(null, 'zh_CN'); // set default locale is `zh_CN`.
* var timeago = timeagoLib('2016-09-10', 'zh_CN'); // the relative date is 2016-09-10, and locale is zh_CN, so the 2016-09-11 will be 1天前.
**/
function timeagoFactory(nowDate, defaultLocale) {
return new Timeago(nowDate, defaultLocale);
}
/**
* register: register a new language locale
* - locale: locale name, e.g. en / zh_CN, notice the standard.
* - localeFunc: the locale process function
*
* How to use it?
* var timeagoLib = require('timeago.js');
*
* timeagoLib.register('the locale name', the_locale_func);
* // or
* timeagoLib.register('pl', require('timeago.js/locales/pl'));
**/
timeagoFactory.register = function(locale, localeFunc) {
locales[locale] = localeFunc;
};
return timeagoFactory;
});
\ No newline at end of file
app/assets/javascripts/merge_conflicts/components/diff_file_editor.js.es6
View file @ f5bc41b3
......@@ -36,7 +36,7 @@
this.loadEditor();
}
},
ready() {
mounted() {
if (this.file.loadEditor) {
this.loadEditor();
}
......
app/assets/javascripts/merge_conflicts/components/parallel_conflict_line.js.es6 deleted 100644 → 0
View file @ 92aa4028
/* eslint-disable */
((global) => {
global.mergeConflicts = global.mergeConflicts || {};
global.mergeConflicts.parallelConflictLine = Vue.extend({
props: {
file: Object,
line: Object
},
mixins: [global.mergeConflicts.utils, global.mergeConflicts.actions],
template: '#parallel-conflict-line'
});
})(window.gl || (window.gl = {}));
app/assets/javascripts/merge_conflicts/components/parallel_conflict_lines.js.es6
View file @ f5bc41b3
......@@ -7,10 +7,22 @@
props: {
file: Object
},
mixins: [global.mergeConflicts.utils],
components: {
'parallel-conflict-line': gl.mergeConflicts.parallelConflictLine
}
mixins: [global.mergeConflicts.utils, global.mergeConflicts.actions],
template: `
<table>
<tr class="line_holder parallel" v-for="section in file.parallelLines">
<template v-for="line in section">
<td class="diff-line-num header" :class="lineCssClass(line)" v-if="line.isHeader"></td>
<td class="line_content header" :class="lineCssClass(line)" v-if="line.isHeader">
<strong>{{line.richText}}</strong>
<button class="btn" @click="handleSelected(file, line.id, line.section)">{{line.buttonTitle}}</button>
</td>
<td class="diff-line-num old_line" :class="lineCssClass(line)" v-if="!line.isHeader">{{line.lineNumber}}</td>
<td class="line_content parallel" :class="lineCssClass(line)" v-if="!line.isHeader" v-html="line.richText"></td>
</template>
</tr>
</table>
`,
});
})(window.gl || (window.gl = {}));
app/assets/javascripts/merge_conflicts/merge_conflicts_bundle.js.es6
View file @ f5bc41b3
......@@ -6,7 +6,6 @@
//= require ./mixins/line_conflict_actions
//= require ./components/diff_file_editor
//= require ./components/inline_conflict_lines
//= require ./components/parallel_conflict_line
//= require ./components/parallel_conflict_lines
$(() => {
......@@ -49,7 +48,7 @@ $(() => {
mergeConflictsStore.setLoadingState(false);
this.$nextTick(() => {
$(conflictsEl.querySelectorAll('.js-syntax-highlight')).syntaxHighlight();
$('.js-syntax-highlight').syntaxHighlight();
});
});
},
......
app/assets/javascripts/merge_request_tabs.js
View file @ f5bc41b3
......@@ -130,7 +130,7 @@
MergeRequestTabs.prototype.scrollToElement = function(container) {
var $el, navBarHeight;
if (window.location.hash) {
navBarHeight = $('.navbar-gitlab').outerHeight() + $('.layout-nav').outerHeight();
navBarHeight = $('.navbar-gitlab').outerHeight() + $('.layout-nav').outerHeight() + document.querySelector('.js-tabs-affix').offsetHeight;
$el = $(container + " " + window.location.hash + ":not(.match)");
if ($el.length) {
return $.scrollTo(container + " " + window.location.hash + ":not(.match)", {
......@@ -227,8 +227,8 @@
return function(data) {
$('#diffs').html(data.html);
if (typeof DiffNotesApp !== 'undefined') {
DiffNotesApp.compileComponents();
if (typeof gl.diffNotesCompileComponents !== 'undefined') {
gl.diffNotesCompileComponents();
}
gl.utils.localTimeAgo($('.js-timeago', 'div#diffs'));
......
app/assets/javascripts/merge_request_widget.js.es6
View file @ f5bc41b3
......@@ -218,7 +218,7 @@
}
if (environment.deployed_at && environment.deployed_at_formatted) {
environment.deployed_at = $.timeago(environment.deployed_at) + '.';
environment.deployed_at = gl.utils.getTimeago(environment.deployed_at) + '.';
} else {
$('.js-environment-timeago', $template).remove();
environment.name += '.';
......
app/assets/javascripts/milestone_select.js
View file @ f5bc41b3
......@@ -162,7 +162,7 @@
if (data.milestone != null) {
data.milestone.namespace = _this.currentProject.namespace;
data.milestone.path = _this.currentProject.path;
data.milestone.remaining = $.timefor(data.milestone.due_date);
data.milestone.remaining = gl.utils.timeFor(data.milestone.due_date);
$value.html(milestoneLinkTemplate(data.milestone));
return $sidebarCollapsedValue.find('span').html(collapsedSidebarLabelTemplate(data.milestone));
} else {
......
app/assets/javascripts/network/network_bundle.js
View file @ f5bc41b3
......@@ -9,6 +9,8 @@
(function() {
$(function() {
if (!$(".network-graph").length) return;
var network_graph;
network_graph = new Network({
url: $(".network-graph").attr('data-url'),
......
app/assets/javascripts/notes.js
View file @ f5bc41b3
......@@ -325,8 +325,8 @@
discussionContainer.append(note_html);
}
if (typeof DiffNotesApp !== 'undefined') {
DiffNotesApp.compileComponents();
if (typeof gl.diffNotesCompileComponents !== 'undefined') {
gl.diffNotesCompileComponents();
}
gl.utils.localTimeAgo($('.js-timeago', note_html), false);
......@@ -466,8 +466,8 @@
$note_li.replaceWith($html);
if (typeof DiffNotesApp !== 'undefined') {
DiffNotesApp.compileComponents();
if (typeof gl.diffNotesCompileComponents !== 'undefined') {
gl.diffNotesCompileComponents();
}
};
......@@ -559,11 +559,9 @@
note = $(el);
notes = note.closest(".notes");
if (typeof DiffNotesApp !== "undefined" && DiffNotesApp !== null) {
ref = DiffNotesApp.$refs[noteId];
if (ref) {
ref.$destroy(true);
if (typeof gl.diffNotesCompileComponents !== 'undefined') {
if (gl.diffNoteApps[noteId]) {
gl.diffNoteApps[noteId].$destroy();
}
}
......@@ -643,11 +641,12 @@
form.find('.js-note-target-close').remove();
this.setupNoteForm(form);
if (typeof DiffNotesApp !== 'undefined') {
if (typeof gl.diffNotesCompileComponents !== 'undefined') {
var $commentBtn = form.find('comment-and-resolve-btn');
$commentBtn
.attr(':discussion-id', "'" + dataHolder.data('discussionId') + "'");
DiffNotesApp.$compile($commentBtn.get(0));
gl.diffNotesCompileComponents();
}
form.find(".js-note-text").focus();
......
app/assets/javascripts/single_file_diff.js
View file @ f5bc41b3
......@@ -45,15 +45,15 @@
this.content.hide();
this.$toggleIcon.addClass('fa-caret-right').removeClass('fa-caret-down');
this.collapsedContent.show();
if (typeof DiffNotesApp !== 'undefined') {
DiffNotesApp.compileComponents();
if (typeof gl.diffNotesCompileComponents !== 'undefined') {
gl.diffNotesCompileComponents();
}
} else if (this.content) {
this.collapsedContent.hide();
this.content.show();
this.$toggleIcon.addClass('fa-caret-down').removeClass('fa-caret-right');
if (typeof DiffNotesApp !== 'undefined') {
DiffNotesApp.compileComponents();
if (typeof gl.diffNotesCompileComponents !== 'undefined') {
gl.diffNotesCompileComponents();
}
} else {
this.$toggleIcon.addClass('fa-caret-down').removeClass('fa-caret-right');
......@@ -76,8 +76,8 @@
}
_this.collapsedContent.after(_this.content);
if (typeof DiffNotesApp !== 'undefined') {
DiffNotesApp.compileComponents();
if (typeof gl.diffNotesCompileComponents !== 'undefined') {
gl.diffNotesCompileComponents();
}
if (cb) cb();
......
app/assets/javascripts/users_select.js
View file @ f5bc41b3
......@@ -23,6 +23,8 @@
$dropdown = $(dropdown);
options.projectId = $dropdown.data('project-id');
options.showCurrentUser = $dropdown.data('current-user');
options.todoFilter = $dropdown.data('todo-filter');
options.todoStateFilter = $dropdown.data('todo-state-filter');
showNullUser = $dropdown.data('null-user');
showMenuAbove = $dropdown.data('showMenuAbove');
showAnyUser = $dropdown.data('any-user');
......@@ -394,6 +396,8 @@
project_id: options.projectId || null,
group_id: options.groupId || null,
skip_ldap: options.skipLdap || null,
todo_filter: options.todoFilter || null,
todo_state_filter: options.todoStateFilter || null,
current_user: options.showCurrentUser || null,
push_code_to_protected_branches: options.pushCodeToProtectedBranches || null,
author_id: options.authorId || null,
......
app/assets/stylesheets/framework/avatar.scss
View file @ f5bc41b3
......@@ -4,7 +4,7 @@
margin-right: $margin-right;
}
.avatar-container {
.avatar-circle {
float: left;
margin-right: 15px;
border-radius: $avatar_radius;
......@@ -27,7 +27,7 @@
}
.avatar {
@extend .avatar-container;
@extend .avatar-circle;
width: 40px;
height: 40px;
padding: 0;
......@@ -64,8 +64,8 @@
&.s160 { font-size: 96px; line-height: 158px; }
}
.image-container {
@extend .avatar-container;
.avatar-container {
@extend .avatar-circle;
overflow: hidden;
display: flex;
......@@ -76,4 +76,4 @@
margin: 0;
align-self: center;
}
}
\ No newline at end of file
}
app/assets/stylesheets/framework/buttons.scss
View file @ f5bc41b3
......@@ -6,7 +6,6 @@
&:focus,
&:active {
outline: none;
background-color: $btn-active-gray;
box-shadow: $gl-btn-active-background;
}
......@@ -267,10 +266,6 @@
outline: none;
}
&:focus {
outline: none;
}
&:active {
outline: none;
}
......
app/assets/stylesheets/framework/dropdowns.scss
View file @ f5bc41b3
......@@ -38,7 +38,6 @@
text-align: left;
border: 1px solid $border-color;
border-radius: $border-radius-base;
outline: 0;
text-overflow: ellipsis;
white-space: nowrap;
overflow: hidden;
......@@ -55,6 +54,10 @@
}
}
&.no-outline {
outline: 0;
}
&:hover, {
border-color: $dropdown-toggle-hover-border-color;
......
app/assets/stylesheets/framework/header.scss
View file @ f5bc41b3
......@@ -63,6 +63,7 @@ header {
&:focus,
&:active {
background-color: $background-color;
color: darken($gl-icon-color, 50%);
}
.fa-caret-down {
......@@ -100,10 +101,6 @@ header {
&:hover {
background-color: $btn-gray-hover;
}
&:focus {
outline: none;
}
}
}
......@@ -195,6 +192,10 @@ header {
font-size: 10px;
text-align: center;
cursor: pointer;
&:hover {
color: darken($color: $gl-text-color, $amount: 50%);
}
}
.project-item-select {
......
app/assets/stylesheets/framework/mobile.scss
View file @ f5bc41b3
......@@ -71,7 +71,7 @@
display: none;
}
.group-right-buttons {
.group-buttons {
display: none;
}
......
app/assets/stylesheets/framework/nav.scss
View file @ f5bc41b3
......@@ -58,7 +58,6 @@
&:active,
&:focus {
text-decoration: none;
outline: none;
}
}
......
app/assets/stylesheets/framework/selects.scss
View file @ f5bc41b3
......@@ -63,7 +63,7 @@
}
.select2-highlighted {
background: #3084bb !important;
background: $gl-link-color !important;
}
.select2-results li.select2-result-with-children > .select2-result-label {
......
app/assets/stylesheets/framework/sidebar.scss
View file @ f5bc41b3
......@@ -83,7 +83,6 @@
display: block;
text-decoration: none;
font-weight: normal;
outline: none;
&:hover,
&:active,
......
app/assets/stylesheets/framework/variables.scss
View file @ f5bc41b3
......@@ -103,7 +103,7 @@ $gl-text-color-light: #8c8c8c;
$gl-text-green: #4a2;
$gl-text-red: #d12f19;
$gl-text-orange: #d90;
$gl-link-color: #3084bb;
$gl-link-color: #3777b0;
$gl-dark-link-color: #333;
$gl-placeholder-color: #8f8f8f;
$gl-icon-color: $gl-placeholder-color;
......@@ -197,7 +197,7 @@ $line-number-new: #ddfbe6;
$line-number-select: #fbf2da;
$match-line: $gray-light;
$table-border-gray: #f0f0f0;
$line-target-blue: #eaf3fc;
$line-target-blue: #f6faff;
$line-select-yellow: #fcf8e7;
$line-select-yellow-dark: #f0e2bd;
......
app/assets/stylesheets/pages/boards.scss
View file @ f5bc41b3
......@@ -166,8 +166,12 @@
}
}
.board-list {
.board-list-component {
height: calc(100% - 49px);
}
.board-list {
height: 100%;
margin-bottom: 0;
padding: 5px;
list-style: none;
......@@ -175,7 +179,7 @@
overflow-x: hidden;
&.is-smaller {
height: calc(100% - 185px);
height: calc(100% - 136px);
}
}
......
app/assets/stylesheets/pages/builds.scss
View file @ f5bc41b3
......@@ -14,18 +14,10 @@
}
}
.autoscroll-container {
position: fixed;
bottom: 20px;
right: 20px;
z-index: 100;
}
.scroll-controls {
&.affix-top {
position: absolute;
top: 10px;
right: 25px;
.scroll-step {
width: 31px;
margin: 0 0 0 auto;
}
&.affix-bottom {
......@@ -34,13 +26,13 @@
}
&.affix {
right: 30px;
right: 25px;
bottom: 15px;
z-index: 1;
}
@media (min-width: $screen-md-min) {
right: 26%;
}
&.sidebar-expanded {
right: #{$gutter_width + ($gl-padding * 2)};
}
a {
......
app/assets/stylesheets/pages/commit.scss
View file @ f5bc41b3
......@@ -36,9 +36,42 @@
padding: 10px 0;
margin-bottom: 0;
.commit-options-dropdown-caret {
@media (max-width: $screen-sm) {
margin-left: 0;
@media (min-width: $screen-sm-min) {
display: flex;
align-items: center;
.commit-meta {
flex: 1;
}
}
.commit-hash-full {
@media (max-width: $screen-sm-max) {
width: 80px;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
display: inline-block;
vertical-align: bottom;
}
}
.commit-action-buttons {
i {
color: $gl-icon-color;
font-size: 13px;
margin-right: 3px;
}
@media (max-width: $screen-xs-max) {
.dropdown {
width: 100%;
margin-top: 10px;
}
.dropdown-toggle {
width: 100%;
}
}
}
}
......@@ -188,17 +221,6 @@
}
}
.commit-action-buttons {
position: relative;
top: -1px;
i {
color: $gl-icon-color;
font-size: 13px;
margin-right: 3px;
}
}
/*
* Commit message textarea for web editor and
* custom merge request message
......
app/assets/stylesheets/pages/commits.scss
View file @ f5bc41b3
......@@ -62,6 +62,8 @@
.ci-status-link {
display: inline-block;
position: relative;
top: 1px;
}
.btn-clipboard,
......@@ -82,7 +84,8 @@
font-weight: 600;
}
.commit {
.commit,
.generic_commit_status {
padding: 10px 0;
position: relative;
......@@ -100,7 +103,6 @@
vertical-align: baseline;
}
.avatar {
margin-left: -46px;
}
......
app/assets/stylesheets/pages/diff.scss
View file @ f5bc41b3
......@@ -92,20 +92,6 @@
&.noteable_line {
position: relative;
&.old {
&::before {
content: '-';
position: absolute;
}
}
&.new {
&::before {
content: '+';
position: absolute;
}
}
}
span {
......@@ -151,8 +137,9 @@
.line_content {
display: block;
margin: 0;
padding: 0 0.5em;
padding: 0 1.5em;
border: none;
position: relative;
&.parallel {
display: table-cell;
......@@ -161,6 +148,22 @@
word-break: break-all;
}
}
&.old {
&::before {
content: '-';
position: absolute;
left: 0.5em;
}
}
&.new {
&::before {
content: '+';
position: absolute;
left: 0.5em;
}
}
}
.text-file.diff-wrap-lines table .line_holder td span {
......
app/assets/stylesheets/pages/groups.scss
View file @ f5bc41b3
......@@ -10,7 +10,6 @@
}
.group-row {
.stats {
float: right;
line-height: $list-text-height;
......@@ -23,36 +22,18 @@
}
.ldap-group-links {
.form-actions {
margin-bottom: $gl-padding;
}
}
.groups-cover-block {
.container-fluid {
position: relative;
}
.group-right-buttons {
position: absolute;
right: 16px;
.btn {
@include btn-gray;
padding: 3px 10px;
background-color: $background-color;
}
}
.group-avatar {
border: 0;
.group-buttons {
.notification-dropdown {
display: inline-block;
}
}
.groups-header {
@media (min-width: $screen-sm-min) {
.nav-links {
width: 35%;
......
app/assets/stylesheets/pages/issuable.scss
View file @ f5bc41b3
......@@ -267,20 +267,6 @@
}
}
.issuable-header-btn {
background: $gray-normal;
border: 1px solid $border-gray-normal;
&:hover {
background: $gray-dark;
border: 1px solid $border-gray-dark;
}
&.btn-primary {
@extend .btn-primary;
}
}
a {
&:hover {
color: $md-link-color;
......
app/assets/stylesheets/pages/merge_conflicts.scss
View file @ f5bc41b3
......@@ -228,7 +228,6 @@ $colors: (
position: absolute;
right: 10px;
padding: 0;
outline: none;
color: #fff;
width: 75px; // static width to make 2 buttons have same width
height: 19px;
......
app/assets/stylesheets/pages/merge_requests.scss
View file @ f5bc41b3
......@@ -47,6 +47,7 @@
&.right {
float: right;
padding-right: 0;
a {
color: $gl-gray;
......
app/assets/stylesheets/pages/pipelines.scss
View file @ f5bc41b3
......@@ -109,10 +109,6 @@
float: none;
}
.api {
color: $code-color;
}
.branch-commit {
.branch-name {
......
app/assets/stylesheets/pages/profile.scss
View file @ f5bc41b3
......@@ -23,6 +23,10 @@
color: $md-link-color;
}
.private-tokens-reset div.reset-action:not(:first-child) {
padding-top: 15px;
}
.oauth-buttons {
.btn-group {
margin-right: 10px;
......
app/assets/stylesheets/pages/projects.scss
View file @ f5bc41b3
......@@ -86,7 +86,8 @@
}
}
.project-home-panel {
.project-home-panel,
.group-home-panel {
padding-top: 24px;
padding-bottom: 24px;
......@@ -94,7 +95,8 @@
border-bottom: 1px solid $border-color;
}
.project-avatar {
.project-avatar,
.group-avatar {
float: none;
margin: 0 auto;
border: none;
......@@ -104,7 +106,8 @@
}
}
.project-title {
.project-title,
.group-title {
margin-top: 10px;
margin-bottom: 10px;
font-size: 24px;
......@@ -118,10 +121,11 @@
}
}
.project-home-desc {
.project-home-desc,
.group-home-desc {
margin-left: auto;
margin-right: auto;
margin-bottom: 15px;
margin-bottom: 0;
max-width: 700px;
> p {
......@@ -141,13 +145,18 @@
}
}
.project-repo-buttons {
font-size: 0;
.project-repo-buttons,
.group-buttons {
margin-top: 15px;
.btn {
@include btn-gray;
padding: 3px 10px;
&:last-child {
margin-left: 0;
}
.fa {
color: $layout-link-gray;
}
......@@ -168,7 +177,8 @@
}
}
.project-repo-btn-group,
.download-button,
.dropdown-toggle,
.notification-dropdown,
.project-dropdown {
margin-left: 10px;
......@@ -474,9 +484,7 @@ a.deploy-project-label {
margin-right: $gl-padding;
}
&.project-repo-buttons-right {
margin-top: 10px;
&.right {
@media (min-width: $screen-md-min) {
float: right;
margin-top: 0;
......
app/assets/stylesheets/pages/search.scss
View file @ f5bc41b3
......@@ -21,6 +21,11 @@
padding: 4px;
width: $search-input-width;
line-height: 24px;
&:hover {
border-color: lighten($dropdown-input-focus-border, 20%);
box-shadow: 0 0 4px lighten($search-input-focus-shadow-color, 20%);
}
}
.location-text {
......@@ -31,7 +36,6 @@
padding-right: 20px;
border: none;
font-size: 14px;
outline: none;
padding: 0;
margin-left: 5px;
line-height: 25px;
......@@ -154,6 +158,7 @@
width: 68%;
}
}
}
.search-holder {
......@@ -229,6 +234,6 @@
&:hover,
&:focus {
color: $gl-link-color;
outline: none;
}
}
app/controllers/admin/application_settings_controller.rb
View file @ f5bc41b3
......@@ -117,10 +117,18 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController
:send_user_confirmation_email,
:container_registry_token_expire_delay,
:enabled_git_access_protocol,
:sidekiq_throttling_enabled,
:sidekiq_throttling_factor,
:housekeeping_enabled,
:housekeeping_bitmaps_enabled,
:housekeeping_incremental_repack_period,
:housekeeping_full_repack_period,
:housekeeping_gc_period,
repository_storages: [],
restricted_visibility_levels: [],
import_sources: [],
disabled_oauth_sign_in_sources: []
disabled_oauth_sign_in_sources: [],
sidekiq_throttling_queues: []
)
end
end
app/controllers/application_controller.rb
View file @ f5bc41b3
......@@ -192,9 +192,10 @@ class ApplicationController < ActionController::Base
end
# JSON for infinite scroll via Pager object
def pager_json(partial, count)
def pager_json(partial, count, locals = {})
html = render_to_string(
partial,
locals: locals,
layout: false,
formats: [:html]
)
......
app/controllers/autocomplete_controller.rb
View file @ f5bc41b3
......@@ -11,9 +11,13 @@ class AutocompleteController < ApplicationController
@users = @users.reorder(:name)
@users = @users.page(params[:page])
if params[:todo_filter].present?
@users = @users.todo_authors(current_user.id, params[:todo_state_filter])
end
if params[:search].blank?
# Include current user if available to filter by "Me"
if params[:current_user] && current_user
if params[:current_user].present? && current_user
@users = [*@users, current_user]
end
......
app/controllers/concerns/diff_for_path.rb
View file @ f5bc41b3
......@@ -3,7 +3,7 @@ module DiffForPath
def render_diff_for_path(diffs)
diff_file = diffs.diff_files.find do |diff|
diff.old_path == params[:old_path] && diff.new_path == params[:new_path]
diff.file_identifier == params[:file_identifier]
end
return render_404 unless diff_file
......
app/controllers/groups/milestones_controller.rb
View file @ f5bc41b3
......@@ -58,7 +58,7 @@ class Groups::MilestonesController < Groups::ApplicationController
def render_new_with_error(empty_project_ids)
@milestone = Milestone.new(milestone_params)
@milestone.errors.add(:project_id, "Please select at least one project.") if empty_project_ids
@milestone.errors.add(:base, "Please select at least one project.") if empty_project_ids
render :new
end
......
app/controllers/help_controller.rb
View file @ f5bc41b3
......@@ -7,8 +7,8 @@ class HelpController < ApplicationController
@help_index = File.read(Rails.root.join('doc', 'README.md'))
# Prefix Markdown links with `help/` unless they already have been
# See http://rubular.com/r/nwwhzH6Z8X
@help_index.gsub!(/(\]\()(?!help\/)([^\)\(]+)(\))/, '\1help/\2\3')
# See http://rubular.com/r/ie2MlpdUMq
@help_index.gsub!(/(\]\()(\/?help\/)?([^\)\(]+\))/, '\1/help/\3')
end
def show
......
app/controllers/jwt_controller.rb
View file @ f5bc41b3
......@@ -12,7 +12,7 @@ class JwtController < ApplicationController
return head :not_found unless service
result = service.new(@authentication_result.project, @authentication_result.actor, auth_params).
execute(authentication_abilities: @authentication_result.authentication_abilities || [])
execute(authentication_abilities: @authentication_result.authentication_abilities)
render json: result, status: result[:http_status]
end
......@@ -20,7 +20,7 @@ class JwtController < ApplicationController
private
def authenticate_project_or_user
@authentication_result = Gitlab::Auth::Result.new
@authentication_result = Gitlab::Auth::Result.new(nil, nil, :none, Gitlab::Auth.read_authentication_abilities)
authenticate_with_http_basic do |login, password|
@authentication_result = Gitlab::Auth.find_for_git_client(login, password, project: nil, ip: request.ip)
......
app/controllers/profiles_controller.rb
View file @ f5bc41b3
......@@ -26,7 +26,15 @@ class ProfilesController < Profiles::ApplicationController
def reset_private_token
if current_user.reset_authentication_token!
flash[:notice] = "Token was successfully updated"
flash[:notice] = "Private token was successfully reset"
end
redirect_to profile_account_path
end
def reset_incoming_email_token
if current_user.reset_incoming_email_token!
flash[:notice] = "Incoming email token was successfully reset"
end
redirect_to profile_account_path
......
app/controllers/projects/commits_controller.rb
View file @ f5bc41b3
......@@ -26,8 +26,15 @@ class Projects::CommitsController < Projects::ApplicationController
respond_to do |format|
format.html
format.json { pager_json("projects/commits/_commits", @commits.size) }
format.atom { render layout: false }
format.json do
pager_json(
'projects/commits/_commits',
@commits.size,
project: @project,
ref: @ref)
end
end
end
end
app/controllers/projects/git_http_client_controller.rb
View file @ f5bc41b3
......@@ -21,10 +21,6 @@ class Projects::GitHttpClientController < Projects::ApplicationController
def authenticate_user
@authentication_result = Gitlab::Auth::Result.new
if project && project.public? && download_request?
return # Allow access
end
if allow_basic_auth? && basic_auth_provided?
login, password = user_name_and_password(request)
......@@ -41,6 +37,10 @@ class Projects::GitHttpClientController < Projects::ApplicationController
send_final_spnego_response
return # Allow access
end
elsif project && download_request? && Guest.can?(:download_code, project)
@authentication_result = Gitlab::Auth::Result.new(nil, project, :none, [:download_code])
return # Allow access
end
send_challenges
......
app/controllers/projects/git_http_controller.rb
View file @ f5bc41b3
......@@ -78,11 +78,7 @@ class Projects::GitHttpController < Projects::GitHttpClientController
def upload_pack_allowed?
return false unless Gitlab.config.gitlab_shell.upload_pack
if user
access_check.allowed?
else
ci? || project.public?
end
access_check.allowed? || ci?
end
def access
......
app/controllers/projects/group_links_controller.rb
View file @ f5bc41b3
......@@ -7,7 +7,7 @@ class Projects::GroupLinksController < Projects::ApplicationController
@group_links = project.project_group_links.all
@skip_groups = @group_links.pluck(:group_id)
@skip_groups << project.group.try(:id)
@skip_groups << project.namespace_id unless project.personal?
end
def create
......
app/controllers/projects/merge_requests_controller.rb
View file @ f5bc41b3
......@@ -352,13 +352,23 @@ class Projects::MergeRequestsController < Projects::ApplicationController
def branch_from
# This is always source
@source_project = @merge_request.nil? ? @project : @merge_request.source_project
@commit = @repository.commit(params[:ref]) if params[:ref].present?
if params[:ref].present?
@ref = params[:ref]
@commit = @repository.commit(@ref)
end
render layout: false
end
def branch_to
@target_project = selected_target_project
@commit = @target_project.commit(params[:ref]) if params[:ref].present?
if params[:ref].present?
@ref = params[:ref]
@commit = @target_project.commit(@ref)
end
render layout: false
end
......@@ -497,6 +507,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController
@merge_request.close
end
labels
define_pipelines_vars
end
......@@ -589,12 +600,27 @@ class Projects::MergeRequestsController < Projects::ApplicationController
end
def merge_request_params
params.require(:merge_request).permit(
:title, :assignee_id, :source_project_id, :source_branch,
:target_project_id, :target_branch, :milestone_id,
:state_event, :description, :task_num, :force_remove_source_branch,
:lock_version, label_ids: []
)
params.require(:merge_request)
.permit(merge_request_params_ce)
end
def merge_request_params_ce
[
:assignee_id,
:description,
:force_remove_source_branch,
:lock_version,
:milestone_id,
:source_branch,
:source_project_id,
:state_event,
:target_branch,
:target_project_id,
:task_num,
:title,
label_ids: []
]
end
def merge_params
......
app/controllers/projects/network_controller.rb
View file @ f5bc41b3
......@@ -5,17 +5,29 @@ class Projects::NetworkController < Projects::ApplicationController
before_action :require_non_empty_project
before_action :assign_ref_vars
before_action :authorize_download_code!
before_action :assign_commit
def show
@url = namespace_project_network_path(@project.namespace, @project, @ref, @options.merge(format: :json))
@commit_url = namespace_project_commit_path(@project.namespace, @project, 'ae45ca32').gsub("ae45ca32", "%s")
respond_to do |format|
format.html
format.html do
if @options[:extended_sha1] && !@commit
flash.now[:alert] = "Git revision '#{@options[:extended_sha1]}' does not exist."
end
end
format.json do
@graph = Network::Graph.new(project, @ref, @commit, @options[:filter_ref])
end
end
end
def assign_commit
return if params[:extended_sha1].blank?
@options[:extended_sha1] = params[:extended_sha1]
@commit = @repo.commit(@options[:extended_sha1])
end
end
app/controllers/projects/pipelines_controller.rb
View file @ f5bc41b3
......@@ -18,7 +18,9 @@ class Projects::PipelinesController < Projects::ApplicationController
end
def create
@pipeline = Ci::CreatePipelineService.new(project, current_user, create_params).execute(ignore_skip_ci: true, save_on_errors: false)
@pipeline = Ci::CreatePipelineService
.new(project, current_user, create_params)
.execute(ignore_skip_ci: true, save_on_errors: false)
unless @pipeline.persisted?
render 'new'
return
......
app/controllers/projects_controller.rb
View file @ f5bc41b3
......@@ -2,9 +2,9 @@ class ProjectsController < Projects::ApplicationController
include IssuableCollections
include ExtractsPath
before_action :authenticate_user!, except: [:show, :activity, :refs]
before_action :project, except: [:new, :create]
before_action :repository, except: [:new, :create]
before_action :authenticate_user!, except: [:index, :show, :activity, :refs]
before_action :project, except: [:index, :new, :create]
before_action :repository, except: [:index, :new, :create]
before_action :assign_ref_vars, only: [:show], if: :repo_exists?
before_action :tree, only: [:show], if: [:repo_exists?, :project_view_files?]
......@@ -160,6 +160,13 @@ class ProjectsController < Projects::ApplicationController
end
end
def new_issue_address
return render_404 unless Gitlab::IncomingEmail.supports_issue_creation?
current_user.reset_incoming_email_token!
render json: { new_issue_address: @project.new_issue_address(current_user) }
end
def archive
return access_denied! unless can?(current_user, :archive_project, @project)
......@@ -318,25 +325,44 @@ class ProjectsController < Projects::ApplicationController
end
def project_params
project_feature_attributes =
{
project_feature_attributes:
[
:issues_access_level, :builds_access_level,
:wiki_access_level, :merge_requests_access_level,
:snippets_access_level, :repository_access_level
]
}
params.require(:project)
.permit(project_params_ce)
end
params.require(:project).permit(
:name, :path, :description, :issues_tracker, :tag_list, :runners_token,
def project_params_ce
[
:avatar,
:build_allow_git_fetch,
:build_coverage_regex,
:build_timeout_in_minutes,
:container_registry_enabled,
:issues_tracker_id, :default_branch,
:visibility_level, :import_url, :last_activity_at, :namespace_id, :avatar,
:build_allow_git_fetch, :build_timeout_in_minutes, :build_coverage_regex,
:public_builds, :only_allow_merge_if_build_succeeds, :request_access_enabled,
:lfs_enabled, project_feature_attributes
)
:default_branch,
:description,
:import_url,
:issues_tracker,
:issues_tracker_id,
:last_activity_at,
:lfs_enabled,
:name,
:namespace_id,
:only_allow_merge_if_all_discussions_are_resolved,
:only_allow_merge_if_build_succeeds,
:path,
:public_builds,
:request_access_enabled,
:runners_token,
:tag_list,
:visibility_level,
project_feature_attributes: %i[
builds_access_level
issues_access_level
merge_requests_access_level
repository_access_level
snippets_access_level
wiki_access_level
]
]
end
def repo_exists?
......
app/controllers/search_controller.rb
View file @ f5bc41b3
......@@ -16,7 +16,7 @@ class SearchController < ApplicationController
@group = nil unless can?(current_user, :read_group, @group)
end
return if params[:search].nil? || params[:search].blank?
return if params[:search].blank?
@search_term = params[:search]
......
app/controllers/users_controller.rb
View file @ f5bc41b3
......@@ -104,8 +104,7 @@ class UsersController < ApplicationController
end
def contributions_calendar
@contributions_calendar ||= Gitlab::ContributionsCalendar.
new(contributed_projects, user)
@contributions_calendar ||= Gitlab::ContributionsCalendar.new(user, current_user)
end
def load_events
......
app/finders/issuable_finder.rb
View file @ f5bc41b3
......@@ -61,31 +61,26 @@ class IssuableFinder
def project
return @project if defined?(@project)
if project?
@project = Project.find(params[:project_id])
project = Project.find(params[:project_id])
project = nil unless Ability.allowed?(current_user, :"read_#{klass.to_ability_name}", project)
unless Ability.allowed?(current_user, :read_project, @project)
@project = nil
end
else
@project = nil
end
@project
@project = project
end
def projects
return @projects if defined?(@projects)
return @projects = project if project?
if project?
@projects = project
elsif current_user && params[:authorized_only].presence && !current_user_related?
@projects = current_user.authorized_projects.reorder(nil)
elsif group
@projects = GroupProjectsFinder.new(group).execute(current_user).reorder(nil)
else
@projects = ProjectsFinder.new.execute(current_user).reorder(nil)
end
projects =
if current_user && params[:authorized_only].presence && !current_user_related?
current_user.authorized_projects
elsif group
GroupProjectsFinder.new(group).execute(current_user)
else
ProjectsFinder.new.execute(current_user)
end
@projects = projects.with_feature_available_for_user(klass, current_user).reorder(nil)
end
def search
......
app/helpers/accounts_helper.rb 0 → 100644
View file @ f5bc41b3
module AccountsHelper
def incoming_email_token_enabled?
current_user.incoming_email_token && Gitlab::IncomingEmail.supports_issue_creation?
end
end
app/helpers/application_helper.rb
View file @ f5bc41b3
......@@ -151,7 +151,6 @@ module ApplicationHelper
# time - Time object
# placement - Tooltip placement String (default: "top")
# html_class - Custom class for `time` element (default: "time_ago")
# skip_js - When true, exclude the `script` tag (default: false)
#
# By default also includes a `script` element with Javascript necessary to
# initialize the `timeago` jQuery extension. If this method is called many
......@@ -163,22 +162,19 @@ module ApplicationHelper
# `html_class` argument is provided.
#
# Returns an HTML-safe String
def time_ago_with_tooltip(time, placement: 'top', html_class: '', skip_js: false, short_format: false)
def time_ago_with_tooltip(time, placement: 'top', html_class: '', short_format: false)
css_classes = short_format ? 'js-short-timeago' : 'js-timeago'
css_classes << " #{html_class}" unless html_class.blank?
css_classes << ' js-timeago-pending' unless skip_js
element = content_tag :time, time.to_s,
class: css_classes,
datetime: time.to_time.getutc.iso8601,
title: time.to_time.in_time_zone.to_s(:medium),
data: { toggle: 'tooltip', placement: placement, container: 'body' }
unless skip_js
element << javascript_tag(
"$('.js-timeago-pending').removeClass('js-timeago-pending').timeago()"
)
end
datetime: time.to_time.getutc.iso8601,
data: {
toggle: 'tooltip',
placement: placement,
container: 'body'
}
element
end
......
app/helpers/application_settings_helper.rb
View file @ f5bc41b3
......@@ -100,4 +100,8 @@ module ApplicationSettingsHelper
options_for_select(options, @application_setting.repository_storages)
end
def sidekiq_queue_options_for_select
options_for_select(Sidekiq::Queue.all.map(&:name), @application_setting.sidekiq_throttling_queues)
end
end
app/helpers/auth_helper.rb
View file @ f5bc41b3
......@@ -3,7 +3,7 @@ module AuthHelper
FORM_BASED_PROVIDERS = [/\Aldap/, 'crowd'].freeze
def ldap_enabled?
Gitlab.config.ldap.enabled
Gitlab::LDAP::Config.enabled?
end
def omniauth_enabled?
......
app/helpers/blob_helper.rb
View file @ f5bc41b3
......@@ -179,33 +179,6 @@ module BlobHelper
}
end
def selected_template(issuable)
templates = issuable_templates(issuable)
params[:issuable_template] if templates.include?(params[:issuable_template])
end
def can_add_template?(issuable)
names = issuable_templates(issuable)
names.empty? && can?(current_user, :push_code, @project) && !@project.private?
end
def merge_request_template_names
@merge_request_templates ||= Gitlab::Template::MergeRequestTemplate.dropdown_names(ref_project)
end
def issue_template_names
@issue_templates ||= Gitlab::Template::IssueTemplate.dropdown_names(ref_project)
end
def issuable_templates(issuable)
@issuable_templates ||=
if issuable.is_a?(Issue)
issue_template_names
elsif issuable.is_a?(MergeRequest)
merge_request_template_names
end
end
def ref_project
@ref_project ||= @target_project || @project
end
......
app/helpers/builds_helper.rb
View file @ f5bc41b3
......@@ -5,4 +5,14 @@ module BuildsHelper
build_class += ' retried' if build.retried?
build_class
end
def javascript_build_options
{
page_url: namespace_project_build_url(@project.namespace, @project, @build),
build_url: namespace_project_build_url(@project.namespace, @project, @build, :json),
build_status: @build.status,
build_stage: @build.stage,
state1: @build.trace_with_state[:state]
}
end
end
app/helpers/ci_status_helper.rb
View file @ f5bc41b3
......@@ -56,10 +56,18 @@ module CiStatusHelper
custom_icon(icon_name)
end
def render_commit_status(commit, tooltip_placement: 'auto left')
def render_commit_status(commit, ref: nil, tooltip_placement: 'auto left')
project = commit.project
path = pipelines_namespace_project_commit_path(project.namespace, project, commit)
render_status_with_link('commit', commit.status, path, tooltip_placement: tooltip_placement)
path = pipelines_namespace_project_commit_path(
project.namespace,
project,
commit)
render_status_with_link(
'commit',
commit.status(ref),
path,
tooltip_placement: tooltip_placement)
end
def render_pipeline_status(pipeline, tooltip_placement: 'auto left')
......
app/helpers/commits_helper.rb
View file @ f5bc41b3
......@@ -25,9 +25,11 @@ module CommitsHelper
end
end
def commit_to_html(commit, project, inline = true)
template = inline ? "inline_commit" : "commit"
render "projects/commits/#{template}", commit: commit, project: project unless commit.nil?
def commit_to_html(commit, ref, project)
render 'projects/commits/commit',
commit: commit,
ref: ref,
project: project
end
# Breadcrumb links for a Project and, if applicable, a tree path
......
app/helpers/components_helper.rb 0 → 100644
View file @ f5bc41b3
module ComponentsHelper
def gitlab_workhorse_version
if request.headers['Gitlab-Workhorse'].present?
request.headers['Gitlab-Workhorse'].split('-').first
else
Gitlab::Workhorse.version
end
end
end
app/helpers/diff_helper.rb
View file @ f5bc41b3
......@@ -51,12 +51,11 @@ module DiffHelper
html.html_safe
end
def diff_line_content(line, line_type = nil)
def diff_line_content(line)
if line.blank?
" &nbsp;".html_safe
"&nbsp;".html_safe
else
line[0] = ' ' if %w[new old].include?(line_type)
line
line.sub(/^[\-+ ]/, '').html_safe
end
end
......
app/helpers/gitlab_routing_helper.rb
View file @ f5bc41b3
......@@ -82,6 +82,10 @@ module GitlabRoutingHelper
namespace_project_merge_request_path(entity.project.namespace, entity.project, entity, *args)
end
def pipeline_path(pipeline, *args)
namespace_project_pipeline_path(pipeline.project.namespace, pipeline.project, pipeline.id, *args)
end
def milestone_path(entity, *args)
namespace_project_milestone_path(entity.project.namespace, entity.project, entity, *args)
end
......
app/helpers/issuables_helper.rb
View file @ f5bc41b3
......@@ -30,6 +30,33 @@ module IssuablesHelper
end
end
def can_add_template?(issuable)
names = issuable_templates(issuable)
names.empty? && can?(current_user, :push_code, @project) && !@project.private?
end
def template_dropdown_tag(issuable, &block)
title = selected_template(issuable) || "Choose a template"
options = {
toggle_class: 'js-issuable-selector',
title: title,
filter: true,
placeholder: 'Filter',
footer_content: true,
data: {
data: issuable_templates(issuable),
field_name: 'issuable_template',
selected: selected_template(issuable),
project_path: ref_project.path,
namespace_path: ref_project.namespace.path
}
}
dropdown_tag(title, options: options) do
capture(&block)
end
end
def user_dropdown_label(user_id, default_label)
return default_label if user_id.nil?
return "Unassigned" if user_id == "0"
......@@ -153,4 +180,28 @@ module IssuablesHelper
hexdigest(['issuables_count', issuable_type, opts.sort].flatten.join('-'))
end
def issuable_templates(issuable)
@issuable_templates ||=
case issuable
when Issue
issue_template_names
when MergeRequest
merge_request_template_names
else
raise 'Unknown issuable type!'
end
end
def merge_request_template_names
@merge_request_templates ||= Gitlab::Template::MergeRequestTemplate.dropdown_names(ref_project)
end
def issue_template_names
@issue_templates ||= Gitlab::Template::IssueTemplate.dropdown_names(ref_project)
end
def selected_template(issuable)
params[:issuable_template] if issuable_templates(issuable).include?(params[:issuable_template])
end
end
app/helpers/lfs_helper.rb
View file @ f5bc41b3
module LfsHelper
include Gitlab::Routing.url_helpers
def require_lfs_enabled!
return if Gitlab.config.lfs.enabled
......@@ -27,7 +27,7 @@ module LfsHelper
def lfs_download_access?
return false unless project.lfs_enabled?
project.public? || ci? || lfs_deploy_token? || user_can_download_code? || build_can_download_code?
ci? || lfs_deploy_token? || user_can_download_code? || build_can_download_code?
end
def user_can_download_code?
......
app/helpers/notifications_helper.rb
View file @ f5bc41b3
This diff is collapsed.
app/helpers/projects_helper.rb
View file @ f5bc41b3
This diff is collapsed.
app/helpers/todos_helper.rb
View file @ f5bc41b3
This diff is collapsed.
app/mailers/base_mailer.rb
View file @ f5bc41b3
This diff is collapsed.
app/mailers/emails/pipelines.rb
View file @ f5bc41b3
This diff is collapsed.
app/mailers/notify.rb
View file @ f5bc41b3
This diff is collapsed.
app/models/application_setting.rb
View file @ f5bc41b3
This diff is collapsed.
app/models/ci/pipeline.rb
View file @ f5bc41b3
This diff is collapsed.
app/models/commit.rb
View file @ f5bc41b3
This diff is collapsed.
app/models/concerns/issuable.rb
View file @ f5bc41b3
This diff is collapsed.
app/models/event.rb
View file @ f5bc41b3
This diff is collapsed.
app/models/external_issue.rb
View file @ f5bc41b3
This diff is collapsed.
app/models/guest.rb 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
app/models/issue.rb
View file @ f5bc41b3
This diff is collapsed.
app/models/issue_collection.rb 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
app/models/merge_request.rb
View file @ f5bc41b3
This diff is collapsed.
app/models/note.rb
View file @ f5bc41b3
This diff is collapsed.
app/models/notification_setting.rb
View file @ f5bc41b3
This diff is collapsed.
app/models/project.rb
View file @ f5bc41b3
This diff is collapsed.
app/models/project_feature.rb
View file @ f5bc41b3
This diff is collapsed.
app/models/project_services/jira_service.rb
View file @ f5bc41b3
This diff is collapsed.
app/models/repository.rb
View file @ f5bc41b3
This diff is collapsed.
app/models/user.rb
View file @ f5bc41b3
This diff is collapsed.
app/policies/ci/build_policy.rb
View file @ f5bc41b3
This diff is collapsed.
app/policies/ci/pipeline_policy.rb 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
app/policies/issuable_policy.rb
View file @ f5bc41b3
This diff is collapsed.
app/policies/issue_policy.rb
View file @ f5bc41b3
This diff is collapsed.
app/serializers/base_serializer.rb 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
app/serializers/build_entity.rb 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
app/serializers/commit_entity.rb 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
app/serializers/deployment_entity.rb 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
app/serializers/entity_request.rb 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
app/serializers/environment_entity.rb 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
app/serializers/environment_serializer.rb 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
app/serializers/request_aware_entity.rb 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
app/serializers/user_entity.rb 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
app/services/ci/send_pipeline_notification_service.rb deleted 100644 → 0
View file @ 92aa4028
This diff is collapsed.
app/services/git_push_service.rb
View file @ f5bc41b3
This diff is collapsed.
app/services/issues/close_service.rb
View file @ f5bc41b3
This diff is collapsed.
app/services/notes/create_service.rb
View file @ f5bc41b3
This diff is collapsed.
app/services/notification_service.rb
View file @ f5bc41b3
This diff is collapsed.
app/views/admin/dashboard/index.html.haml
View file @ f5bc41b3
This diff is collapsed.
app/views/admin/groups/_group.html.haml
View file @ f5bc41b3
This diff is collapsed.
app/views/admin/groups/show.html.haml
View file @ f5bc41b3
This diff is collapsed.
app/views/admin/projects/index.html.haml
View file @ f5bc41b3
This diff is collapsed.
app/views/dashboard/todos/index.html.haml
View file @ f5bc41b3
This diff is collapsed.
app/views/events/_event.html.haml
View file @ f5bc41b3
This diff is collapsed.
app/views/groups/edit.html.haml
View file @ f5bc41b3
This diff is collapsed.
app/views/groups/milestones/new.html.haml
View file @ f5bc41b3
This diff is collapsed.
app/views/groups/show.html.haml
View file @ f5bc41b3
This diff is collapsed.
app/views/layouts/_search.html.haml
View file @ f5bc41b3
This diff is collapsed.
app/views/profiles/accounts/show.html.haml
View file @ f5bc41b3
This diff is collapsed.
app/views/projects/_home_panel.html.haml
View file @ f5bc41b3
This diff is collapsed.
app/views/projects/_last_commit.html.haml
View file @ f5bc41b3
This diff is collapsed.
app/views/projects/blame/show.html.haml
View file @ f5bc41b3
This diff is collapsed.
app/views/projects/blob/_blob.html.haml
View file @ f5bc41b3
This diff is collapsed.
app/views/projects/boards/_show.html.haml 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
app/views/projects/boards/components/_board_list.html.haml 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
app/views/projects/boards/index.html.haml
View file @ f5bc41b3
This diff is collapsed.
app/views/projects/boards/show.html.haml
View file @ f5bc41b3
This diff is collapsed.
app/views/projects/builds/_header.html.haml
View file @ f5bc41b3
This diff is collapsed.
app/views/projects/builds/_table.html.haml
View file @ f5bc41b3
This diff is collapsed.
app/views/projects/builds/show.html.haml
View file @ f5bc41b3
This diff is collapsed.
app/views/projects/commits/show.html.haml
View file @ f5bc41b3
This diff is collapsed.
app/views/projects/diffs/_content.html.haml
View file @ f5bc41b3
This diff is collapsed.
app/views/projects/diffs/_line.html.haml
View file @ f5bc41b3
This diff is collapsed.
app/views/projects/edit.html.haml
View file @ f5bc41b3
This diff is collapsed.
app/views/projects/imports/show.html.haml
View file @ f5bc41b3
This diff is collapsed.
app/views/projects/network/show.html.haml
View file @ f5bc41b3
This diff is collapsed.
app/views/projects/new.html.haml
View file @ f5bc41b3
This diff is collapsed.
app/views/projects/notes/_note.html.haml
View file @ f5bc41b3
This diff is collapsed.
app/views/projects/refs/logs_tree.js.haml
View file @ f5bc41b3
This diff is collapsed.
app/views/projects/services/_form.html.haml
View file @ f5bc41b3
This diff is collapsed.
app/views/projects/show.html.haml
View file @ f5bc41b3
This diff is collapsed.
app/views/search/results/_commit.html.haml
View file @ f5bc41b3
This diff is collapsed.
app/views/shared/groups/_group.html.haml
View file @ f5bc41b3
This diff is collapsed.
app/views/shared/issuable/_form.html.haml
View file @ f5bc41b3
This diff is collapsed.
app/views/shared/issuable/form/_template_selector.html.haml 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
app/views/users/_groups.html.haml
View file @ f5bc41b3
This diff is collapsed.
app/workers/git_garbage_collect_worker.rb
View file @ f5bc41b3
This diff is collapsed.
app/workers/new_note_worker.rb
View file @ f5bc41b3
This diff is collapsed.
app/workers/pipeline_notification_worker.rb 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
app/workers/process_commit_worker.rb 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
changelogs/unreleased/22307-pipeline-link-in-builds-view.yml 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
changelogs/unreleased/24038-fix-no-register-pane-if-ldap.yml 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
changelogs/unreleased/24048-dropdown-issue-with-devider.yml 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
changelogs/unreleased/24369-remove-additional-padding.yml 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
changelogs/unreleased/24397-load-labels-on-mr-tabs.yml 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
changelogs/unreleased/always-show-download-button.yml 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
changelogs/unreleased/feature-api_owned_resource.yml 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
changelogs/unreleased/fix-cache-for-commit-status.yml 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
changelogs/unreleased/fix-help-page-links.yml 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
changelogs/unreleased/fix-invalid-filename-eslint.yml deleted 100644 → 0
View file @ 92aa4028
This diff is collapsed.
changelogs/unreleased/forking-in-progress-title.yml 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
changelogs/unreleased/issue_20245.yml 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
changelogs/unreleased/milestone-project-require.yml 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
changelogs/unreleased/new-note-worker-record-not-found-fix.yml 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
changelogs/unreleased/repository-name-emojis 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
changelogs/unreleased/sidekiq-job-throttling.yml 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
changelogs/unreleased/user_filter_auth.yml 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
config/database.yml.mysql
View file @ f5bc41b3
This diff is collapsed.
config/initializers/devise.rb
View file @ f5bc41b3
This diff is collapsed.
config/initializers/routing_draw.rb 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
config/initializers/sidekiq.rb
View file @ f5bc41b3
This diff is collapsed.
config/routes.rb
View file @ f5bc41b3
This diff is collapsed.
config/routes/git_http.rb 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
config/routes/group.rb
View file @ f5bc41b3
This diff is collapsed.
config/routes/profile.rb
View file @ f5bc41b3
This diff is collapsed.
config/routes/project.rb
View file @ f5bc41b3
This diff is collapsed.
config/routes/repository.rb 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
config/routes/user.rb
View file @ f5bc41b3
This diff is collapsed.
config/routes/wiki.rb 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
config/sidekiq_queues.yml
View file @ f5bc41b3
This diff is collapsed.
config/unicorn.rb.example
View file @ f5bc41b3
This diff is collapsed.
db/migrate/20160819232256_add_incoming_email_token_to_users.rb 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
db/schema.rb
View file @ f5bc41b3
This diff is collapsed.
doc/README.md
View file @ f5bc41b3
This diff is collapsed.
doc/administration/auth/ldap.md
View file @ f5bc41b3
This diff is collapsed.
doc/administration/high_availability/nfs.md
View file @ f5bc41b3
This diff is collapsed.
doc/administration/housekeeping.md
View file @ f5bc41b3
This diff is collapsed.
doc/administration/operations.md
View file @ f5bc41b3
This diff is collapsed.
doc/administration/operations/img/sidekiq_job_throttling.png 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
doc/administration/operations/sidekiq_job_throttling.md 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
doc/administration/raketasks/check.md 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
doc/api/groups.md
View file @ f5bc41b3
This diff is collapsed.
doc/api/labels.md
View file @ f5bc41b3
This diff is collapsed.
doc/api/notification_settings.md
View file @ f5bc41b3
This diff is collapsed.
doc/api/projects.md
View file @ f5bc41b3
This diff is collapsed.
doc/api/users.md
View file @ f5bc41b3
This diff is collapsed.
doc/ci/docker/using_docker_build.md
View file @ f5bc41b3
This diff is collapsed.
doc/development/README.md
View file @ f5bc41b3
This diff is collapsed.
doc/development/frontend.md
View file @ f5bc41b3
This diff is collapsed.
doc/development/instrumentation.md
View file @ f5bc41b3
This diff is collapsed.
doc/development/migration_style_guide.md
View file @ f5bc41b3
This diff is collapsed.
doc/development/shell_commands.md
View file @ f5bc41b3
This diff is collapsed.
doc/development/ux_guide/basics.md 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
doc/development/ux_guide/components.md 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
doc/development/ux_guide/features.md 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
doc/development/ux_guide/img/button-primary.png 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
doc/development/ux_guide/img/button-secondary.png 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
doc/development/ux_guide/img/color-blue.png 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
doc/development/ux_guide/img/color-green.png 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
doc/development/ux_guide/img/color-grey.png 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
doc/development/ux_guide/img/color-orange.png 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
doc/development/ux_guide/img/color-red.png 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
doc/development/ux_guide/img/components-alerts.png 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
doc/development/ux_guide/img/components-anchorlinks.png 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
doc/development/ux_guide/img/components-contentblock.png 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
doc/development/ux_guide/img/components-counts.png 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
doc/development/ux_guide/img/components-coverblock.png 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
doc/development/ux_guide/img/components-dateexact.png 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
doc/development/ux_guide/img/components-daterelative.png 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
doc/development/ux_guide/img/components-dropdown.png 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
doc/development/ux_guide/img/components-fileholder.png 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
doc/development/ux_guide/img/components-horizontalform.png 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
doc/development/ux_guide/img/components-listinsidepanel.png 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
doc/development/ux_guide/img/components-listwithavatar.png 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
doc/development/ux_guide/img/components-listwithhover.png 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
doc/development/ux_guide/img/components-panels.png 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
doc/development/ux_guide/img/components-referencehover.png 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
doc/development/ux_guide/img/components-referenceissues.png 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
doc/development/ux_guide/img/components-referencelabels.png 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
doc/development/ux_guide/img/components-referencemilestone.png 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
doc/development/ux_guide/img/components-referencemrs.png 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
doc/development/ux_guide/img/components-referencepeople.png 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
doc/development/ux_guide/img/components-rowcontentblock.png 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
doc/development/ux_guide/img/components-simplelist.png 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
doc/development/ux_guide/img/components-table.png 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
doc/development/ux_guide/img/components-verticalform.png 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
doc/development/ux_guide/img/features-contextualnav.png 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
doc/development/ux_guide/img/features-emptystates.png 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
doc/development/ux_guide/img/features-filters.png 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
doc/development/ux_guide/img/features-globalnav.png 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
doc/development/ux_guide/img/icon-add.png 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
doc/development/ux_guide/img/icon-close.png 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
doc/development/ux_guide/img/icon-edit.png 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
doc/development/ux_guide/img/icon-notification.png 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
doc/development/ux_guide/img/icon-rss.png 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
doc/development/ux_guide/img/icon-subscribe.png 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
doc/development/ux_guide/img/icon-trash.png 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
doc/development/ux_guide/img/monospacefont-sample.png 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
doc/development/ux_guide/img/sourcesanspro-sample.png 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
doc/development/ux_guide/img/surfaces-contentitemtitle.png 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
doc/development/ux_guide/img/surfaces-header.png 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
doc/development/ux_guide/img/surfaces-systeminformationblock.png 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
doc/development/ux_guide/img/surfaces-ux.png 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
doc/development/ux_guide/img/tooltip-placement.png 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
doc/development/ux_guide/img/tooltip-usage.png 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
doc/development/ux_guide/index.md 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
doc/development/ux_guide/principles.md 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
doc/development/ux_guide/resources.md 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
doc/development/ux_guide/surfaces.md 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
doc/development/ux_guide/tips.md 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
doc/development/ux_guide/users.md 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
doc/development/what_requires_downtime.md
View file @ f5bc41b3
This diff is collapsed.
doc/gitlab-basics/create-project.md
View file @ f5bc41b3
This diff is collapsed.
doc/install/installation.md
View file @ f5bc41b3
This diff is collapsed.
doc/integration/README.md
View file @ f5bc41b3
This diff is collapsed.
doc/integration/jira.md
View file @ f5bc41b3
This diff is collapsed.
doc/integration/shibboleth.md
View file @ f5bc41b3
This diff is collapsed.
doc/project_services/img/jira_add_gitlab_commit_message.png 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
doc/project_services/img/jira_add_user_to_group.png 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
doc/project_services/img/jira_create_new_group.png 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
doc/project_services/img/jira_create_new_group_name.png 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
doc/project_services/img/jira_create_new_user.png 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
doc/project_services/img/jira_group_access.png 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
doc/project_services/img/jira_issue_closed.png 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
doc/project_services/img/jira_issue_reference.png 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
doc/project_services/img/jira_issues_workflow.png 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
doc/project_services/img/jira_merge_request_close.png 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
doc/project_services/img/jira_project_name.png 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
doc/project_services/img/jira_service.png 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
doc/project_services/img/jira_service_close_issue.png 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
doc/project_services/img/jira_service_page.png 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
doc/project_services/img/jira_submit_gitlab_merge_request.png 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
doc/project_services/img/jira_user_management_link.png 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
doc/project_services/img/jira_workflow_screenshot.png 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
doc/project_services/jira.md
View file @ f5bc41b3
This diff is collapsed.
doc/project_services/project_services.md
View file @ f5bc41b3
This diff is collapsed.
doc/raketasks/check.md
View file @ f5bc41b3
This diff is collapsed.
doc/university/README.md
View file @ f5bc41b3
This diff is collapsed.
doc/university/training/gitlab_flow.md 0 → 100755
View file @ f5bc41b3
This diff is collapsed.
doc/university/training/gitlab_flow/feature_branches.png 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
doc/university/training/gitlab_flow/production_branch.png 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
doc/university/training/gitlab_flow/release_branches.png 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
doc/university/training/index.md 0 → 100755
View file @ f5bc41b3
This diff is collapsed.
doc/university/training/logo.png 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
doc/university/training/topics/additional_resources.md 0 → 100755
View file @ f5bc41b3
This diff is collapsed.
doc/university/training/topics/agile_git.md 0 → 100755
View file @ f5bc41b3
This diff is collapsed.
doc/university/training/topics/bisect.md 0 → 100755
View file @ f5bc41b3
This diff is collapsed.
doc/university/training/topics/cherry_picking.md 0 → 100755
View file @ f5bc41b3
This diff is collapsed.
doc/university/training/topics/env_setup.md 0 → 100755
View file @ f5bc41b3
This diff is collapsed.
doc/university/training/topics/explore_gitlab.md 0 → 100755
View file @ f5bc41b3
This diff is collapsed.
doc/university/training/topics/feature_branching.md 0 → 100755
View file @ f5bc41b3
This diff is collapsed.
doc/university/training/topics/getting_started.md 0 → 100755
View file @ f5bc41b3
This diff is collapsed.
doc/university/training/topics/git_add.md 0 → 100755
View file @ f5bc41b3
This diff is collapsed.
doc/university/training/topics/git_intro.md 0 → 100755
View file @ f5bc41b3
This diff is collapsed.
doc/university/training/topics/git_log.md 0 → 100755
View file @ f5bc41b3
This diff is collapsed.
doc/university/training/topics/gitlab_flow.md 0 → 100755
View file @ f5bc41b3
This diff is collapsed.
doc/university/training/topics/merge_conflicts.md 0 → 100755
View file @ f5bc41b3
This diff is collapsed.
doc/university/training/topics/merge_requests.md 0 → 100755
View file @ f5bc41b3
This diff is collapsed.
doc/university/training/topics/rollback_commits.md 0 → 100755
View file @ f5bc41b3
This diff is collapsed.
doc/university/training/topics/stash.md 0 → 100755
View file @ f5bc41b3
This diff is collapsed.
doc/university/training/topics/subtree.md 0 → 100755
View file @ f5bc41b3
This diff is collapsed.
doc/university/training/topics/tags.md 0 → 100755
View file @ f5bc41b3
This diff is collapsed.
doc/university/training/topics/unstage.md 0 → 100755
View file @ f5bc41b3
This diff is collapsed.
doc/university/training/user_training.md 0 → 100755
View file @ f5bc41b3
This diff is collapsed.
doc/update/8.13-to-8.14.md
View file @ f5bc41b3
This diff is collapsed.
doc/user/markdown.md
View file @ f5bc41b3
This diff is collapsed.
doc/workflow/notifications.md
View file @ f5bc41b3
This diff is collapsed.
features/profile/profile.feature
View file @ f5bc41b3
This diff is collapsed.
features/project/network_graph.feature
View file @ f5bc41b3
This diff is collapsed.
features/project/source/git_blame.feature deleted 100644 → 0
View file @ 92aa4028
This diff is collapsed.
features/snippets/public_snippets.feature deleted 100644 → 0
View file @ 92aa4028
This diff is collapsed.
features/steps/groups.rb
View file @ f5bc41b3
This diff is collapsed.
features/steps/profile/profile.rb
View file @ f5bc41b3
This diff is collapsed.
features/steps/project/network_graph.rb
View file @ f5bc41b3
This diff is collapsed.
features/steps/shared/diff_note.rb
View file @ f5bc41b3
This diff is collapsed.
features/steps/snippets/public_snippets.rb deleted 100644 → 0
View file @ 92aa4028
This diff is collapsed.
lib/api/access_requests.rb
View file @ f5bc41b3
This diff is collapsed.
lib/api/broadcast_messages.rb
View file @ f5bc41b3
This diff is collapsed.
lib/api/commits.rb
View file @ f5bc41b3
This diff is collapsed.
lib/api/deploy_keys.rb
View file @ f5bc41b3
This diff is collapsed.
lib/api/entities.rb
View file @ f5bc41b3
This diff is collapsed.
lib/api/environments.rb
View file @ f5bc41b3
This diff is collapsed.
lib/api/groups.rb
View file @ f5bc41b3
This diff is collapsed.
lib/api/helpers.rb
View file @ f5bc41b3
This diff is collapsed.
lib/api/labels.rb
View file @ f5bc41b3
This diff is collapsed.
lib/api/members.rb
View file @ f5bc41b3
This diff is collapsed.
lib/api/milestones.rb
View file @ f5bc41b3
This diff is collapsed.
lib/api/notification_settings.rb
View file @ f5bc41b3
This diff is collapsed.
lib/api/project_hooks.rb
View file @ f5bc41b3
This diff is collapsed.
lib/api/projects.rb
View file @ f5bc41b3
This diff is collapsed.
lib/api/runners.rb
View file @ f5bc41b3
This diff is collapsed.
lib/api/session.rb
View file @ f5bc41b3
This diff is collapsed.
lib/api/subscriptions.rb
View file @ f5bc41b3
This diff is collapsed.
lib/api/system_hooks.rb
View file @ f5bc41b3
This diff is collapsed.
lib/api/tags.rb
View file @ f5bc41b3
This diff is collapsed.
lib/api/triggers.rb
View file @ f5bc41b3
This diff is collapsed.
lib/api/users.rb
View file @ f5bc41b3
This diff is collapsed.
lib/banzai/filter/autolink_filter.rb
View file @ f5bc41b3
This diff is collapsed.
lib/banzai/reference_parser/base_parser.rb
View file @ f5bc41b3
This diff is collapsed.
lib/banzai/reference_parser/label_parser.rb
View file @ f5bc41b3
This diff is collapsed.
lib/banzai/reference_parser/user_parser.rb
View file @ f5bc41b3
This diff is collapsed.
lib/banzai/renderer.rb
View file @ f5bc41b3
This diff is collapsed.
lib/ci/gitlab_ci_yaml_processor.rb
View file @ f5bc41b3
This diff is collapsed.
lib/constraints/group_url_constrainer.rb
View file @ f5bc41b3
This diff is collapsed.
lib/constraints/user_url_constrainer.rb
View file @ f5bc41b3
This diff is collapsed.
lib/extracts_path.rb
View file @ f5bc41b3
This diff is collapsed.
lib/gitlab/backend/shell.rb
View file @ f5bc41b3
This diff is collapsed.
lib/gitlab/ci/config.rb
View file @ f5bc41b3
This diff is collapsed.
lib/gitlab/contributions_calendar.rb
View file @ f5bc41b3
This diff is collapsed.
lib/gitlab/current_settings.rb
View file @ f5bc41b3
This diff is collapsed.
lib/gitlab/diff/file.rb
View file @ f5bc41b3
This diff is collapsed.
lib/gitlab/ee_compat_check.rb
View file @ f5bc41b3
This diff is collapsed.
lib/gitlab/email/handler.rb
View file @ f5bc41b3
This diff is collapsed.
lib/gitlab/exclusive_lease.rb
View file @ f5bc41b3
This diff is collapsed.
lib/gitlab/git_access.rb
View file @ f5bc41b3
This diff is collapsed.
lib/gitlab/github_import/importer.rb
View file @ f5bc41b3
This diff is collapsed.
lib/gitlab/incoming_email.rb
View file @ f5bc41b3
This diff is collapsed.
lib/gitlab/ldap/adapter.rb
View file @ f5bc41b3
This diff is collapsed.
lib/gitlab/ldap/authentication.rb
View file @ f5bc41b3
This diff is collapsed.
lib/gitlab/ldap/config.rb
View file @ f5bc41b3
This diff is collapsed.
lib/gitlab/project_search_results.rb
View file @ f5bc41b3
This diff is collapsed.
lib/gitlab/regex.rb
View file @ f5bc41b3
This diff is collapsed.
lib/gitlab/sidekiq_throttler.rb 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
lib/tasks/gitlab/check.rake
View file @ f5bc41b3
This diff is collapsed.
lib/tasks/gitlab/dev.rake
View file @ f5bc41b3
This diff is collapsed.
package.json
View file @ f5bc41b3
This diff is collapsed.
spec/controllers/help_controller_spec.rb
View file @ f5bc41b3
This diff is collapsed.
spec/factories/merge_requests.rb
View file @ f5bc41b3
This diff is collapsed.
spec/factories/projects.rb
View file @ f5bc41b3
This diff is collapsed.
spec/features/boards/boards_spec.rb
View file @ f5bc41b3
This diff is collapsed.
spec/features/boards/new_issue_spec.rb
View file @ f5bc41b3
This diff is collapsed.
spec/features/commits_spec.rb
View file @ f5bc41b3
This diff is collapsed.
spec/features/expand_collapse_diffs_spec.rb
View file @ f5bc41b3
This diff is collapsed.
spec/features/global_search_spec.rb 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
spec/features/groups/issues_spec.rb 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
spec/features/groups/merge_requests_spec.rb 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
spec/features/groups_spec.rb
View file @ f5bc41b3
This diff is collapsed.
spec/features/issues_spec.rb
View file @ f5bc41b3
This diff is collapsed.
spec/features/profile_spec.rb
View file @ f5bc41b3
This diff is collapsed.
spec/features/projects/new_project_spec.rb 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
spec/features/projects/ref_switcher_spec.rb
View file @ f5bc41b3
This diff is collapsed.
spec/features/search_spec.rb
View file @ f5bc41b3
This diff is collapsed.
spec/features/snippets/public_snippets_spec.rb 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
spec/features/todos/todos_filtering_spec.rb
View file @ f5bc41b3
This diff is collapsed.
spec/helpers/application_helper_spec.rb
View file @ f5bc41b3
This diff is collapsed.
spec/helpers/components_helper_spec.rb 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
spec/helpers/diff_helper_spec.rb
View file @ f5bc41b3
This diff is collapsed.
spec/javascripts/.eslintrc 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
spec/javascripts/boards/list_spec.js.es6
View file @ f5bc41b3
This diff is collapsed.
spec/javascripts/boards/mock_data.js.es6
View file @ f5bc41b3
This diff is collapsed.
spec/javascripts/build_spec.js.es6 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
spec/javascripts/fixtures/build.html.haml 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
spec/lib/constraints/constrainer_helper_spec.rb 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
spec/lib/constraints/namespace_url_constrainer_spec.rb deleted 100644 → 0
View file @ 92aa4028
This diff is collapsed.
spec/lib/gitlab/backend/shell_spec.rb
View file @ f5bc41b3
This diff is collapsed.
spec/lib/gitlab/contributions_calendar_spec.rb 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
spec/lib/gitlab/exclusive_lease_spec.rb
View file @ f5bc41b3
This diff is collapsed.
spec/lib/gitlab/git_access_spec.rb
View file @ f5bc41b3
This diff is collapsed.
spec/lib/gitlab/git_access_wiki_spec.rb
View file @ f5bc41b3
This diff is collapsed.
spec/lib/gitlab/ldap/config_spec.rb
View file @ f5bc41b3
This diff is collapsed.
spec/lib/gitlab/reference_extractor_spec.rb
View file @ f5bc41b3
This diff is collapsed.
spec/lib/gitlab/sidekiq_throttler_spec.rb 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
spec/models/application_setting_spec.rb
View file @ f5bc41b3
This diff is collapsed.
spec/models/ci/pipeline_spec.rb
View file @ f5bc41b3
This diff is collapsed.
spec/models/commit_spec.rb
View file @ f5bc41b3
This diff is collapsed.
spec/models/concerns/issuable_spec.rb
View file @ f5bc41b3
This diff is collapsed.
spec/models/event_spec.rb
View file @ f5bc41b3
This diff is collapsed.
spec/models/external_issue_spec.rb
View file @ f5bc41b3
This diff is collapsed.
spec/models/group_label_spec.rb
View file @ f5bc41b3
This diff is collapsed.
spec/models/guest_spec.rb 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
spec/models/issue_collection_spec.rb 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
spec/models/issue_spec.rb
View file @ f5bc41b3
This diff is collapsed.
spec/models/merge_request_spec.rb
View file @ f5bc41b3
This diff is collapsed.
spec/models/project_spec.rb
View file @ f5bc41b3
This diff is collapsed.
spec/models/repository_spec.rb
View file @ f5bc41b3
This diff is collapsed.
spec/models/user_spec.rb
View file @ f5bc41b3
This diff is collapsed.
spec/policies/issue_policy_spec.rb 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
spec/requests/api/groups_spec.rb
View file @ f5bc41b3
This diff is collapsed.
spec/requests/api/labels_spec.rb
View file @ f5bc41b3
This diff is collapsed.
spec/requests/api/milestones_spec.rb
View file @ f5bc41b3
This diff is collapsed.
spec/requests/api/projects_spec.rb
View file @ f5bc41b3
This diff is collapsed.
spec/requests/api/runners_spec.rb
View file @ f5bc41b3
This diff is collapsed.
spec/requests/api/session_spec.rb
View file @ f5bc41b3
This diff is collapsed.
spec/requests/api/system_hooks_spec.rb
View file @ f5bc41b3
This diff is collapsed.
spec/requests/api/triggers_spec.rb
View file @ f5bc41b3
This diff is collapsed.
spec/requests/api/users_spec.rb
View file @ f5bc41b3
This diff is collapsed.
spec/requests/git_http_spec.rb
View file @ f5bc41b3
This diff is collapsed.
spec/requests/jwt_controller_spec.rb
View file @ f5bc41b3
This diff is collapsed.
spec/routing/routing_spec.rb
View file @ f5bc41b3
This diff is collapsed.
spec/serializers/build_entity_spec.rb 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
spec/serializers/commit_entity_spec.rb 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
spec/serializers/deployment_entity_spec.rb 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
spec/serializers/entity_request_spec.rb 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
spec/serializers/environment_entity_spec.rb 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
spec/serializers/environment_serializer_spec.rb 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
spec/serializers/user_entity_spec.rb 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
spec/services/git_push_service_spec.rb
View file @ f5bc41b3
This diff is collapsed.
spec/services/issues/close_service_spec.rb
View file @ f5bc41b3
This diff is collapsed.
spec/services/notes/create_service_spec.rb
View file @ f5bc41b3
This diff is collapsed.
spec/services/notification_service_spec.rb
View file @ f5bc41b3
This diff is collapsed.
spec/spec_helper.rb
View file @ f5bc41b3
This diff is collapsed.
spec/support/cycle_analytics_helpers.rb
View file @ f5bc41b3
This diff is collapsed.
spec/support/email_helpers.rb
View file @ f5bc41b3
This diff is collapsed.
spec/support/notify_shared_examples.rb
View file @ f5bc41b3
This diff is collapsed.
spec/support/reference_parser_shared_examples.rb 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
spec/support/search_helpers.rb 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
spec/support/test_env.rb
View file @ f5bc41b3
This diff is collapsed.
spec/tasks/gitlab/check_rake_spec.rb 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
spec/views/projects/builds/_build.html.haml_spec.rb 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
spec/workers/build_email_worker_spec.rb
View file @ f5bc41b3
This diff is collapsed.
spec/workers/emails_on_push_worker_spec.rb
View file @ f5bc41b3
This diff is collapsed.
spec/workers/new_note_worker_spec.rb 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
spec/workers/pipeline_notification_worker_spec.rb 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
spec/workers/process_commit_worker_spec.rb 0 → 100644
View file @ f5bc41b3
This diff is collapsed.
vendor/assets/javascripts/jquery.timeago.js deleted 100644 → 0
View file @ 92aa4028
This diff is collapsed.
vendor/assets/javascripts/vue.full.js
View file @ f5bc41b3
This diff is collapsed.
vendor/assets/javascripts/vue.min.js
View file @ f5bc41b3
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7