Merge branch 'master' into diff-line-comment-vuejs
# Conflicts: # app/models/discussion.rb # db/schema.rb
This commit is contained in:
Douwe Maan
commit
538e66d71c
|
|
@ -510,6 +510,15 @@ Metrics/PerceivedComplexity:
|
|||
|
||||
#################### Lint ################################
|
||||
|
||||
# Checks for useless access modifiers.
|
||||
Lint/UselessAccessModifier:
|
||||
Enabled: true
|
||||
|
||||
# Checks for attempts to use `private` or `protected` to set the visibility
|
||||
# of a class method, which does not work.
|
||||
Lint/IneffectiveAccessModifier:
|
||||
Enabled: false
|
||||
|
||||
# Checks for ambiguous operators in the first argument of a method invocation
|
||||
# without parentheses.
|
||||
Lint/AmbiguousOperator:
|
||||
|
|
|
|||
|
|
@ -19,10 +19,6 @@ Lint/AssignmentInCondition:
|
|||
Lint/HandleExceptions:
|
||||
Enabled: false
|
||||
|
||||
# Offense count: 21
|
||||
Lint/IneffectiveAccessModifier:
|
||||
Enabled: false
|
||||
|
||||
# Offense count: 2
|
||||
Lint/Loop:
|
||||
Enabled: false
|
||||
|
|
@ -48,10 +44,6 @@ Lint/UnusedBlockArgument:
|
|||
Lint/UnusedMethodArgument:
|
||||
Enabled: false
|
||||
|
||||
# Offense count: 11
|
||||
Lint/UselessAccessModifier:
|
||||
Enabled: false
|
||||
|
||||
# Offense count: 12
|
||||
# Cop supports --auto-correct.
|
||||
Performance/PushSplat:
|
||||
|
|
|
|||
39
CHANGELOG
39
CHANGELOG
|
|
@ -2,35 +2,72 @@ Please view this file on the master branch, on stable branches it's out of date.
|
|||
|
||||
v 8.11.0 (unreleased)
|
||||
- Fix the title of the toggle dropdown button. !5515 (herminiotorres)
|
||||
- Improve diff performance by eliminating redundant checks for text blobs
|
||||
- Convert switch icon into icon font (ClemMakesApps)
|
||||
- Remove magic comments (`# encoding: UTF-8`) from Ruby files. !5456 (winniehell)
|
||||
- Add support for relative links starting with ./ or / to RelativeLinkFilter (winniehell)
|
||||
- Fix CI status icon link underline (ClemMakesApps)
|
||||
- The Repository class is now instrumented
|
||||
- Cache the commit author in RequestStore to avoid extra lookups in PostReceive
|
||||
- Expand commit message width in repo view (ClemMakesApps)
|
||||
- Cache highlighted diff lines for merge requests
|
||||
- Fix of 'Commits being passed to custom hooks are already reachable when using the UI'
|
||||
- Add support for using RequestStore within Sidekiq tasks via SIDEKIQ_REQUEST_STORE env variable
|
||||
- Optimize maximum user access level lookup in loading of notes
|
||||
- Add "No one can push" as an option for protected branches. !5081
|
||||
- Environments have an url to link to
|
||||
- Limit git rev-list output count to one in forced push check
|
||||
- Clean up unused routes (Josef Strzibny)
|
||||
- Add green outline to New Branch button. !5447 (winniehell)
|
||||
- Update to gitlab_git 10.4.1 and take advantage of preserved Ref objects
|
||||
- Remove delay when hitting "Reply..." button on page with a lot of discussions
|
||||
- Retrieve rendered HTML from cache in one request
|
||||
- Fix renaming repository when name contains invalid chararacters under project settings
|
||||
- Optimize checking if a user has read access to a list of issues !5370
|
||||
- Nokogiri's various parsing methods are now instrumented
|
||||
- Add simple identifier to public SSH keys (muteor)
|
||||
- Add a way to send an email and create an issue based on private personal token. Find the email address from issues page. !3363
|
||||
- Fix filter input alignment (ClemMakesApps)
|
||||
- Include old revision in merge request update hooks (Ben Boeckel)
|
||||
- Add build event color in HipChat messages (David Eisner)
|
||||
- Make fork counter always clickable. !5463 (winniehell)
|
||||
- All created issues, API or WebUI, can be submitted to Akismet for spam check !5333
|
||||
- The overhead of instrumented method calls has been reduced
|
||||
- Remove `search_id` of labels dropdown filter to fix 'Missleading URI for labels in Merge Requests and Issues view'. !5368 (Scott Le)
|
||||
- Load project invited groups and members eagerly in `ProjectTeam#fetch_members`
|
||||
- Bump gitlab_git to speedup DiffCollection iterations
|
||||
- Make branches sortable without push permission !5462 (winniehell)
|
||||
- Check for Ci::Build artifacts at database level on pipeline partial
|
||||
- Convert image diff background image to CSS (ClemMakesApps)
|
||||
- Make "New issue" button in Issue page less obtrusive !5457 (winniehell)
|
||||
- Gitlab::Metrics.current_transaction needs to be public for RailsQueueDuration
|
||||
- Fix search for notes which belongs to deleted objects
|
||||
- Add GitLab Workhorse version to admin dashboard (Katarzyna Kobierska Ula Budziszewska)
|
||||
- Allow branch names ending with .json for graph and network page !5579 (winniehell)
|
||||
- Add the `sprockets-es6` gem
|
||||
- Multiple trigger variables show in separate lines (Katarzyna Kobierska Ula Budziszewska)
|
||||
- Profile requests when a header is passed
|
||||
- Avoid calculation of line_code and position for _line partial when showing diff notes on discussion tab.
|
||||
- Speedup DiffNote#active? on discussions, preloading noteables and avoid touching git repository to return diff_refs when possible
|
||||
- Add commit stats in commit api. !5517 (dixpac)
|
||||
- Add CI configuration button on project page
|
||||
- Make error pages responsive (Takuya Noguchi)
|
||||
- Change requests_profiles resource constraint to catch virtually any file
|
||||
- Reduce number of queries made for merge_requests/:id/diffs
|
||||
- Sensible state specific default sort order for issues and merge requests !5453 (tomb0y)
|
||||
- Fix RequestProfiler::Middleware error when code is reloaded in development
|
||||
- Catch what warden might throw when profiling requests to re-throw it
|
||||
- Speed up and reduce memory usage of Commit#repo_changes, Repository#expire_avatar_cache and IrkerWorker
|
||||
|
||||
v 8.10.3 (unreleased)
|
||||
v 8.10.3
|
||||
- Fix Import/Export issue importing milestones and labels not associated properly. !5426
|
||||
- Fix timing problems running imports on production. !5523
|
||||
- Add a log message when a project is scheduled for destruction for debugging. !5540
|
||||
- Fix hooks missing on imported GitLab projects. !5549
|
||||
- Properly abort a merge when merge conflicts occur. !5569
|
||||
- Fix importer for GitHub Pull Requests when a branch was removed. !5573
|
||||
- Ignore invalid IPs in X-Forwarded-For when trusted proxies are configured. !5584
|
||||
- Trim extra displayed carriage returns in diffs and files with CRLFs. !5588
|
||||
|
||||
v 8.10.2
|
||||
- User can now search branches by name. !5144
|
||||
|
|
|
|||
|
|
@ -41,6 +41,8 @@ abbreviation.
|
|||
If you have read this guide and want to know how the GitLab [core team]
|
||||
operates please see [the GitLab contributing process](PROCESS.md).
|
||||
|
||||
- [GitLab Inc engineers should refer to the engineering workflow document](https://about.gitlab.com/handbook/engineering/workflow/)
|
||||
|
||||
## Contributor license agreement
|
||||
|
||||
By submitting code as an individual you agree to the
|
||||
|
|
|
|||
2
Gemfile
2
Gemfile
|
|
@ -53,7 +53,7 @@ gem 'browser', '~> 2.2'
|
|||
|
||||
# Extracting information from a git repository
|
||||
# Provide access to Gitlab::Git library
|
||||
gem 'gitlab_git', '~> 10.3.2'
|
||||
gem 'gitlab_git', '~> 10.4.3'
|
||||
|
||||
# LDAP Auth
|
||||
# GitLab fork with several improvements to original library. For full list of changes
|
||||
|
|
|
|||
|
|
@ -278,7 +278,7 @@ GEM
|
|||
diff-lcs (~> 1.1)
|
||||
mime-types (>= 1.16, < 3)
|
||||
posix-spawn (~> 0.3)
|
||||
gitlab_git (10.3.2)
|
||||
gitlab_git (10.4.3)
|
||||
activesupport (~> 4.0)
|
||||
charlock_holmes (~> 0.7.3)
|
||||
github-linguist (~> 4.7.0)
|
||||
|
|
@ -870,7 +870,7 @@ DEPENDENCIES
|
|||
github-linguist (~> 4.7.0)
|
||||
github-markup (~> 1.4)
|
||||
gitlab-flowdock-git-hook (~> 1.0.1)
|
||||
gitlab_git (~> 10.3.2)
|
||||
gitlab_git (~> 10.4.3)
|
||||
gitlab_meta (= 7.0)
|
||||
gitlab_omniauth-ldap (~> 1.2.1)
|
||||
gollum-lib (~> 4.2)
|
||||
|
|
|
|||
|
|
@ -8,6 +8,8 @@ treatment, etc.). And so that maintainers know what to expect from contributors
|
|||
(use the latest version, ensure that the issue is addressed, friendly treatment,
|
||||
etc.).
|
||||
|
||||
- [GitLab Inc engineers should refer to the engineering workflow document](https://about.gitlab.com/handbook/engineering/workflow/)
|
||||
|
||||
## Common actions
|
||||
|
||||
### Issue team
|
||||
|
|
|
|||
Binary file not shown.
|
Before Width: | Height: | Size: 231 B |
Binary file not shown.
|
Before Width: | Height: | Size: 49 B |
|
|
@ -128,7 +128,7 @@
|
|||
$date = $('.js-artifacts-remove');
|
||||
if ($date.length) {
|
||||
date = $date.text();
|
||||
return $date.text($.timefor(new Date(date), ' '));
|
||||
return $date.text($.timefor(new Date(date.replace(/-/g, '/')), ' '));
|
||||
}
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -171,6 +171,11 @@
|
|||
break;
|
||||
case 'search:show':
|
||||
new Search();
|
||||
break;
|
||||
case 'projects:protected_branches:index':
|
||||
new ProtectedBranchesAccessSelect($(".new_protected_branch"), false, true);
|
||||
new ProtectedBranchesAccessSelect($(".protected-branches-list"), true, false);
|
||||
break;
|
||||
}
|
||||
switch (path.first()) {
|
||||
case 'admin':
|
||||
|
|
|
|||
|
|
@ -47,8 +47,8 @@
|
|||
}
|
||||
}
|
||||
},
|
||||
setup: function(wrap) {
|
||||
this.input = $('.js-gfm-input');
|
||||
setup: function(input) {
|
||||
this.input = input || $('.js-gfm-input');
|
||||
this.destroyAtWho();
|
||||
this.setupAtWho();
|
||||
if (this.dataSource) {
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
this.form.find('.div-dropzone').remove();
|
||||
this.form.addClass('gfm-form');
|
||||
disableButtonIfEmptyField(this.form.find('.js-note-text'), this.form.find('.js-comment-button'));
|
||||
GitLab.GfmAutoComplete.setup();
|
||||
GitLab.GfmAutoComplete.setup(this.form.find('.js-gfm-input'));
|
||||
new DropzoneInput(this.form);
|
||||
autosize(this.textarea);
|
||||
this.addEventListeners();
|
||||
|
|
|
|||
|
|
@ -1,211 +0,0 @@
|
|||
function md5 (str) {
|
||||
// http://kevin.vanzonneveld.net
|
||||
// + original by: Webtoolkit.info (http://www.webtoolkit.info/)
|
||||
// + namespaced by: Michael White (http://getsprink.com)
|
||||
// + tweaked by: Jack
|
||||
// + improved by: Kevin van Zonneveld (http://kevin.vanzonneveld.net)
|
||||
// + input by: Brett Zamir (http://brett-zamir.me)
|
||||
// + bugfixed by: Kevin van Zonneveld (http://kevin.vanzonneveld.net)
|
||||
// - depends on: utf8_encode
|
||||
// * example 1: md5('Kevin van Zonneveld');
|
||||
// * returns 1: '6e658d4bfcb59cc13f96c14450ac40b9'
|
||||
var xl;
|
||||
|
||||
var rotateLeft = function (lValue, iShiftBits) {
|
||||
return (lValue << iShiftBits) | (lValue >>> (32 - iShiftBits));
|
||||
};
|
||||
|
||||
var addUnsigned = function (lX, lY) {
|
||||
var lX4, lY4, lX8, lY8, lResult;
|
||||
lX8 = (lX & 0x80000000);
|
||||
lY8 = (lY & 0x80000000);
|
||||
lX4 = (lX & 0x40000000);
|
||||
lY4 = (lY & 0x40000000);
|
||||
lResult = (lX & 0x3FFFFFFF) + (lY & 0x3FFFFFFF);
|
||||
if (lX4 & lY4) {
|
||||
return (lResult ^ 0x80000000 ^ lX8 ^ lY8);
|
||||
}
|
||||
if (lX4 | lY4) {
|
||||
if (lResult & 0x40000000) {
|
||||
return (lResult ^ 0xC0000000 ^ lX8 ^ lY8);
|
||||
} else {
|
||||
return (lResult ^ 0x40000000 ^ lX8 ^ lY8);
|
||||
}
|
||||
} else {
|
||||
return (lResult ^ lX8 ^ lY8);
|
||||
}
|
||||
};
|
||||
|
||||
var _F = function (x, y, z) {
|
||||
return (x & y) | ((~x) & z);
|
||||
};
|
||||
var _G = function (x, y, z) {
|
||||
return (x & z) | (y & (~z));
|
||||
};
|
||||
var _H = function (x, y, z) {
|
||||
return (x ^ y ^ z);
|
||||
};
|
||||
var _I = function (x, y, z) {
|
||||
return (y ^ (x | (~z)));
|
||||
};
|
||||
|
||||
var _FF = function (a, b, c, d, x, s, ac) {
|
||||
a = addUnsigned(a, addUnsigned(addUnsigned(_F(b, c, d), x), ac));
|
||||
return addUnsigned(rotateLeft(a, s), b);
|
||||
};
|
||||
|
||||
var _GG = function (a, b, c, d, x, s, ac) {
|
||||
a = addUnsigned(a, addUnsigned(addUnsigned(_G(b, c, d), x), ac));
|
||||
return addUnsigned(rotateLeft(a, s), b);
|
||||
};
|
||||
|
||||
var _HH = function (a, b, c, d, x, s, ac) {
|
||||
a = addUnsigned(a, addUnsigned(addUnsigned(_H(b, c, d), x), ac));
|
||||
return addUnsigned(rotateLeft(a, s), b);
|
||||
};
|
||||
|
||||
var _II = function (a, b, c, d, x, s, ac) {
|
||||
a = addUnsigned(a, addUnsigned(addUnsigned(_I(b, c, d), x), ac));
|
||||
return addUnsigned(rotateLeft(a, s), b);
|
||||
};
|
||||
|
||||
var convertToWordArray = function (str) {
|
||||
var lWordCount;
|
||||
var lMessageLength = str.length;
|
||||
var lNumberOfWords_temp1 = lMessageLength + 8;
|
||||
var lNumberOfWords_temp2 = (lNumberOfWords_temp1 - (lNumberOfWords_temp1 % 64)) / 64;
|
||||
var lNumberOfWords = (lNumberOfWords_temp2 + 1) * 16;
|
||||
var lWordArray = new Array(lNumberOfWords - 1);
|
||||
var lBytePosition = 0;
|
||||
var lByteCount = 0;
|
||||
while (lByteCount < lMessageLength) {
|
||||
lWordCount = (lByteCount - (lByteCount % 4)) / 4;
|
||||
lBytePosition = (lByteCount % 4) * 8;
|
||||
lWordArray[lWordCount] = (lWordArray[lWordCount] | (str.charCodeAt(lByteCount) << lBytePosition));
|
||||
lByteCount++;
|
||||
}
|
||||
lWordCount = (lByteCount - (lByteCount % 4)) / 4;
|
||||
lBytePosition = (lByteCount % 4) * 8;
|
||||
lWordArray[lWordCount] = lWordArray[lWordCount] | (0x80 << lBytePosition);
|
||||
lWordArray[lNumberOfWords - 2] = lMessageLength << 3;
|
||||
lWordArray[lNumberOfWords - 1] = lMessageLength >>> 29;
|
||||
return lWordArray;
|
||||
};
|
||||
|
||||
var wordToHex = function (lValue) {
|
||||
var wordToHexValue = "",
|
||||
wordToHexValue_temp = "",
|
||||
lByte, lCount;
|
||||
for (lCount = 0; lCount <= 3; lCount++) {
|
||||
lByte = (lValue >>> (lCount * 8)) & 255;
|
||||
wordToHexValue_temp = "0" + lByte.toString(16);
|
||||
wordToHexValue = wordToHexValue + wordToHexValue_temp.substr(wordToHexValue_temp.length - 2, 2);
|
||||
}
|
||||
return wordToHexValue;
|
||||
};
|
||||
|
||||
var x = [],
|
||||
k, AA, BB, CC, DD, a, b, c, d, S11 = 7,
|
||||
S12 = 12,
|
||||
S13 = 17,
|
||||
S14 = 22,
|
||||
S21 = 5,
|
||||
S22 = 9,
|
||||
S23 = 14,
|
||||
S24 = 20,
|
||||
S31 = 4,
|
||||
S32 = 11,
|
||||
S33 = 16,
|
||||
S34 = 23,
|
||||
S41 = 6,
|
||||
S42 = 10,
|
||||
S43 = 15,
|
||||
S44 = 21;
|
||||
|
||||
str = this.utf8_encode(str);
|
||||
x = convertToWordArray(str);
|
||||
a = 0x67452301;
|
||||
b = 0xEFCDAB89;
|
||||
c = 0x98BADCFE;
|
||||
d = 0x10325476;
|
||||
|
||||
xl = x.length;
|
||||
for (k = 0; k < xl; k += 16) {
|
||||
AA = a;
|
||||
BB = b;
|
||||
CC = c;
|
||||
DD = d;
|
||||
a = _FF(a, b, c, d, x[k + 0], S11, 0xD76AA478);
|
||||
d = _FF(d, a, b, c, x[k + 1], S12, 0xE8C7B756);
|
||||
c = _FF(c, d, a, b, x[k + 2], S13, 0x242070DB);
|
||||
b = _FF(b, c, d, a, x[k + 3], S14, 0xC1BDCEEE);
|
||||
a = _FF(a, b, c, d, x[k + 4], S11, 0xF57C0FAF);
|
||||
d = _FF(d, a, b, c, x[k + 5], S12, 0x4787C62A);
|
||||
c = _FF(c, d, a, b, x[k + 6], S13, 0xA8304613);
|
||||
b = _FF(b, c, d, a, x[k + 7], S14, 0xFD469501);
|
||||
a = _FF(a, b, c, d, x[k + 8], S11, 0x698098D8);
|
||||
d = _FF(d, a, b, c, x[k + 9], S12, 0x8B44F7AF);
|
||||
c = _FF(c, d, a, b, x[k + 10], S13, 0xFFFF5BB1);
|
||||
b = _FF(b, c, d, a, x[k + 11], S14, 0x895CD7BE);
|
||||
a = _FF(a, b, c, d, x[k + 12], S11, 0x6B901122);
|
||||
d = _FF(d, a, b, c, x[k + 13], S12, 0xFD987193);
|
||||
c = _FF(c, d, a, b, x[k + 14], S13, 0xA679438E);
|
||||
b = _FF(b, c, d, a, x[k + 15], S14, 0x49B40821);
|
||||
a = _GG(a, b, c, d, x[k + 1], S21, 0xF61E2562);
|
||||
d = _GG(d, a, b, c, x[k + 6], S22, 0xC040B340);
|
||||
c = _GG(c, d, a, b, x[k + 11], S23, 0x265E5A51);
|
||||
b = _GG(b, c, d, a, x[k + 0], S24, 0xE9B6C7AA);
|
||||
a = _GG(a, b, c, d, x[k + 5], S21, 0xD62F105D);
|
||||
d = _GG(d, a, b, c, x[k + 10], S22, 0x2441453);
|
||||
c = _GG(c, d, a, b, x[k + 15], S23, 0xD8A1E681);
|
||||
b = _GG(b, c, d, a, x[k + 4], S24, 0xE7D3FBC8);
|
||||
a = _GG(a, b, c, d, x[k + 9], S21, 0x21E1CDE6);
|
||||
d = _GG(d, a, b, c, x[k + 14], S22, 0xC33707D6);
|
||||
c = _GG(c, d, a, b, x[k + 3], S23, 0xF4D50D87);
|
||||
b = _GG(b, c, d, a, x[k + 8], S24, 0x455A14ED);
|
||||
a = _GG(a, b, c, d, x[k + 13], S21, 0xA9E3E905);
|
||||
d = _GG(d, a, b, c, x[k + 2], S22, 0xFCEFA3F8);
|
||||
c = _GG(c, d, a, b, x[k + 7], S23, 0x676F02D9);
|
||||
b = _GG(b, c, d, a, x[k + 12], S24, 0x8D2A4C8A);
|
||||
a = _HH(a, b, c, d, x[k + 5], S31, 0xFFFA3942);
|
||||
d = _HH(d, a, b, c, x[k + 8], S32, 0x8771F681);
|
||||
c = _HH(c, d, a, b, x[k + 11], S33, 0x6D9D6122);
|
||||
b = _HH(b, c, d, a, x[k + 14], S34, 0xFDE5380C);
|
||||
a = _HH(a, b, c, d, x[k + 1], S31, 0xA4BEEA44);
|
||||
d = _HH(d, a, b, c, x[k + 4], S32, 0x4BDECFA9);
|
||||
c = _HH(c, d, a, b, x[k + 7], S33, 0xF6BB4B60);
|
||||
b = _HH(b, c, d, a, x[k + 10], S34, 0xBEBFBC70);
|
||||
a = _HH(a, b, c, d, x[k + 13], S31, 0x289B7EC6);
|
||||
d = _HH(d, a, b, c, x[k + 0], S32, 0xEAA127FA);
|
||||
c = _HH(c, d, a, b, x[k + 3], S33, 0xD4EF3085);
|
||||
b = _HH(b, c, d, a, x[k + 6], S34, 0x4881D05);
|
||||
a = _HH(a, b, c, d, x[k + 9], S31, 0xD9D4D039);
|
||||
d = _HH(d, a, b, c, x[k + 12], S32, 0xE6DB99E5);
|
||||
c = _HH(c, d, a, b, x[k + 15], S33, 0x1FA27CF8);
|
||||
b = _HH(b, c, d, a, x[k + 2], S34, 0xC4AC5665);
|
||||
a = _II(a, b, c, d, x[k + 0], S41, 0xF4292244);
|
||||
d = _II(d, a, b, c, x[k + 7], S42, 0x432AFF97);
|
||||
c = _II(c, d, a, b, x[k + 14], S43, 0xAB9423A7);
|
||||
b = _II(b, c, d, a, x[k + 5], S44, 0xFC93A039);
|
||||
a = _II(a, b, c, d, x[k + 12], S41, 0x655B59C3);
|
||||
d = _II(d, a, b, c, x[k + 3], S42, 0x8F0CCC92);
|
||||
c = _II(c, d, a, b, x[k + 10], S43, 0xFFEFF47D);
|
||||
b = _II(b, c, d, a, x[k + 1], S44, 0x85845DD1);
|
||||
a = _II(a, b, c, d, x[k + 8], S41, 0x6FA87E4F);
|
||||
d = _II(d, a, b, c, x[k + 15], S42, 0xFE2CE6E0);
|
||||
c = _II(c, d, a, b, x[k + 6], S43, 0xA3014314);
|
||||
b = _II(b, c, d, a, x[k + 13], S44, 0x4E0811A1);
|
||||
a = _II(a, b, c, d, x[k + 4], S41, 0xF7537E82);
|
||||
d = _II(d, a, b, c, x[k + 11], S42, 0xBD3AF235);
|
||||
c = _II(c, d, a, b, x[k + 2], S43, 0x2AD7D2BB);
|
||||
b = _II(b, c, d, a, x[k + 9], S44, 0xEB86D391);
|
||||
a = addUnsigned(a, AA);
|
||||
b = addUnsigned(b, BB);
|
||||
c = addUnsigned(c, CC);
|
||||
d = addUnsigned(d, DD);
|
||||
}
|
||||
|
||||
var temp = wordToHex(a) + wordToHex(b) + wordToHex(c) + wordToHex(d);
|
||||
|
||||
return temp.toLowerCase();
|
||||
}
|
||||
|
|
@ -1,70 +0,0 @@
|
|||
function utf8_encode (argString) {
|
||||
// http://kevin.vanzonneveld.net
|
||||
// + original by: Webtoolkit.info (http://www.webtoolkit.info/)
|
||||
// + improved by: Kevin van Zonneveld (http://kevin.vanzonneveld.net)
|
||||
// + improved by: sowberry
|
||||
// + tweaked by: Jack
|
||||
// + bugfixed by: Onno Marsman
|
||||
// + improved by: Yves Sucaet
|
||||
// + bugfixed by: Onno Marsman
|
||||
// + bugfixed by: Ulrich
|
||||
// + bugfixed by: Rafal Kukawski
|
||||
// + improved by: kirilloid
|
||||
// + bugfixed by: kirilloid
|
||||
// * example 1: utf8_encode('Kevin van Zonneveld');
|
||||
// * returns 1: 'Kevin van Zonneveld'
|
||||
|
||||
if (argString === null || typeof argString === "undefined") {
|
||||
return "";
|
||||
}
|
||||
|
||||
var string = (argString + ''); // .replace(/\r\n/g, "\n").replace(/\r/g, "\n");
|
||||
var utftext = '',
|
||||
start, end, stringl = 0;
|
||||
|
||||
start = end = 0;
|
||||
stringl = string.length;
|
||||
for (var n = 0; n < stringl; n++) {
|
||||
var c1 = string.charCodeAt(n);
|
||||
var enc = null;
|
||||
|
||||
if (c1 < 128) {
|
||||
end++;
|
||||
} else if (c1 > 127 && c1 < 2048) {
|
||||
enc = String.fromCharCode(
|
||||
(c1 >> 6) | 192,
|
||||
( c1 & 63) | 128
|
||||
);
|
||||
} else if (c1 & 0xF800 != 0xD800) {
|
||||
enc = String.fromCharCode(
|
||||
(c1 >> 12) | 224,
|
||||
((c1 >> 6) & 63) | 128,
|
||||
( c1 & 63) | 128
|
||||
);
|
||||
} else { // surrogate pairs
|
||||
if (c1 & 0xFC00 != 0xD800) { throw new RangeError("Unmatched trail surrogate at " + n); }
|
||||
var c2 = string.charCodeAt(++n);
|
||||
if (c2 & 0xFC00 != 0xDC00) { throw new RangeError("Unmatched lead surrogate at " + (n-1)); }
|
||||
c1 = ((c1 & 0x3FF) << 10) + (c2 & 0x3FF) + 0x10000;
|
||||
enc = String.fromCharCode(
|
||||
(c1 >> 18) | 240,
|
||||
((c1 >> 12) & 63) | 128,
|
||||
((c1 >> 6) & 63) | 128,
|
||||
( c1 & 63) | 128
|
||||
);
|
||||
}
|
||||
if (enc !== null) {
|
||||
if (end > start) {
|
||||
utftext += string.slice(start, end);
|
||||
}
|
||||
utftext += enc;
|
||||
start = end = n + 1;
|
||||
}
|
||||
}
|
||||
|
||||
if (end > start) {
|
||||
utftext += string.slice(start, stringl);
|
||||
}
|
||||
|
||||
return utftext;
|
||||
}
|
||||
|
|
@ -1,35 +0,0 @@
|
|||
(function() {
|
||||
$(function() {
|
||||
return $(".protected-branches-list :checkbox").change(function(e) {
|
||||
var can_push, id, name, obj, url;
|
||||
name = $(this).attr("name");
|
||||
if (name === "developers_can_push" || name === "developers_can_merge") {
|
||||
id = $(this).val();
|
||||
can_push = $(this).is(":checked");
|
||||
url = $(this).data("url");
|
||||
return $.ajax({
|
||||
type: "PATCH",
|
||||
url: url,
|
||||
dataType: "json",
|
||||
data: {
|
||||
id: id,
|
||||
protected_branch: (
|
||||
obj = {},
|
||||
obj["" + name] = can_push,
|
||||
obj
|
||||
)
|
||||
},
|
||||
success: function() {
|
||||
var row;
|
||||
row = $(e.target);
|
||||
return row.closest('tr').effect('highlight');
|
||||
},
|
||||
error: function() {
|
||||
return new Flash("Failed to update branch!", "alert");
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
}).call(this);
|
||||
|
|
@ -0,0 +1,63 @@
|
|||
class ProtectedBranchesAccessSelect {
|
||||
constructor(container, saveOnSelect, selectDefault) {
|
||||
this.container = container;
|
||||
this.saveOnSelect = saveOnSelect;
|
||||
|
||||
this.container.find(".allowed-to-merge").each((i, element) => {
|
||||
var fieldName = $(element).data('field-name');
|
||||
var dropdown = $(element).glDropdown({
|
||||
data: gon.merge_access_levels,
|
||||
selectable: true,
|
||||
fieldName: fieldName,
|
||||
clicked: _.chain(this.onSelect).partial(element).bind(this).value()
|
||||
});
|
||||
|
||||
if (selectDefault) {
|
||||
dropdown.data('glDropdown').selectRowAtIndex(document.createEvent("Event"), 0);
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
this.container.find(".allowed-to-push").each((i, element) => {
|
||||
var fieldName = $(element).data('field-name');
|
||||
var dropdown = $(element).glDropdown({
|
||||
data: gon.push_access_levels,
|
||||
selectable: true,
|
||||
fieldName: fieldName,
|
||||
clicked: _.chain(this.onSelect).partial(element).bind(this).value()
|
||||
});
|
||||
|
||||
if (selectDefault) {
|
||||
dropdown.data('glDropdown').selectRowAtIndex(document.createEvent("Event"), 0);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
onSelect(dropdown, selected, element, e) {
|
||||
$(dropdown).find('.dropdown-toggle-text').text(selected.text);
|
||||
if (this.saveOnSelect) {
|
||||
return $.ajax({
|
||||
type: "POST",
|
||||
url: $(dropdown).data('url'),
|
||||
dataType: "json",
|
||||
data: {
|
||||
_method: 'PATCH',
|
||||
id: $(dropdown).data('id'),
|
||||
protected_branch: {
|
||||
["" + ($(dropdown).data('type')) + "_attributes"]: {
|
||||
"access_level": selected.id
|
||||
}
|
||||
}
|
||||
},
|
||||
success: function() {
|
||||
var row;
|
||||
row = $(e.target);
|
||||
return row.closest('tr').effect('highlight');
|
||||
},
|
||||
error: function() {
|
||||
return new Flash("Failed to update branch!", "alert");
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -182,7 +182,6 @@
|
|||
|
||||
> form {
|
||||
display: inline-block;
|
||||
margin-top: -1px;
|
||||
}
|
||||
|
||||
.icon-label {
|
||||
|
|
@ -193,7 +192,6 @@
|
|||
height: 35px;
|
||||
display: inline-block;
|
||||
position: relative;
|
||||
top: 2px;
|
||||
margin-right: $gl-padding-top;
|
||||
|
||||
/* Medium devices (desktops, 992px and up) */
|
||||
|
|
|
|||
|
|
@ -1,8 +1,6 @@
|
|||
.commits-compare-switch {
|
||||
@include btn-default;
|
||||
@include btn-white;
|
||||
background: image-url("switch_icon.png") no-repeat center center;
|
||||
text-indent: -9999px;
|
||||
float: left;
|
||||
margin-right: 9px;
|
||||
}
|
||||
|
|
@ -61,6 +59,10 @@
|
|||
font-size: 0;
|
||||
}
|
||||
|
||||
.ci-status-link {
|
||||
display: inline-block;
|
||||
}
|
||||
|
||||
.btn-clipboard, .btn-transparent {
|
||||
padding-left: 0;
|
||||
padding-right: 0;
|
||||
|
|
|
|||
|
|
@ -164,7 +164,10 @@
|
|||
line-height: 0;
|
||||
img {
|
||||
border: 1px solid #fff;
|
||||
background: image-url('trans_bg.gif');
|
||||
background-image: linear-gradient(45deg, #e5e5e5 25%, transparent 25%, transparent 75%, #e5e5e5 75%, #e5e5e5 100%),
|
||||
linear-gradient(45deg, #e5e5e5 25%, transparent 25%, transparent 75%, #e5e5e5 75%, #e5e5e5 100%);
|
||||
background-size: 10px 10px;
|
||||
background-position: 0 0, 5px 5px;
|
||||
max-width: 100%;
|
||||
}
|
||||
&.deleted {
|
||||
|
|
|
|||
|
|
@ -18,6 +18,10 @@
|
|||
.btn {
|
||||
margin: 4px;
|
||||
}
|
||||
|
||||
.table.builds {
|
||||
min-width: 1200px;
|
||||
}
|
||||
}
|
||||
|
||||
.content-list {
|
||||
|
|
@ -35,7 +39,7 @@
|
|||
}
|
||||
|
||||
.table.builds {
|
||||
min-width: 1200px;
|
||||
min-width: 900px;
|
||||
|
||||
&.pipeline {
|
||||
min-width: 650px;
|
||||
|
|
@ -128,7 +132,7 @@
|
|||
.icon-container {
|
||||
display: inline-block;
|
||||
text-align: right;
|
||||
width: 20px;
|
||||
width: 15px;
|
||||
|
||||
.fa {
|
||||
position: relative;
|
||||
|
|
|
|||
|
|
@ -661,14 +661,28 @@ pre.light-well {
|
|||
}
|
||||
}
|
||||
|
||||
.new_protected_branch {
|
||||
.dropdown {
|
||||
display: inline;
|
||||
margin-left: 15px;
|
||||
}
|
||||
|
||||
label {
|
||||
min-width: 120px;
|
||||
}
|
||||
}
|
||||
|
||||
.protected-branches-list {
|
||||
a {
|
||||
color: $gl-gray;
|
||||
font-weight: 600;
|
||||
|
||||
&:hover {
|
||||
color: $gl-link-color;
|
||||
}
|
||||
|
||||
&.is-active {
|
||||
font-weight: 600;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -58,6 +58,10 @@
|
|||
|
||||
.tree_commit {
|
||||
max-width: 320px;
|
||||
|
||||
.str-truncated {
|
||||
max-width: 100%;
|
||||
}
|
||||
}
|
||||
|
||||
.tree_time_ago {
|
||||
|
|
|
|||
|
|
@ -243,42 +243,6 @@ class ApplicationController < ActionController::Base
|
|||
end
|
||||
end
|
||||
|
||||
def set_filters_params
|
||||
set_default_sort
|
||||
|
||||
params[:scope] = 'all' if params[:scope].blank?
|
||||
params[:state] = 'opened' if params[:state].blank?
|
||||
|
||||
@sort = params[:sort]
|
||||
@filter_params = params.dup
|
||||
|
||||
if @project
|
||||
@filter_params[:project_id] = @project.id
|
||||
elsif @group
|
||||
@filter_params[:group_id] = @group.id
|
||||
else
|
||||
# TODO: this filter ignore issues/mr created in public or
|
||||
# internal repos where you are not a member. Enable this filter
|
||||
# or improve current implementation to filter only issues you
|
||||
# created or assigned or mentioned
|
||||
# @filter_params[:authorized_only] = true
|
||||
end
|
||||
|
||||
@filter_params
|
||||
end
|
||||
|
||||
def get_issues_collection
|
||||
set_filters_params
|
||||
@issuable_finder = IssuesFinder.new(current_user, @filter_params)
|
||||
@issuable_finder.execute
|
||||
end
|
||||
|
||||
def get_merge_requests_collection
|
||||
set_filters_params
|
||||
@issuable_finder = MergeRequestsFinder.new(current_user, @filter_params)
|
||||
@issuable_finder.execute
|
||||
end
|
||||
|
||||
def import_sources_enabled?
|
||||
!current_application_settings.import_sources.empty?
|
||||
end
|
||||
|
|
@ -363,24 +327,4 @@ class ApplicationController < ActionController::Base
|
|||
def u2f_app_id
|
||||
request.base_url
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
def set_default_sort
|
||||
key = if is_a_listing_page_for?('issues') || is_a_listing_page_for?('merge_requests')
|
||||
'issuable_sort'
|
||||
end
|
||||
|
||||
cookies[key] = params[:sort] if key && params[:sort].present?
|
||||
params[:sort] = cookies[key] if key
|
||||
params[:sort] ||= 'id_desc'
|
||||
end
|
||||
|
||||
def is_a_listing_page_for?(page_type)
|
||||
controller_name, action_name = params.values_at(:controller, :action)
|
||||
|
||||
(controller_name == "projects/#{page_type}" && action_name == 'index') ||
|
||||
(controller_name == 'groups' && action_name == page_type) ||
|
||||
(controller_name == 'dashboard' && action_name == page_type)
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
module DiffForPath
|
||||
extend ActiveSupport::Concern
|
||||
|
||||
def render_diff_for_path(diffs, diff_refs, project)
|
||||
diff_file = safe_diff_files(diffs, diff_refs: diff_refs, repository: project.repository).find do |diff|
|
||||
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]
|
||||
end
|
||||
|
||||
|
|
@ -14,7 +14,7 @@ module DiffForPath
|
|||
locals = {
|
||||
diff_file: diff_file,
|
||||
diff_commit: diff_commit,
|
||||
diff_refs: diff_refs,
|
||||
diff_refs: diffs.diff_refs,
|
||||
blob: blob,
|
||||
project: project
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,79 @@
|
|||
module IssuableCollections
|
||||
extend ActiveSupport::Concern
|
||||
include SortingHelper
|
||||
|
||||
included do
|
||||
helper_method :issues_finder
|
||||
helper_method :merge_requests_finder
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
def issues_collection
|
||||
issues_finder.execute
|
||||
end
|
||||
|
||||
def merge_requests_collection
|
||||
merge_requests_finder.execute
|
||||
end
|
||||
|
||||
def issues_finder
|
||||
@issues_finder ||= issuable_finder_for(IssuesFinder)
|
||||
end
|
||||
|
||||
def merge_requests_finder
|
||||
@merge_requests_finder ||= issuable_finder_for(MergeRequestsFinder)
|
||||
end
|
||||
|
||||
def issuable_finder_for(finder_class)
|
||||
finder_class.new(current_user, filter_params)
|
||||
end
|
||||
|
||||
def filter_params
|
||||
set_sort_order_from_cookie
|
||||
set_default_scope
|
||||
set_default_state
|
||||
|
||||
@filter_params = params.dup
|
||||
@filter_params[:sort] ||= default_sort_order
|
||||
|
||||
@sort = @filter_params[:sort]
|
||||
|
||||
if @project
|
||||
@filter_params[:project_id] = @project.id
|
||||
elsif @group
|
||||
@filter_params[:group_id] = @group.id
|
||||
else
|
||||
# TODO: this filter ignore issues/mr created in public or
|
||||
# internal repos where you are not a member. Enable this filter
|
||||
# or improve current implementation to filter only issues you
|
||||
# created or assigned or mentioned
|
||||
# @filter_params[:authorized_only] = true
|
||||
end
|
||||
|
||||
@filter_params
|
||||
end
|
||||
|
||||
def set_default_scope
|
||||
params[:scope] = 'all' if params[:scope].blank?
|
||||
end
|
||||
|
||||
def set_default_state
|
||||
params[:state] = 'opened' if params[:state].blank?
|
||||
end
|
||||
|
||||
def set_sort_order_from_cookie
|
||||
key = 'issuable_sort'
|
||||
|
||||
cookies[key] = params[:sort] if params[:sort].present?
|
||||
params[:sort] = cookies[key]
|
||||
end
|
||||
|
||||
def default_sort_order
|
||||
case params[:state]
|
||||
when 'opened', 'all' then sort_value_recently_created
|
||||
when 'merged', 'closed' then sort_value_recently_updated
|
||||
else sort_value_recently_created
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
@ -1,12 +1,14 @@
|
|||
module IssuesAction
|
||||
extend ActiveSupport::Concern
|
||||
include IssuableCollections
|
||||
|
||||
def issues
|
||||
@issues = get_issues_collection.non_archived
|
||||
@issues = @issues.page(params[:page])
|
||||
@issues = @issues.preload(:author, :project)
|
||||
@label = issues_finder.labels.first
|
||||
|
||||
@label = @issuable_finder.labels.first
|
||||
@issues = issues_collection
|
||||
.non_archived
|
||||
.preload(:author, :project)
|
||||
.page(params[:page])
|
||||
|
||||
respond_to do |format|
|
||||
format.html
|
||||
|
|
|
|||
|
|
@ -1,11 +1,13 @@
|
|||
module MergeRequestsAction
|
||||
extend ActiveSupport::Concern
|
||||
include IssuableCollections
|
||||
|
||||
def merge_requests
|
||||
@merge_requests = get_merge_requests_collection.non_archived
|
||||
@merge_requests = @merge_requests.page(params[:page])
|
||||
@merge_requests = @merge_requests.preload(:author, :target_project)
|
||||
@label = merge_requests_finder.labels.first
|
||||
|
||||
@label = @issuable_finder.labels.first
|
||||
@merge_requests = merge_requests_collection
|
||||
.non_archived
|
||||
.preload(:author, :target_project)
|
||||
.page(params[:page])
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -82,8 +82,6 @@ class Import::BitbucketController < Import::BaseController
|
|||
go_to_bitbucket_for_permissions
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
def access_params
|
||||
{
|
||||
bitbucket_access_token: session[:bitbucket_access_token],
|
||||
|
|
|
|||
|
|
@ -61,8 +61,6 @@ class Import::GitlabController < Import::BaseController
|
|||
go_to_gitlab_for_permissions
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
def access_params
|
||||
{ gitlab_access_token: session[:gitlab_access_token] }
|
||||
end
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ class Projects::CommitController < Projects::ApplicationController
|
|||
end
|
||||
|
||||
def diff_for_path
|
||||
render_diff_for_path(@diffs, @commit.diff_refs, @project)
|
||||
render_diff_for_path(@commit.diffs(diff_options))
|
||||
end
|
||||
|
||||
def builds
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ class Projects::CompareController < Projects::ApplicationController
|
|||
def diff_for_path
|
||||
return render_404 unless @compare
|
||||
|
||||
render_diff_for_path(@diffs, @diff_refs, @project)
|
||||
render_diff_for_path(@compare.diffs(diff_options))
|
||||
end
|
||||
|
||||
def create
|
||||
|
|
@ -40,18 +40,12 @@ class Projects::CompareController < Projects::ApplicationController
|
|||
@compare = CompareService.new.execute(@project, @head_ref, @project, @start_ref)
|
||||
|
||||
if @compare
|
||||
@commits = Commit.decorate(@compare.commits, @project)
|
||||
|
||||
@start_commit = @project.commit(@start_ref)
|
||||
@commit = @project.commit(@head_ref)
|
||||
@base_commit = @project.merge_base_commit(@start_ref, @head_ref)
|
||||
@commits = @compare.commits
|
||||
@start_commit = @compare.start_commit
|
||||
@commit = @compare.commit
|
||||
@base_commit = @compare.base_commit
|
||||
|
||||
@diffs = @compare.diffs(diff_options)
|
||||
@diff_refs = Gitlab::Diff::DiffRefs.new(
|
||||
base_sha: @base_commit.try(:sha),
|
||||
start_sha: @start_commit.try(:sha),
|
||||
head_sha: @commit.try(:sha)
|
||||
)
|
||||
|
||||
@diff_notes_disabled = true
|
||||
@grouped_diff_discussions = {}
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@ class Projects::EnvironmentsController < Projects::ApplicationController
|
|||
layout 'project'
|
||||
before_action :authorize_read_environment!
|
||||
before_action :authorize_create_environment!, only: [:new, :create]
|
||||
before_action :authorize_update_environment!, only: [:destroy]
|
||||
before_action :environment, only: [:show, :destroy]
|
||||
before_action :authorize_update_environment!, only: [:edit, :update, :destroy]
|
||||
before_action :environment, only: [:show, :edit, :update, :destroy]
|
||||
|
||||
def index
|
||||
@environments = project.environments
|
||||
|
|
@ -17,13 +17,24 @@ class Projects::EnvironmentsController < Projects::ApplicationController
|
|||
@environment = project.environments.new
|
||||
end
|
||||
|
||||
def edit
|
||||
end
|
||||
|
||||
def create
|
||||
@environment = project.environments.create(create_params)
|
||||
@environment = project.environments.create(environment_params)
|
||||
|
||||
if @environment.persisted?
|
||||
redirect_to namespace_project_environment_path(project.namespace, project, @environment)
|
||||
else
|
||||
render 'new'
|
||||
render :new
|
||||
end
|
||||
end
|
||||
|
||||
def update
|
||||
if @environment.update(environment_params)
|
||||
redirect_to namespace_project_environment_path(project.namespace, project, @environment)
|
||||
else
|
||||
render :edit
|
||||
end
|
||||
end
|
||||
|
||||
|
|
@ -39,8 +50,8 @@ class Projects::EnvironmentsController < Projects::ApplicationController
|
|||
|
||||
private
|
||||
|
||||
def create_params
|
||||
params.require(:environment).permit(:name)
|
||||
def environment_params
|
||||
params.require(:environment).permit(:name, :external_url)
|
||||
end
|
||||
|
||||
def environment
|
||||
|
|
|
|||
|
|
@ -3,7 +3,9 @@ class Projects::IssuesController < Projects::ApplicationController
|
|||
include ToggleSubscriptionAction
|
||||
include IssuableActions
|
||||
include ToggleAwardEmoji
|
||||
include IssuableCollections
|
||||
|
||||
before_action :redirect_to_external_issue_tracker, only: [:index, :new]
|
||||
before_action :module_enabled
|
||||
before_action :issue, only: [:edit, :update, :show, :referenced_merge_requests,
|
||||
:related_branches, :can_create_branch]
|
||||
|
|
@ -24,7 +26,7 @@ class Projects::IssuesController < Projects::ApplicationController
|
|||
|
||||
def index
|
||||
terms = params['issue_search']
|
||||
@issues = get_issues_collection
|
||||
@issues = issues_collection
|
||||
|
||||
if terms.present?
|
||||
if terms =~ /\A#(\d+)\z/
|
||||
|
|
@ -200,6 +202,18 @@ class Projects::IssuesController < Projects::ApplicationController
|
|||
return render_404 unless @project.issues_enabled && @project.default_issues_tracker?
|
||||
end
|
||||
|
||||
def redirect_to_external_issue_tracker
|
||||
external = @project.external_issue_tracker
|
||||
|
||||
return unless external
|
||||
|
||||
if action_name == 'new'
|
||||
redirect_to external.new_issue_path
|
||||
else
|
||||
redirect_to external.issues_url
|
||||
end
|
||||
end
|
||||
|
||||
# Since iids are implemented only in 6.1
|
||||
# user may navigate to issue page using old global ids.
|
||||
#
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController
|
|||
include IssuableActions
|
||||
include NotesHelper
|
||||
include ToggleAwardEmoji
|
||||
include IssuableCollections
|
||||
|
||||
before_action :module_enabled
|
||||
before_action :merge_request, only: [
|
||||
|
|
@ -29,7 +30,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController
|
|||
|
||||
def index
|
||||
terms = params['issue_search']
|
||||
@merge_requests = get_merge_requests_collection
|
||||
@merge_requests = merge_requests_collection
|
||||
|
||||
if terms.present?
|
||||
if terms =~ /\A[#!](\d+)\z/
|
||||
|
|
@ -84,7 +85,11 @@ class Projects::MergeRequestsController < Projects::ApplicationController
|
|||
|
||||
respond_to do |format|
|
||||
format.html { define_discussion_vars }
|
||||
format.json { render json: { html: view_to_html_string("projects/merge_requests/show/_diffs") } }
|
||||
format.json do
|
||||
@diffs = @merge_request.diffs(diff_options)
|
||||
|
||||
render json: { html: view_to_html_string("projects/merge_requests/show/_diffs") }
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
|
@ -102,9 +107,8 @@ class Projects::MergeRequestsController < Projects::ApplicationController
|
|||
end
|
||||
|
||||
define_commit_vars
|
||||
diffs = @merge_request.diffs(diff_options)
|
||||
|
||||
render_diff_for_path(diffs, @merge_request.diff_refs, @merge_request.project)
|
||||
render_diff_for_path(@merge_request.diffs(diff_options))
|
||||
end
|
||||
|
||||
def commits
|
||||
|
|
@ -152,7 +156,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController
|
|||
@commits = @merge_request.compare_commits.reverse
|
||||
@commit = @merge_request.diff_head_commit
|
||||
@base_commit = @merge_request.diff_base_commit
|
||||
@diffs = @merge_request.compare.diffs(diff_options) if @merge_request.compare
|
||||
@diffs = @merge_request.diffs(diff_options) if @merge_request.compare
|
||||
@diff_notes_disabled = true
|
||||
|
||||
@pipeline = @merge_request.pipeline
|
||||
|
|
@ -374,6 +378,8 @@ class Projects::MergeRequestsController < Projects::ApplicationController
|
|||
|
||||
@discussions = @merge_request.discussions
|
||||
|
||||
preload_noteable_for_regular_notes(@discussions.flat_map(&:notes))
|
||||
|
||||
# This is not executed lazily
|
||||
@notes = Banzai::NoteRenderer.render(
|
||||
@discussions.flat_map(&:notes),
|
||||
|
|
|
|||
|
|
@ -3,19 +3,24 @@ class Projects::ProtectedBranchesController < Projects::ApplicationController
|
|||
before_action :require_non_empty_project
|
||||
before_action :authorize_admin_project!
|
||||
before_action :load_protected_branch, only: [:show, :update, :destroy]
|
||||
before_action :load_protected_branches, only: [:index]
|
||||
|
||||
layout "project_settings"
|
||||
|
||||
def index
|
||||
@protected_branches = @project.protected_branches.order(:name).page(params[:page])
|
||||
@protected_branch = @project.protected_branches.new
|
||||
gon.push({ open_branches: @project.open_branches.map { |br| { text: br.name, id: br.name, title: br.name } } })
|
||||
load_protected_branches_gon_variables
|
||||
end
|
||||
|
||||
def create
|
||||
@project.protected_branches.create(protected_branch_params)
|
||||
redirect_to namespace_project_protected_branches_path(@project.namespace,
|
||||
@project)
|
||||
@protected_branch = ProtectedBranches::CreateService.new(@project, current_user, protected_branch_params).execute
|
||||
if @protected_branch.persisted?
|
||||
redirect_to namespace_project_protected_branches_path(@project.namespace, @project)
|
||||
else
|
||||
load_protected_branches
|
||||
load_protected_branches_gon_variables
|
||||
render :index
|
||||
end
|
||||
end
|
||||
|
||||
def show
|
||||
|
|
@ -23,7 +28,9 @@ class Projects::ProtectedBranchesController < Projects::ApplicationController
|
|||
end
|
||||
|
||||
def update
|
||||
if @protected_branch && @protected_branch.update_attributes(protected_branch_params)
|
||||
@protected_branch = ProtectedBranches::UpdateService.new(@project, current_user, protected_branch_params).execute(@protected_branch)
|
||||
|
||||
if @protected_branch.valid?
|
||||
respond_to do |format|
|
||||
format.json { render json: @protected_branch, status: :ok }
|
||||
end
|
||||
|
|
@ -50,6 +57,18 @@ class Projects::ProtectedBranchesController < Projects::ApplicationController
|
|||
end
|
||||
|
||||
def protected_branch_params
|
||||
params.require(:protected_branch).permit(:name, :developers_can_push, :developers_can_merge)
|
||||
params.require(:protected_branch).permit(:name,
|
||||
merge_access_level_attributes: [:access_level],
|
||||
push_access_level_attributes: [:access_level])
|
||||
end
|
||||
|
||||
def load_protected_branches
|
||||
@protected_branches = @project.protected_branches.order(:name).page(params[:page])
|
||||
end
|
||||
|
||||
def load_protected_branches_gon_variables
|
||||
gon.push({ open_branches: @project.open_branches.map { |br| { text: br.name, id: br.name, title: br.name } },
|
||||
push_access_levels: ProtectedBranch::PushAccessLevel.human_access_levels.map { |id, text| { id: id, text: text } },
|
||||
merge_access_levels: ProtectedBranch::MergeAccessLevel.human_access_levels.map { |id, text| { id: id, text: text } } })
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -97,7 +97,7 @@ class ProjectsController < Projects::ApplicationController
|
|||
end
|
||||
|
||||
if @project.pending_delete?
|
||||
flash[:alert] = "Project queued for delete."
|
||||
flash[:alert] = "Project #{@project.name} queued for deletion."
|
||||
end
|
||||
|
||||
respond_to do |format|
|
||||
|
|
|
|||
|
|
@ -109,7 +109,7 @@ class IssuableFinder
|
|||
|
||||
scope.where(title: params[:milestone_title])
|
||||
else
|
||||
nil
|
||||
Milestone.none
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
|||
|
|
@ -245,7 +245,6 @@ module ApplicationHelper
|
|||
milestone_title: params[:milestone_title],
|
||||
assignee_id: params[:assignee_id],
|
||||
author_id: params[:author_id],
|
||||
sort: params[:sort],
|
||||
issue_search: params[:issue_search],
|
||||
label_name: params[:label_name]
|
||||
}
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ module BlobHelper
|
|||
|
||||
blob = project.repository.blob_at(ref, path) rescue nil
|
||||
|
||||
return unless blob && blob_text_viewable?(blob)
|
||||
return unless blob
|
||||
|
||||
from_mr = options[:from_merge_request_id]
|
||||
link_opts = {}
|
||||
|
|
|
|||
|
|
@ -206,10 +206,10 @@ module CommitsHelper
|
|||
end
|
||||
end
|
||||
|
||||
def view_file_btn(commit_sha, diff, project)
|
||||
def view_file_btn(commit_sha, diff_new_path, project)
|
||||
link_to(
|
||||
namespace_project_blob_path(project.namespace, project,
|
||||
tree_join(commit_sha, diff.new_path)),
|
||||
tree_join(commit_sha, diff_new_path)),
|
||||
class: 'btn view-file js-view-file btn-file-option'
|
||||
) do
|
||||
raw('View file @') + content_tag(:span, commit_sha[0..6],
|
||||
|
|
|
|||
|
|
@ -30,11 +30,7 @@ module DiffHelper
|
|||
options[:paths] = params.values_at(:old_path, :new_path)
|
||||
end
|
||||
|
||||
Commit.max_diff_options.merge(options)
|
||||
end
|
||||
|
||||
def safe_diff_files(diffs, diff_refs: nil, repository: nil)
|
||||
diffs.decorate! { |diff| Gitlab::Diff::File.new(diff, diff_refs: diff_refs, repository: repository) }
|
||||
options
|
||||
end
|
||||
|
||||
def unfold_bottom_class(bottom)
|
||||
|
|
@ -144,8 +140,6 @@ module DiffHelper
|
|||
toggle_whitespace_link(url, options)
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
def hide_whitespace?
|
||||
params[:w] == '1'
|
||||
end
|
||||
|
|
|
|||
|
|
@ -13,38 +13,6 @@ module IssuesHelper
|
|||
OpenStruct.new(id: 0, title: 'None (backlog)', name: 'Unassigned')
|
||||
end
|
||||
|
||||
def url_for_project_issues(project = @project, options = {})
|
||||
return '' if project.nil?
|
||||
|
||||
url =
|
||||
if options[:only_path]
|
||||
project.issues_tracker.project_path
|
||||
else
|
||||
project.issues_tracker.project_url
|
||||
end
|
||||
|
||||
# Ensure we return a valid URL to prevent possible XSS.
|
||||
URI.parse(url).to_s
|
||||
rescue URI::InvalidURIError
|
||||
''
|
||||
end
|
||||
|
||||
def url_for_new_issue(project = @project, options = {})
|
||||
return '' if project.nil?
|
||||
|
||||
url =
|
||||
if options[:only_path]
|
||||
project.issues_tracker.new_issue_path
|
||||
else
|
||||
project.issues_tracker.new_issue_url
|
||||
end
|
||||
|
||||
# Ensure we return a valid URL to prevent possible XSS.
|
||||
URI.parse(url).to_s
|
||||
rescue URI::InvalidURIError
|
||||
''
|
||||
end
|
||||
|
||||
def url_for_issue(issue_iid, project = @project, options = {})
|
||||
return '' if project.nil?
|
||||
|
||||
|
|
|
|||
|
|
@ -90,6 +90,10 @@ module NotesHelper
|
|||
project.team.max_member_access_for_user_ids(user_ids)
|
||||
end
|
||||
|
||||
def preload_noteable_for_regular_notes(notes)
|
||||
ActiveRecord::Associations::Preloader.new.preload(notes.select { |note| !note.for_commit? }, :noteable)
|
||||
end
|
||||
|
||||
def note_max_access_for_user(note)
|
||||
note.project.team.human_max_access(note.author_id)
|
||||
end
|
||||
|
|
|
|||
|
|
@ -263,6 +263,10 @@ module ProjectsHelper
|
|||
filename_path(project, :version)
|
||||
end
|
||||
|
||||
def ci_configuration_path(project)
|
||||
filename_path(project, :gitlab_ci_yml)
|
||||
end
|
||||
|
||||
def project_wiki_path_with_version(proj, page, version, is_newest)
|
||||
url_params = is_newest ? {} : { version_id: version }
|
||||
namespace_project_wiki_path(proj.namespace, proj, page, url_params)
|
||||
|
|
|
|||
|
|
@ -102,11 +102,11 @@ module SortingHelper
|
|||
end
|
||||
|
||||
def sort_value_oldest_created
|
||||
'id_asc'
|
||||
'created_asc'
|
||||
end
|
||||
|
||||
def sort_value_recently_created
|
||||
'id_desc'
|
||||
'created_desc'
|
||||
end
|
||||
|
||||
def sort_value_milestone_soon
|
||||
|
|
|
|||
|
|
@ -47,6 +47,16 @@ class Ability
|
|||
end
|
||||
end
|
||||
|
||||
# Returns an Array of Issues that can be read by the given user.
|
||||
#
|
||||
# issues - The issues to reduce down to those readable by the user.
|
||||
# user - The User for which to check the issues
|
||||
def issues_readable_by_user(issues, user = nil)
|
||||
return issues if user && user.admin?
|
||||
|
||||
issues.select { |issue| issue.visible_to_user?(user) }
|
||||
end
|
||||
|
||||
# List of possible abilities for anonymous user
|
||||
def anonymous_abilities(user, subject)
|
||||
if subject.is_a?(PersonalSnippet)
|
||||
|
|
|
|||
|
|
@ -13,6 +13,7 @@ module Ci
|
|||
scope :unstarted, ->() { where(runner_id: nil) }
|
||||
scope :ignore_failures, ->() { where(allow_failure: false) }
|
||||
scope :with_artifacts, ->() { where.not(artifacts_file: [nil, '']) }
|
||||
scope :with_artifacts_not_expired, ->() { with_artifacts.where('artifacts_expire_at IS NULL OR artifacts_expire_at > ?', Time.now) }
|
||||
scope :with_expired_artifacts, ->() { with_artifacts.where('artifacts_expire_at < ?', Time.now) }
|
||||
scope :last_month, ->() { where('created_at > ?', Date.today - 1.month) }
|
||||
scope :manual_actions, ->() { where(when: :manual) }
|
||||
|
|
|
|||
|
|
@ -104,7 +104,7 @@ class Commit
|
|||
end
|
||||
|
||||
def diff_line_count
|
||||
@diff_line_count ||= Commit::diff_line_count(self.diffs)
|
||||
@diff_line_count ||= Commit::diff_line_count(raw_diffs)
|
||||
@diff_line_count
|
||||
end
|
||||
|
||||
|
|
@ -123,15 +123,17 @@ class Commit
|
|||
# In case this first line is longer than 100 characters, it is cut off
|
||||
# after 80 characters and ellipses (`&hellp;`) are appended.
|
||||
def title
|
||||
title = safe_message
|
||||
full_title.length > 100 ? full_title[0..79] << "…" : full_title
|
||||
end
|
||||
|
||||
return no_commit_message if title.blank?
|
||||
# Returns the full commits title
|
||||
def full_title
|
||||
return @full_title if @full_title
|
||||
|
||||
title_end = title.index("\n")
|
||||
if (!title_end && title.length > 100) || (title_end && title_end > 100)
|
||||
title[0..79] << "…"
|
||||
if safe_message.blank?
|
||||
@full_title = no_commit_message
|
||||
else
|
||||
title.split("\n", 2).first
|
||||
@full_title = safe_message.split("\n", 2).first
|
||||
end
|
||||
end
|
||||
|
||||
|
|
@ -178,7 +180,18 @@ class Commit
|
|||
end
|
||||
|
||||
def author
|
||||
@author ||= User.find_by_any_email(author_email.downcase)
|
||||
if RequestStore.active?
|
||||
key = "commit_author:#{author_email.downcase}"
|
||||
# nil is a valid value since no author may exist in the system
|
||||
if RequestStore.store.has_key?(key)
|
||||
@author = RequestStore.store[key]
|
||||
else
|
||||
@author = find_author_by_any_email
|
||||
RequestStore.store[key] = @author
|
||||
end
|
||||
else
|
||||
@author ||= find_author_by_any_email
|
||||
end
|
||||
end
|
||||
|
||||
def committer
|
||||
|
|
@ -304,12 +317,24 @@ class Commit
|
|||
nil
|
||||
end
|
||||
|
||||
def raw_diffs(*args)
|
||||
raw.diffs(*args)
|
||||
end
|
||||
|
||||
def diffs(diff_options = nil)
|
||||
Gitlab::Diff::FileCollection::Commit.new(self, diff_options: diff_options)
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
def find_author_by_any_email
|
||||
User.find_by_any_email(author_email.downcase)
|
||||
end
|
||||
|
||||
def repo_changes
|
||||
changes = { added: [], modified: [], removed: [] }
|
||||
|
||||
diffs.each do |diff|
|
||||
raw_diffs(deltas_only: true).each do |diff|
|
||||
if diff.deleted_file
|
||||
changes[:removed] << diff.old_path
|
||||
elsif diff.renamed_file || diff.new_file
|
||||
|
|
|
|||
|
|
@ -0,0 +1,66 @@
|
|||
class Compare
|
||||
delegate :same, :head, :base, to: :@compare
|
||||
|
||||
attr_reader :project
|
||||
|
||||
def self.decorate(compare, project)
|
||||
if compare.is_a?(Compare)
|
||||
compare
|
||||
else
|
||||
self.new(compare, project)
|
||||
end
|
||||
end
|
||||
|
||||
def initialize(compare, project)
|
||||
@compare = compare
|
||||
@project = project
|
||||
end
|
||||
|
||||
def commits
|
||||
@commits ||= Commit.decorate(@compare.commits, project)
|
||||
end
|
||||
|
||||
def start_commit
|
||||
return @start_commit if defined?(@start_commit)
|
||||
|
||||
commit = @compare.base
|
||||
@start_commit = commit ? ::Commit.new(commit, project) : nil
|
||||
end
|
||||
|
||||
def head_commit
|
||||
return @head_commit if defined?(@head_commit)
|
||||
|
||||
commit = @compare.head
|
||||
@head_commit = commit ? ::Commit.new(commit, project) : nil
|
||||
end
|
||||
alias_method :commit, :head_commit
|
||||
|
||||
def base_commit
|
||||
return @base_commit if defined?(@base_commit)
|
||||
|
||||
@base_commit = if start_commit && head_commit
|
||||
project.merge_base_commit(start_commit.id, head_commit.id)
|
||||
else
|
||||
nil
|
||||
end
|
||||
end
|
||||
|
||||
def raw_diffs(*args)
|
||||
@compare.diffs(*args)
|
||||
end
|
||||
|
||||
def diffs(diff_options = nil)
|
||||
Gitlab::Diff::FileCollection::Compare.new(self,
|
||||
project: project,
|
||||
diff_options: diff_options,
|
||||
diff_refs: diff_refs)
|
||||
end
|
||||
|
||||
def diff_refs
|
||||
Gitlab::Diff::DiffRefs.new(
|
||||
base_sha: base_commit.try(:sha),
|
||||
start_sha: start_commit.try(:sha),
|
||||
head_sha: commit.try(:sha)
|
||||
)
|
||||
end
|
||||
end
|
||||
|
|
@ -1,12 +1,26 @@
|
|||
module TokenAuthenticatable
|
||||
extend ActiveSupport::Concern
|
||||
|
||||
private
|
||||
|
||||
def write_new_token(token_field)
|
||||
new_token = generate_token(token_field)
|
||||
write_attribute(token_field, new_token)
|
||||
end
|
||||
|
||||
def generate_token(token_field)
|
||||
loop do
|
||||
token = Devise.friendly_token
|
||||
break token unless self.class.unscoped.find_by(token_field => token)
|
||||
end
|
||||
end
|
||||
|
||||
class_methods do
|
||||
def authentication_token_fields
|
||||
@token_fields || []
|
||||
end
|
||||
|
||||
private
|
||||
private # rubocop:disable Lint/UselessAccessModifier
|
||||
|
||||
def add_authentication_token_field(token_field)
|
||||
@token_fields = [] unless @token_fields
|
||||
|
|
@ -32,18 +46,4 @@ module TokenAuthenticatable
|
|||
end
|
||||
end
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
def write_new_token(token_field)
|
||||
new_token = generate_token(token_field)
|
||||
write_attribute(token_field, new_token)
|
||||
end
|
||||
|
||||
def generate_token(token_field)
|
||||
loop do
|
||||
token = Devise.friendly_token
|
||||
break token unless self.class.unscoped.find_by(token_field => token)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -70,7 +70,7 @@ class DiffNote < Note
|
|||
return false unless supported?
|
||||
return true if for_commit?
|
||||
|
||||
diff_refs ||= self.noteable.diff_refs
|
||||
diff_refs ||= noteable_diff_refs
|
||||
|
||||
self.position.diff_refs == diff_refs
|
||||
end
|
||||
|
|
@ -120,6 +120,14 @@ class DiffNote < Note
|
|||
for_commit? || self.noteable.support_new_diff_notes?
|
||||
end
|
||||
|
||||
def noteable_diff_refs
|
||||
if noteable.respond_to?(:diff_sha_refs)
|
||||
noteable.diff_sha_refs
|
||||
else
|
||||
noteable.diff_refs
|
||||
end
|
||||
end
|
||||
|
||||
def set_original_position
|
||||
self.original_position = self.position.dup
|
||||
end
|
||||
|
|
@ -138,7 +146,7 @@ class DiffNote < Note
|
|||
self.project,
|
||||
nil,
|
||||
old_diff_refs: self.position.diff_refs,
|
||||
new_diff_refs: self.noteable.diff_refs,
|
||||
new_diff_refs: noteable_diff_refs,
|
||||
paths: self.position.paths
|
||||
).execute(self)
|
||||
end
|
||||
|
|
|
|||
|
|
@ -67,11 +67,15 @@ class Discussion
|
|||
end
|
||||
|
||||
def resolvable?
|
||||
diff_discussion? && notes.any?(&:resolvable?)
|
||||
return @resolvable if defined?(@resolvable)
|
||||
|
||||
@resolvable = diff_discussion? && notes.any?(&:resolvable?)
|
||||
end
|
||||
|
||||
def resolved?
|
||||
resolvable? && notes.none?(&:to_be_resolved?)
|
||||
return @resolved if defined?(@resolved)
|
||||
|
||||
@resolved = resolvable? && notes.none?(&:to_be_resolved?)
|
||||
end
|
||||
|
||||
def resolved_notes
|
||||
|
|
@ -79,7 +83,9 @@ class Discussion
|
|||
end
|
||||
|
||||
def to_be_resolved?
|
||||
notes.any?(&:to_be_resolved?)
|
||||
return @to_be_resolved if defined?(@to_be_resolved)
|
||||
|
||||
@to_be_resolved = notes.any?(&:to_be_resolved?)
|
||||
end
|
||||
|
||||
def can_resolve?(current_user)
|
||||
|
|
@ -106,6 +112,12 @@ class Discussion
|
|||
self.noteable == target && !diff_discussion?
|
||||
end
|
||||
|
||||
def active?
|
||||
return @active if defined?(@active)
|
||||
|
||||
@active = first_note.active?
|
||||
end
|
||||
|
||||
def collapsed?
|
||||
return false unless diff_discussion?
|
||||
|
||||
|
|
|
|||
|
|
@ -3,6 +3,8 @@ class Environment < ActiveRecord::Base
|
|||
|
||||
has_many :deployments
|
||||
|
||||
before_validation :nullify_external_url
|
||||
|
||||
validates :name,
|
||||
presence: true,
|
||||
uniqueness: { scope: :project_id },
|
||||
|
|
@ -10,7 +12,17 @@ class Environment < ActiveRecord::Base
|
|||
format: { with: Gitlab::Regex.environment_name_regex,
|
||||
message: Gitlab::Regex.environment_name_regex_message }
|
||||
|
||||
validates :external_url,
|
||||
uniqueness: { scope: :project_id },
|
||||
length: { maximum: 255 },
|
||||
allow_nil: true,
|
||||
addressable_url: true
|
||||
|
||||
def last_deployment
|
||||
deployments.last
|
||||
end
|
||||
|
||||
def nullify_external_url
|
||||
self.external_url = nil if self.external_url.blank?
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -230,6 +230,34 @@ class Issue < ActiveRecord::Base
|
|||
self.closed_by_merge_requests(current_user).empty?
|
||||
end
|
||||
|
||||
# Returns `true` if the current issue can be viewed by either a logged in User
|
||||
# or an anonymous user.
|
||||
def visible_to_user?(user = nil)
|
||||
user ? readable_by?(user) : publicly_visible?
|
||||
end
|
||||
|
||||
# Returns `true` if the given User can read the current Issue.
|
||||
def readable_by?(user)
|
||||
if user.admin?
|
||||
true
|
||||
elsif project.owner == user
|
||||
true
|
||||
elsif confidential?
|
||||
author == user ||
|
||||
assignee == user ||
|
||||
project.team.member?(user, Gitlab::Access::REPORTER)
|
||||
else
|
||||
project.public? ||
|
||||
project.internal? && !user.external? ||
|
||||
project.team.member?(user)
|
||||
end
|
||||
end
|
||||
|
||||
# Returns `true` if this Issue is visible to everybody.
|
||||
def publicly_visible?
|
||||
project.public? && !confidential?
|
||||
end
|
||||
|
||||
def overdue?
|
||||
due_date.try(:past?) || false
|
||||
end
|
||||
|
|
|
|||
|
|
@ -26,8 +26,9 @@ class Key < ActiveRecord::Base
|
|||
end
|
||||
|
||||
def publishable_key
|
||||
# Removes anything beyond the keytype and key itself
|
||||
self.key.split[0..1].join(' ')
|
||||
# Strip out the keys comment so we don't leak email addresses
|
||||
# Replace with simple ident of user_name (hostname)
|
||||
self.key.split[0..1].push("#{self.user_name} (#{Gitlab.config.gitlab.host})").join(' ')
|
||||
end
|
||||
|
||||
# projects that has this key
|
||||
|
|
|
|||
|
|
@ -1,7 +1,9 @@
|
|||
class LabelLink < ActiveRecord::Base
|
||||
include Importable
|
||||
|
||||
belongs_to :target, polymorphic: true
|
||||
belongs_to :label
|
||||
|
||||
validates :target, presence: true
|
||||
validates :label, presence: true
|
||||
validates :target, presence: true, unless: :importing?
|
||||
validates :label, presence: true, unless: :importing?
|
||||
end
|
||||
|
|
|
|||
|
|
@ -85,7 +85,7 @@ class LegacyDiffNote < Note
|
|||
return nil unless noteable
|
||||
return @diff if defined?(@diff)
|
||||
|
||||
@diff = noteable.diffs(Commit.max_diff_options).find do |d|
|
||||
@diff = noteable.raw_diffs(Commit.max_diff_options).find do |d|
|
||||
d.new_path && Digest::SHA1.hexdigest(d.new_path) == diff_file_hash
|
||||
end
|
||||
end
|
||||
|
|
@ -116,7 +116,7 @@ class LegacyDiffNote < Note
|
|||
|
||||
# Find the diff on noteable that matches our own
|
||||
def find_noteable_diff
|
||||
diffs = noteable.diffs(Commit.max_diff_options)
|
||||
diffs = noteable.raw_diffs(Commit.max_diff_options)
|
||||
diffs.find { |d| d.new_path == self.diff.new_path }
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -164,8 +164,16 @@ class MergeRequest < ActiveRecord::Base
|
|||
merge_request_diff ? merge_request_diff.first_commit : compare_commits.first
|
||||
end
|
||||
|
||||
def diffs(*args)
|
||||
merge_request_diff ? merge_request_diff.diffs(*args) : compare.diffs(*args)
|
||||
def raw_diffs(*args)
|
||||
merge_request_diff ? merge_request_diff.raw_diffs(*args) : compare.raw_diffs(*args)
|
||||
end
|
||||
|
||||
def diffs(diff_options = nil)
|
||||
if self.compare
|
||||
self.compare.diffs(diff_options)
|
||||
else
|
||||
Gitlab::Diff::FileCollection::MergeRequest.new(self, diff_options: diff_options)
|
||||
end
|
||||
end
|
||||
|
||||
def diff_size
|
||||
|
|
@ -238,11 +246,11 @@ class MergeRequest < ActiveRecord::Base
|
|||
end
|
||||
|
||||
def target_branch_sha
|
||||
target_branch_head.try(:sha)
|
||||
@target_branch_sha || target_branch_head.try(:sha)
|
||||
end
|
||||
|
||||
def source_branch_sha
|
||||
source_branch_head.try(:sha)
|
||||
@source_branch_sha || source_branch_head.try(:sha)
|
||||
end
|
||||
|
||||
def diff_refs
|
||||
|
|
@ -255,6 +263,19 @@ class MergeRequest < ActiveRecord::Base
|
|||
)
|
||||
end
|
||||
|
||||
# Return diff_refs instance trying to not touch the git repository
|
||||
def diff_sha_refs
|
||||
if merge_request_diff && merge_request_diff.diff_refs_by_sha?
|
||||
return Gitlab::Diff::DiffRefs.new(
|
||||
base_sha: merge_request_diff.base_commit_sha,
|
||||
start_sha: merge_request_diff.start_commit_sha,
|
||||
head_sha: merge_request_diff.head_commit_sha
|
||||
)
|
||||
else
|
||||
diff_refs
|
||||
end
|
||||
end
|
||||
|
||||
def validate_branches
|
||||
if target_project == source_project && target_branch == source_branch
|
||||
errors.add :branch_conflict, "You can not use same project/branch for source and target"
|
||||
|
|
@ -300,6 +321,8 @@ class MergeRequest < ActiveRecord::Base
|
|||
|
||||
merge_request_diff.reload_content
|
||||
|
||||
MergeRequests::MergeRequestDiffCacheService.new.execute(self)
|
||||
|
||||
new_diff_refs = self.diff_refs
|
||||
|
||||
update_diff_notes_positions(
|
||||
|
|
@ -674,7 +697,7 @@ class MergeRequest < ActiveRecord::Base
|
|||
end
|
||||
|
||||
def support_new_diff_notes?
|
||||
diff_refs && diff_refs.complete?
|
||||
diff_sha_refs && diff_sha_refs.complete?
|
||||
end
|
||||
|
||||
def update_diff_notes_positions(old_diff_refs:, new_diff_refs:)
|
||||
|
|
|
|||
|
|
@ -33,12 +33,12 @@ class MergeRequestDiff < ActiveRecord::Base
|
|||
end
|
||||
|
||||
def size
|
||||
real_size.presence || diffs.size
|
||||
real_size.presence || raw_diffs.size
|
||||
end
|
||||
|
||||
def diffs(options={})
|
||||
def raw_diffs(options={})
|
||||
if options[:ignore_whitespace_change]
|
||||
@diffs_no_whitespace ||= begin
|
||||
@raw_diffs_no_whitespace ||= begin
|
||||
compare = Gitlab::Git::Compare.new(
|
||||
repository.raw_repository,
|
||||
self.start_commit_sha || self.target_branch_sha,
|
||||
|
|
@ -47,8 +47,8 @@ class MergeRequestDiff < ActiveRecord::Base
|
|||
compare.diffs(options)
|
||||
end
|
||||
else
|
||||
@diffs ||= {}
|
||||
@diffs[options] ||= load_diffs(st_diffs, options)
|
||||
@raw_diffs ||= {}
|
||||
@raw_diffs[options] ||= load_diffs(st_diffs, options)
|
||||
end
|
||||
end
|
||||
|
||||
|
|
@ -82,6 +82,10 @@ class MergeRequestDiff < ActiveRecord::Base
|
|||
project.commit(self.head_commit_sha)
|
||||
end
|
||||
|
||||
def diff_refs_by_sha?
|
||||
base_commit_sha? && head_commit_sha? && start_commit_sha?
|
||||
end
|
||||
|
||||
def compare
|
||||
@compare ||=
|
||||
begin
|
||||
|
|
|
|||
|
|
@ -874,14 +874,6 @@ class Project < ActiveRecord::Base
|
|||
ProtectedBranch.matching(branch_name, protected_branches: @protected_branches).present?
|
||||
end
|
||||
|
||||
def developers_can_push_to_protected_branch?(branch_name)
|
||||
protected_branches.matching(branch_name).any?(&:developers_can_push)
|
||||
end
|
||||
|
||||
def developers_can_merge_to_protected_branch?(branch_name)
|
||||
protected_branches.matching(branch_name).any?(&:developers_can_merge)
|
||||
end
|
||||
|
||||
def forked?
|
||||
!(forked_project_link.nil? || forked_project_link.forked_from_project.nil?)
|
||||
end
|
||||
|
|
@ -1261,6 +1253,16 @@ class Project < ActiveRecord::Base
|
|||
authorized_for_user_by_shared_projects?(user, min_access_level)
|
||||
end
|
||||
|
||||
def append_or_update_attribute(name, value)
|
||||
old_values = public_send(name.to_s)
|
||||
|
||||
if Project.reflect_on_association(name).try(:macro) == :has_many && old_values.any?
|
||||
update_attribute(name, old_values + value)
|
||||
else
|
||||
update_attribute(name, value)
|
||||
end
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
def authorized_for_user_by_group?(user, min_access_level)
|
||||
|
|
|
|||
|
|
@ -138,8 +138,13 @@ class ProjectTeam
|
|||
def max_member_access_for_user_ids(user_ids)
|
||||
user_ids = user_ids.uniq
|
||||
key = "max_member_access:#{project.id}"
|
||||
RequestStore.store[key] ||= {}
|
||||
access = RequestStore.store[key]
|
||||
|
||||
access = {}
|
||||
|
||||
if RequestStore.active?
|
||||
RequestStore.store[key] ||= {}
|
||||
access = RequestStore.store[key]
|
||||
end
|
||||
|
||||
# Lookup only the IDs we need
|
||||
user_ids = user_ids - access.keys
|
||||
|
|
|
|||
|
|
@ -5,6 +5,12 @@ class ProtectedBranch < ActiveRecord::Base
|
|||
validates :name, presence: true
|
||||
validates :project, presence: true
|
||||
|
||||
has_one :merge_access_level, dependent: :destroy
|
||||
has_one :push_access_level, dependent: :destroy
|
||||
|
||||
accepts_nested_attributes_for :push_access_level
|
||||
accepts_nested_attributes_for :merge_access_level
|
||||
|
||||
def commit
|
||||
project.commit(self.name)
|
||||
end
|
||||
|
|
|
|||
|
|
@ -0,0 +1,24 @@
|
|||
class ProtectedBranch::MergeAccessLevel < ActiveRecord::Base
|
||||
belongs_to :protected_branch
|
||||
delegate :project, to: :protected_branch
|
||||
|
||||
validates :access_level, presence: true, inclusion: { in: [Gitlab::Access::MASTER,
|
||||
Gitlab::Access::DEVELOPER] }
|
||||
|
||||
def self.human_access_levels
|
||||
{
|
||||
Gitlab::Access::MASTER => "Masters",
|
||||
Gitlab::Access::DEVELOPER => "Developers + Masters"
|
||||
}.with_indifferent_access
|
||||
end
|
||||
|
||||
def check_access(user)
|
||||
return true if user.is_admin?
|
||||
|
||||
project.team.max_member_access(user.id) >= access_level
|
||||
end
|
||||
|
||||
def humanize
|
||||
self.class.human_access_levels[self.access_level]
|
||||
end
|
||||
end
|
||||
|
|
@ -0,0 +1,27 @@
|
|||
class ProtectedBranch::PushAccessLevel < ActiveRecord::Base
|
||||
belongs_to :protected_branch
|
||||
delegate :project, to: :protected_branch
|
||||
|
||||
validates :access_level, presence: true, inclusion: { in: [Gitlab::Access::MASTER,
|
||||
Gitlab::Access::DEVELOPER,
|
||||
Gitlab::Access::NO_ACCESS] }
|
||||
|
||||
def self.human_access_levels
|
||||
{
|
||||
Gitlab::Access::MASTER => "Masters",
|
||||
Gitlab::Access::DEVELOPER => "Developers + Masters",
|
||||
Gitlab::Access::NO_ACCESS => "No one"
|
||||
}.with_indifferent_access
|
||||
end
|
||||
|
||||
def check_access(user)
|
||||
return false if access_level == Gitlab::Access::NO_ACCESS
|
||||
return true if user.is_admin?
|
||||
|
||||
project.team.max_member_access(user.id) >= access_level
|
||||
end
|
||||
|
||||
def humanize
|
||||
self.class.human_access_levels[self.access_level]
|
||||
end
|
||||
end
|
||||
|
|
@ -70,7 +70,12 @@ class Repository
|
|||
|
||||
def commit(ref = 'HEAD')
|
||||
return nil unless exists?
|
||||
commit = Gitlab::Git::Commit.find(raw_repository, ref)
|
||||
commit =
|
||||
if ref.is_a?(Gitlab::Git::Commit)
|
||||
ref
|
||||
else
|
||||
Gitlab::Git::Commit.find(raw_repository, ref)
|
||||
end
|
||||
commit = ::Commit.new(commit, @project) if commit
|
||||
commit
|
||||
rescue Rugged::OdbError
|
||||
|
|
@ -158,7 +163,7 @@ class Repository
|
|||
before_remove_branch
|
||||
|
||||
branch = find_branch(branch_name)
|
||||
oldrev = branch.try(:target)
|
||||
oldrev = branch.try(:target).try(:id)
|
||||
newrev = Gitlab::Git::BLANK_SHA
|
||||
ref = Gitlab::Git::BRANCH_REF_PREFIX + branch_name
|
||||
|
||||
|
|
@ -259,10 +264,10 @@ class Repository
|
|||
# Rugged seems to throw a `ReferenceError` when given branch_names rather
|
||||
# than SHA-1 hashes
|
||||
number_commits_behind = raw_repository.
|
||||
count_commits_between(branch.target, root_ref_hash)
|
||||
count_commits_between(branch.target.sha, root_ref_hash)
|
||||
|
||||
number_commits_ahead = raw_repository.
|
||||
count_commits_between(root_ref_hash, branch.target)
|
||||
count_commits_between(root_ref_hash, branch.target.sha)
|
||||
|
||||
{ behind: number_commits_behind, ahead: number_commits_ahead }
|
||||
end
|
||||
|
|
@ -367,7 +372,7 @@ class Repository
|
|||
# We don't want to flush the cache if the commit didn't actually make any
|
||||
# changes to any of the possible avatar files.
|
||||
if revision && commit = self.commit(revision)
|
||||
return unless commit.diffs.
|
||||
return unless commit.raw_diffs(deltas_only: true).
|
||||
any? { |diff| AVATAR_FILES.include?(diff.new_path) }
|
||||
end
|
||||
|
||||
|
|
@ -688,9 +693,7 @@ class Repository
|
|||
end
|
||||
|
||||
def local_branches
|
||||
@local_branches ||= rugged.branches.each(:local).map do |branch|
|
||||
Gitlab::Git::Branch.new(branch.name, branch.target)
|
||||
end
|
||||
@local_branches ||= raw_repository.local_branches
|
||||
end
|
||||
|
||||
alias_method :branches, :local_branches
|
||||
|
|
@ -831,7 +834,7 @@ class Repository
|
|||
end
|
||||
|
||||
def revert(user, commit, base_branch, revert_tree_id = nil)
|
||||
source_sha = find_branch(base_branch).target
|
||||
source_sha = find_branch(base_branch).target.sha
|
||||
revert_tree_id ||= check_revert_content(commit, base_branch)
|
||||
|
||||
return false unless revert_tree_id
|
||||
|
|
@ -848,7 +851,7 @@ class Repository
|
|||
end
|
||||
|
||||
def cherry_pick(user, commit, base_branch, cherry_pick_tree_id = nil)
|
||||
source_sha = find_branch(base_branch).target
|
||||
source_sha = find_branch(base_branch).target.sha
|
||||
cherry_pick_tree_id ||= check_cherry_pick_content(commit, base_branch)
|
||||
|
||||
return false unless cherry_pick_tree_id
|
||||
|
|
@ -869,7 +872,7 @@ class Repository
|
|||
end
|
||||
|
||||
def check_revert_content(commit, base_branch)
|
||||
source_sha = find_branch(base_branch).target
|
||||
source_sha = find_branch(base_branch).target.sha
|
||||
args = [commit.id, source_sha]
|
||||
args << { mainline: 1 } if commit.merge_commit?
|
||||
|
||||
|
|
@ -883,7 +886,7 @@ class Repository
|
|||
end
|
||||
|
||||
def check_cherry_pick_content(commit, base_branch)
|
||||
source_sha = find_branch(base_branch).target
|
||||
source_sha = find_branch(base_branch).target.sha
|
||||
args = [commit.id, source_sha]
|
||||
args << 1 if commit.merge_commit?
|
||||
|
||||
|
|
@ -974,7 +977,7 @@ class Repository
|
|||
was_empty = empty?
|
||||
|
||||
if !was_empty && target_branch
|
||||
oldrev = target_branch.target
|
||||
oldrev = target_branch.target.id
|
||||
end
|
||||
|
||||
# Make commit
|
||||
|
|
@ -994,7 +997,7 @@ class Repository
|
|||
after_create_branch
|
||||
else
|
||||
# Update head
|
||||
current_head = find_branch(branch).target
|
||||
current_head = find_branch(branch).target.id
|
||||
|
||||
# Make sure target branch was not changed during pre-receive hook
|
||||
if current_head == oldrev
|
||||
|
|
@ -1052,7 +1055,7 @@ class Repository
|
|||
end
|
||||
|
||||
def tags_sorted_by_committed_date
|
||||
tags.sort_by { |tag| commit(tag.target).committed_date }
|
||||
tags.sort_by { |tag| tag.target.committed_date }
|
||||
end
|
||||
|
||||
def keep_around_ref_name(sha)
|
||||
|
|
|
|||
|
|
@ -24,10 +24,14 @@ module Auth
|
|||
token[:access] = names.map do |name|
|
||||
{ type: 'repository', name: name, actions: %w(*) }
|
||||
end
|
||||
|
||||
|
||||
token.encoded
|
||||
end
|
||||
|
||||
def self.token_expire_at
|
||||
Time.now + current_application_settings.container_registry_token_expire_delay.minutes
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
def authorized_token(*accesses)
|
||||
|
|
@ -35,7 +39,7 @@ module Auth
|
|||
token.issuer = registry.issuer
|
||||
token.audience = params[:service]
|
||||
token.subject = current_user.try(:username)
|
||||
token.expire_time = ContainerRegistryAuthenticationService.token_expire_at
|
||||
token.expire_time = self.class.token_expire_at
|
||||
token[:access] = accesses.compact
|
||||
token
|
||||
end
|
||||
|
|
@ -81,9 +85,5 @@ module Auth
|
|||
def registry
|
||||
Gitlab.config.registry
|
||||
end
|
||||
|
||||
def self.token_expire_at
|
||||
Time.now + current_application_settings.container_registry_token_expire_delay.minutes
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -20,10 +20,12 @@ class CompareService
|
|||
)
|
||||
end
|
||||
|
||||
Gitlab::Git::Compare.new(
|
||||
raw_compare = Gitlab::Git::Compare.new(
|
||||
target_project.repository.raw_repository,
|
||||
target_branch,
|
||||
source_sha,
|
||||
source_sha
|
||||
)
|
||||
|
||||
Compare.new(raw_compare, target_project)
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -40,6 +40,6 @@ class DeleteBranchService < BaseService
|
|||
|
||||
def build_push_data(branch)
|
||||
Gitlab::PushDataBuilder
|
||||
.build(project, current_user, branch.target, Gitlab::Git::BLANK_SHA, "#{Gitlab::Git::BRANCH_REF_PREFIX}#{branch.name}", [])
|
||||
.build(project, current_user, branch.target.sha, Gitlab::Git::BLANK_SHA, "#{Gitlab::Git::BRANCH_REF_PREFIX}#{branch.name}", [])
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -34,6 +34,6 @@ class DeleteTagService < BaseService
|
|||
|
||||
def build_push_data(tag)
|
||||
Gitlab::PushDataBuilder
|
||||
.build(project, current_user, tag.target, Gitlab::Git::BLANK_SHA, "#{Gitlab::Git::TAG_REF_PREFIX}#{tag.name}", [])
|
||||
.build(project, current_user, tag.target.sha, Gitlab::Git::BLANK_SHA, "#{Gitlab::Git::TAG_REF_PREFIX}#{tag.name}", [])
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -88,9 +88,18 @@ class GitPushService < BaseService
|
|||
|
||||
# Set protection on the default branch if configured
|
||||
if current_application_settings.default_branch_protection != PROTECTION_NONE
|
||||
developers_can_push = current_application_settings.default_branch_protection == PROTECTION_DEV_CAN_PUSH ? true : false
|
||||
developers_can_merge = current_application_settings.default_branch_protection == PROTECTION_DEV_CAN_MERGE ? true : false
|
||||
@project.protected_branches.create({ name: @project.default_branch, developers_can_push: developers_can_push, developers_can_merge: developers_can_merge })
|
||||
|
||||
params = {
|
||||
name: @project.default_branch,
|
||||
push_access_level_attributes: {
|
||||
access_level: current_application_settings.default_branch_protection == PROTECTION_DEV_CAN_PUSH ? Gitlab::Access::DEVELOPER : Gitlab::Access::MASTER
|
||||
},
|
||||
merge_access_level_attributes: {
|
||||
access_level: current_application_settings.default_branch_protection == PROTECTION_DEV_CAN_MERGE ? Gitlab::Access::DEVELOPER : Gitlab::Access::MASTER
|
||||
}
|
||||
}
|
||||
|
||||
ProtectedBranches::CreateService.new(@project, current_user, params).execute
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
|||
|
|
@ -26,8 +26,8 @@ class GitTagPushService < BaseService
|
|||
unless Gitlab::Git.blank_ref?(params[:newrev])
|
||||
tag_name = Gitlab::Git.ref_name(params[:ref])
|
||||
tag = project.repository.find_tag(tag_name)
|
||||
|
||||
if tag && tag.target == params[:newrev]
|
||||
|
||||
if tag && tag.object_sha == params[:newrev]
|
||||
commit = project.commit(tag.target)
|
||||
commits = [commit].compact
|
||||
message = tag.message
|
||||
|
|
|
|||
|
|
@ -17,16 +17,19 @@ module MergeRequests
|
|||
end
|
||||
end
|
||||
|
||||
def hook_data(merge_request, action)
|
||||
def hook_data(merge_request, action, oldrev = nil)
|
||||
hook_data = merge_request.to_hook_data(current_user)
|
||||
hook_data[:object_attributes][:url] = Gitlab::UrlBuilder.build(merge_request)
|
||||
hook_data[:object_attributes][:action] = action
|
||||
if oldrev && !Gitlab::Git.blank_ref?(oldrev)
|
||||
hook_data[:object_attributes][:oldrev] = oldrev
|
||||
end
|
||||
hook_data
|
||||
end
|
||||
|
||||
def execute_hooks(merge_request, action = 'open')
|
||||
def execute_hooks(merge_request, action = 'open', oldrev = nil)
|
||||
if merge_request.project
|
||||
merge_data = hook_data(merge_request, action)
|
||||
merge_data = hook_data(merge_request, action, oldrev)
|
||||
merge_request.project.execute_hooks(merge_data, :merge_request_hooks)
|
||||
merge_request.project.execute_services(merge_data, :merge_request_hooks)
|
||||
end
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ module MergeRequests
|
|||
# At this point we decide if merge request can be created
|
||||
# If we have at least one commit to merge -> creation allowed
|
||||
if commits.present?
|
||||
merge_request.compare_commits = Commit.decorate(commits, merge_request.source_project)
|
||||
merge_request.compare_commits = commits
|
||||
merge_request.can_be_created = true
|
||||
merge_request.compare = compare
|
||||
else
|
||||
|
|
|
|||
|
|
@ -0,0 +1,8 @@
|
|||
module MergeRequests
|
||||
class MergeRequestDiffCacheService
|
||||
def execute(merge_request)
|
||||
# Executing the iteration we cache all the highlighted diff information
|
||||
merge_request.diffs.diff_files.to_a
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
@ -35,7 +35,13 @@ module MergeRequests
|
|||
}
|
||||
|
||||
commit_id = repository.merge(current_user, merge_request, options)
|
||||
merge_request.update(merge_commit_sha: commit_id)
|
||||
|
||||
if commit_id
|
||||
merge_request.update(merge_commit_sha: commit_id)
|
||||
else
|
||||
merge_request.update(merge_error: 'Conflicts detected during merge')
|
||||
false
|
||||
end
|
||||
rescue GitHooksService::PreReceiveError => e
|
||||
merge_request.update(merge_error: e.message)
|
||||
false
|
||||
|
|
|
|||
|
|
@ -137,7 +137,7 @@ module MergeRequests
|
|||
# Call merge request webhook with update branches
|
||||
def execute_mr_web_hooks
|
||||
merge_requests_for_source_branch.each do |merge_request|
|
||||
execute_hooks(merge_request, 'update')
|
||||
execute_hooks(merge_request, 'update', @oldrev)
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,27 @@
|
|||
module ProtectedBranches
|
||||
class CreateService < BaseService
|
||||
attr_reader :protected_branch
|
||||
|
||||
def execute
|
||||
raise Gitlab::Access::AccessDeniedError unless can?(current_user, :admin_project, project)
|
||||
|
||||
protected_branch = project.protected_branches.new(params)
|
||||
|
||||
ProtectedBranch.transaction do
|
||||
protected_branch.save!
|
||||
|
||||
if protected_branch.push_access_level.blank?
|
||||
protected_branch.create_push_access_level!(access_level: Gitlab::Access::MASTER)
|
||||
end
|
||||
|
||||
if protected_branch.merge_access_level.blank?
|
||||
protected_branch.create_merge_access_level!(access_level: Gitlab::Access::MASTER)
|
||||
end
|
||||
end
|
||||
|
||||
protected_branch
|
||||
rescue ActiveRecord::RecordInvalid
|
||||
protected_branch
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
@ -0,0 +1,13 @@
|
|||
module ProtectedBranches
|
||||
class UpdateService < BaseService
|
||||
attr_reader :protected_branch
|
||||
|
||||
def execute(protected_branch)
|
||||
raise Gitlab::Access::AccessDeniedError unless can?(current_user, :admin_project, project)
|
||||
|
||||
@protected_branch = protected_branch
|
||||
@protected_branch.update(params)
|
||||
@protected_branch
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
@ -2,7 +2,9 @@
|
|||
#
|
||||
# Used for creating system notes (e.g., when a user references a merge request
|
||||
# from an issue, an issue's assignee changes, an issue is closed, etc.)
|
||||
class SystemNoteService
|
||||
module SystemNoteService
|
||||
extend self
|
||||
|
||||
# Called when commits are added to a Merge Request
|
||||
#
|
||||
# noteable - Noteable object
|
||||
|
|
@ -15,7 +17,7 @@ class SystemNoteService
|
|||
# See new_commit_summary and existing_commit_summary.
|
||||
#
|
||||
# Returns the created Note object
|
||||
def self.add_commits(noteable, project, author, new_commits, existing_commits = [], oldrev = nil)
|
||||
def add_commits(noteable, project, author, new_commits, existing_commits = [], oldrev = nil)
|
||||
total_count = new_commits.length + existing_commits.length
|
||||
commits_text = "#{total_count} commit".pluralize(total_count)
|
||||
|
||||
|
|
@ -40,7 +42,7 @@ class SystemNoteService
|
|||
# "Reassigned to @rspeicher"
|
||||
#
|
||||
# Returns the created Note object
|
||||
def self.change_assignee(noteable, project, author, assignee)
|
||||
def change_assignee(noteable, project, author, assignee)
|
||||
body = assignee.nil? ? 'Assignee removed' : "Reassigned to #{assignee.to_reference}"
|
||||
|
||||
create_note(noteable: noteable, project: project, author: author, note: body)
|
||||
|
|
@ -63,7 +65,7 @@ class SystemNoteService
|
|||
# "Removed ~5 label"
|
||||
#
|
||||
# Returns the created Note object
|
||||
def self.change_label(noteable, project, author, added_labels, removed_labels)
|
||||
def change_label(noteable, project, author, added_labels, removed_labels)
|
||||
labels_count = added_labels.count + removed_labels.count
|
||||
|
||||
references = ->(label) { label.to_reference(format: :id) }
|
||||
|
|
@ -101,7 +103,7 @@ class SystemNoteService
|
|||
# "Miletone changed to 7.11"
|
||||
#
|
||||
# Returns the created Note object
|
||||
def self.change_milestone(noteable, project, author, milestone)
|
||||
def change_milestone(noteable, project, author, milestone)
|
||||
body = 'Milestone '
|
||||
body += milestone.nil? ? 'removed' : "changed to #{milestone.to_reference(project)}"
|
||||
|
||||
|
|
@ -123,7 +125,7 @@ class SystemNoteService
|
|||
# "Status changed to closed by bc17db76"
|
||||
#
|
||||
# Returns the created Note object
|
||||
def self.change_status(noteable, project, author, status, source)
|
||||
def change_status(noteable, project, author, status, source)
|
||||
body = "Status changed to #{status}"
|
||||
body << " by #{source.gfm_reference(project)}" if source
|
||||
|
||||
|
|
@ -131,26 +133,26 @@ class SystemNoteService
|
|||
end
|
||||
|
||||
# Called when 'merge when build succeeds' is executed
|
||||
def self.merge_when_build_succeeds(noteable, project, author, last_commit)
|
||||
def merge_when_build_succeeds(noteable, project, author, last_commit)
|
||||
body = "Enabled an automatic merge when the build for #{last_commit.to_reference(project)} succeeds"
|
||||
|
||||
create_note(noteable: noteable, project: project, author: author, note: body)
|
||||
end
|
||||
|
||||
# Called when 'merge when build succeeds' is canceled
|
||||
def self.cancel_merge_when_build_succeeds(noteable, project, author)
|
||||
def cancel_merge_when_build_succeeds(noteable, project, author)
|
||||
body = 'Canceled the automatic merge'
|
||||
|
||||
create_note(noteable: noteable, project: project, author: author, note: body)
|
||||
end
|
||||
|
||||
def self.remove_merge_request_wip(noteable, project, author)
|
||||
def remove_merge_request_wip(noteable, project, author)
|
||||
body = 'Unmarked this merge request as a Work In Progress'
|
||||
|
||||
create_note(noteable: noteable, project: project, author: author, note: body)
|
||||
end
|
||||
|
||||
def self.add_merge_request_wip(noteable, project, author)
|
||||
def add_merge_request_wip(noteable, project, author)
|
||||
body = 'Marked this merge request as a **Work In Progress**'
|
||||
|
||||
create_note(noteable: noteable, project: project, author: author, note: body)
|
||||
|
|
@ -174,7 +176,7 @@ class SystemNoteService
|
|||
# "Title changed from **Old** to **New**"
|
||||
#
|
||||
# Returns the created Note object
|
||||
def self.change_title(noteable, project, author, old_title)
|
||||
def change_title(noteable, project, author, old_title)
|
||||
new_title = noteable.title.dup
|
||||
|
||||
old_diffs, new_diffs = Gitlab::Diff::InlineDiff.new(old_title, new_title).inline_diffs
|
||||
|
|
@ -197,7 +199,7 @@ class SystemNoteService
|
|||
# "Made the issue confidential"
|
||||
#
|
||||
# Returns the created Note object
|
||||
def self.change_issue_confidentiality(issue, project, author)
|
||||
def change_issue_confidentiality(issue, project, author)
|
||||
body = issue.confidential ? 'Made the issue confidential' : 'Made the issue visible'
|
||||
create_note(noteable: issue, project: project, author: author, note: body)
|
||||
end
|
||||
|
|
@ -216,7 +218,7 @@ class SystemNoteService
|
|||
# "Target branch changed from `Old` to `New`"
|
||||
#
|
||||
# Returns the created Note object
|
||||
def self.change_branch(noteable, project, author, branch_type, old_branch, new_branch)
|
||||
def change_branch(noteable, project, author, branch_type, old_branch, new_branch)
|
||||
body = "#{branch_type} branch changed from `#{old_branch}` to `#{new_branch}`".capitalize
|
||||
create_note(noteable: noteable, project: project, author: author, note: body)
|
||||
end
|
||||
|
|
@ -235,7 +237,7 @@ class SystemNoteService
|
|||
# "Restored target branch `feature`"
|
||||
#
|
||||
# Returns the created Note object
|
||||
def self.change_branch_presence(noteable, project, author, branch_type, branch, presence)
|
||||
def change_branch_presence(noteable, project, author, branch_type, branch, presence)
|
||||
verb =
|
||||
if presence == :add
|
||||
'restored'
|
||||
|
|
@ -251,7 +253,7 @@ class SystemNoteService
|
|||
# Example note text:
|
||||
#
|
||||
# "Started branch `201-issue-branch-button`"
|
||||
def self.new_issue_branch(issue, project, author, branch)
|
||||
def new_issue_branch(issue, project, author, branch)
|
||||
h = Gitlab::Routing.url_helpers
|
||||
link = h.namespace_project_compare_url(project.namespace, project, from: project.default_branch, to: branch)
|
||||
|
||||
|
|
@ -276,7 +278,7 @@ class SystemNoteService
|
|||
# See cross_reference_note_content.
|
||||
#
|
||||
# Returns the created Note object
|
||||
def self.cross_reference(noteable, mentioner, author)
|
||||
def cross_reference(noteable, mentioner, author)
|
||||
return if cross_reference_disallowed?(noteable, mentioner)
|
||||
|
||||
gfm_reference = mentioner.gfm_reference(noteable.project)
|
||||
|
|
@ -300,7 +302,7 @@ class SystemNoteService
|
|||
end
|
||||
end
|
||||
|
||||
def self.cross_reference?(note_text)
|
||||
def cross_reference?(note_text)
|
||||
note_text.start_with?(cross_reference_note_prefix)
|
||||
end
|
||||
|
||||
|
|
@ -314,7 +316,7 @@ class SystemNoteService
|
|||
# mentioner - Mentionable object
|
||||
#
|
||||
# Returns Boolean
|
||||
def self.cross_reference_disallowed?(noteable, mentioner)
|
||||
def cross_reference_disallowed?(noteable, mentioner)
|
||||
return true if noteable.is_a?(ExternalIssue) && !noteable.project.jira_tracker_active?
|
||||
return false unless mentioner.is_a?(MergeRequest)
|
||||
return false unless noteable.is_a?(Commit)
|
||||
|
|
@ -334,7 +336,7 @@ class SystemNoteService
|
|||
#
|
||||
# Returns Boolean
|
||||
|
||||
def self.cross_reference_exists?(noteable, mentioner)
|
||||
def cross_reference_exists?(noteable, mentioner)
|
||||
# Initial scope should be system notes of this noteable type
|
||||
notes = Note.system.where(noteable_type: noteable.class)
|
||||
|
||||
|
|
@ -348,9 +350,60 @@ class SystemNoteService
|
|||
notes_for_mentioner(mentioner, noteable, notes).count > 0
|
||||
end
|
||||
|
||||
# Build an Array of lines detailing each commit added in a merge request
|
||||
#
|
||||
# new_commits - Array of new Commit objects
|
||||
#
|
||||
# Returns an Array of Strings
|
||||
def new_commit_summary(new_commits)
|
||||
new_commits.collect do |commit|
|
||||
"* #{commit.short_id} - #{escape_html(commit.title)}"
|
||||
end
|
||||
end
|
||||
|
||||
# Called when the status of a Task has changed
|
||||
#
|
||||
# noteable - Noteable object.
|
||||
# project - Project owning noteable
|
||||
# author - User performing the change
|
||||
# new_task - TaskList::Item object.
|
||||
#
|
||||
# Example Note text:
|
||||
#
|
||||
# "Soandso marked the task Whatever as completed."
|
||||
#
|
||||
# Returns the created Note object
|
||||
def change_task_status(noteable, project, author, new_task)
|
||||
status_label = new_task.complete? ? Taskable::COMPLETED : Taskable::INCOMPLETE
|
||||
body = "Marked the task **#{new_task.source}** as #{status_label}"
|
||||
create_note(noteable: noteable, project: project, author: author, note: body)
|
||||
end
|
||||
|
||||
# Called when noteable has been moved to another project
|
||||
#
|
||||
# direction - symbol, :to or :from
|
||||
# noteable - Noteable object
|
||||
# noteable_ref - Referenced noteable
|
||||
# author - User performing the move
|
||||
#
|
||||
# Example Note text:
|
||||
#
|
||||
# "Moved to some_namespace/project_new#11"
|
||||
#
|
||||
# Returns the created Note object
|
||||
def noteable_moved(noteable, project, noteable_ref, author, direction:)
|
||||
unless [:to, :from].include?(direction)
|
||||
raise ArgumentError, "Invalid direction `#{direction}`"
|
||||
end
|
||||
|
||||
cross_reference = noteable_ref.to_reference(project)
|
||||
body = "Moved #{direction} #{cross_reference}"
|
||||
create_note(noteable: noteable, project: project, author: author, note: body)
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
def self.notes_for_mentioner(mentioner, noteable, notes)
|
||||
def notes_for_mentioner(mentioner, noteable, notes)
|
||||
if mentioner.is_a?(Commit)
|
||||
notes.where('note LIKE ?', "#{cross_reference_note_prefix}%#{mentioner.to_reference(nil)}")
|
||||
else
|
||||
|
|
@ -359,29 +412,18 @@ class SystemNoteService
|
|||
end
|
||||
end
|
||||
|
||||
def self.create_note(args = {})
|
||||
def create_note(args = {})
|
||||
Note.create(args.merge(system: true))
|
||||
end
|
||||
|
||||
def self.cross_reference_note_prefix
|
||||
def cross_reference_note_prefix
|
||||
'mentioned in '
|
||||
end
|
||||
|
||||
def self.cross_reference_note_content(gfm_reference)
|
||||
def cross_reference_note_content(gfm_reference)
|
||||
"#{cross_reference_note_prefix}#{gfm_reference}"
|
||||
end
|
||||
|
||||
# Build an Array of lines detailing each commit added in a merge request
|
||||
#
|
||||
# new_commits - Array of new Commit objects
|
||||
#
|
||||
# Returns an Array of Strings
|
||||
def self.new_commit_summary(new_commits)
|
||||
new_commits.collect do |commit|
|
||||
"* #{commit.short_id} - #{escape_html(commit.title)}"
|
||||
end
|
||||
end
|
||||
|
||||
# Build a single line summarizing existing commits being added in a merge
|
||||
# request
|
||||
#
|
||||
|
|
@ -398,7 +440,7 @@ class SystemNoteService
|
|||
# "* ea0f8418 - 1 commit from branch `feature`"
|
||||
#
|
||||
# Returns a newline-terminated String
|
||||
def self.existing_commit_summary(noteable, existing_commits, oldrev = nil)
|
||||
def existing_commit_summary(noteable, existing_commits, oldrev = nil)
|
||||
return '' if existing_commits.empty?
|
||||
|
||||
count = existing_commits.size
|
||||
|
|
@ -421,47 +463,7 @@ class SystemNoteService
|
|||
"* #{commit_ids} - #{commits_text} from branch `#{branch}`\n"
|
||||
end
|
||||
|
||||
# Called when the status of a Task has changed
|
||||
#
|
||||
# noteable - Noteable object.
|
||||
# project - Project owning noteable
|
||||
# author - User performing the change
|
||||
# new_task - TaskList::Item object.
|
||||
#
|
||||
# Example Note text:
|
||||
#
|
||||
# "Soandso marked the task Whatever as completed."
|
||||
#
|
||||
# Returns the created Note object
|
||||
def self.change_task_status(noteable, project, author, new_task)
|
||||
status_label = new_task.complete? ? Taskable::COMPLETED : Taskable::INCOMPLETE
|
||||
body = "Marked the task **#{new_task.source}** as #{status_label}"
|
||||
create_note(noteable: noteable, project: project, author: author, note: body)
|
||||
end
|
||||
|
||||
# Called when noteable has been moved to another project
|
||||
#
|
||||
# direction - symbol, :to or :from
|
||||
# noteable - Noteable object
|
||||
# noteable_ref - Referenced noteable
|
||||
# author - User performing the move
|
||||
#
|
||||
# Example Note text:
|
||||
#
|
||||
# "Moved to some_namespace/project_new#11"
|
||||
#
|
||||
# Returns the created Note object
|
||||
def self.noteable_moved(noteable, project, noteable_ref, author, direction:)
|
||||
unless [:to, :from].include?(direction)
|
||||
raise ArgumentError, "Invalid direction `#{direction}`"
|
||||
end
|
||||
|
||||
cross_reference = noteable_ref.to_reference(project)
|
||||
body = "Moved #{direction} #{cross_reference}"
|
||||
create_note(noteable: noteable, project: project, author: author, note: body)
|
||||
end
|
||||
|
||||
def self.escape_html(text)
|
||||
def escape_html(text)
|
||||
Rack::Utils.escape_html(text)
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -11,16 +11,18 @@
|
|||
- else
|
||||
%span.build-link ##{build.id}
|
||||
|
||||
- if build.stuck?
|
||||
%i.fa.fa-warning.text-warning
|
||||
|
||||
- if build.ref
|
||||
.icon-container
|
||||
= build.tag? ? icon('tag') : icon('code-fork')
|
||||
= link_to build.ref, namespace_project_commits_path(build.project.namespace, build.project, build.ref), class: "monospace branch-name"
|
||||
- else
|
||||
.light none
|
||||
= custom_icon("icon_commit")
|
||||
.icon-container
|
||||
= custom_icon("icon_commit")
|
||||
|
||||
= link_to build.short_sha, namespace_project_commit_path(build.project.namespace, build.project, build.sha), class: "monospace commit-id"
|
||||
- if build.stuck?
|
||||
%i.fa.fa-warning.text-warning
|
||||
|
||||
.label-container
|
||||
- if build.tags.any?
|
||||
|
|
|
|||
|
|
@ -189,7 +189,7 @@
|
|||
%li
|
||||
%a Sort by date
|
||||
|
||||
= link_to 'New issue', '#', class: 'btn btn-new'
|
||||
= link_to 'New issue', '#', class: 'btn btn-new btn-inverted'
|
||||
|
||||
.lead
|
||||
Only nav links without button and search
|
||||
|
|
|
|||
|
|
@ -66,7 +66,7 @@
|
|||
|
||||
- if project_nav_tab? :issues
|
||||
= nav_link(controller: [:issues, :labels, :milestones]) do
|
||||
= link_to url_for_project_issues(@project, only_path: true), title: 'Issues', class: 'shortcuts-issues' do
|
||||
= link_to namespace_project_issues_path(@project.namespace, @project), title: 'Issues', class: 'shortcuts-issues' do
|
||||
%span
|
||||
Issues
|
||||
- if @project.default_issues_tracker?
|
||||
|
|
|
|||
|
|
@ -16,6 +16,7 @@
|
|||
|
||||
- if current_user
|
||||
.btn-group{ role: "group" }
|
||||
= edit_blob_link
|
||||
- if blob_text_viewable?(@blob)
|
||||
= edit_blob_link
|
||||
= replace_blob_link
|
||||
= delete_blob_link
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
.branch-commit
|
||||
= link_to commit.short_id, namespace_project_commit_path(project.namespace, project, commit), class: "commit-id monospace"
|
||||
= link_to commit.short_id, namespace_project_commit_path(project.namespace, project, commit.id), class: "commit-id monospace"
|
||||
·
|
||||
%span.str-truncated
|
||||
= link_to_gfm commit.title, namespace_project_commit_path(project.namespace, project, commit.id), class: "commit-row-message"
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
- if can_create_issue
|
||||
%li
|
||||
= link_to url_for_new_issue(@project, only_path: true) do
|
||||
= link_to new_namespace_project_issue_path(@project.namespace, @project) do
|
||||
= icon('exclamation-circle fw')
|
||||
New issue
|
||||
|
||||
|
|
|
|||
|
|
@ -13,13 +13,6 @@
|
|||
- else
|
||||
%span ##{build.id}
|
||||
|
||||
- if build.stuck?
|
||||
.icon-container
|
||||
= icon('warning', class: 'text-warning has-tooltip', title: 'Build is stuck. Check runners.')
|
||||
- if defined?(retried) && retried
|
||||
.icon-container
|
||||
= icon('warning', class: 'text-warning has-tooltip', title: 'Build was retried.')
|
||||
|
||||
- if defined?(ref) && ref
|
||||
- if build.ref
|
||||
.icon-container
|
||||
|
|
@ -33,6 +26,11 @@
|
|||
- if defined?(commit_sha) && commit_sha
|
||||
= link_to build.short_sha, namespace_project_commit_path(build.project.namespace, build.project, build.sha), class: "commit-id monospace"
|
||||
|
||||
- if build.stuck?
|
||||
= icon('warning', class: 'text-warning has-tooltip', title: 'Build is stuck. Check runners.')
|
||||
- if defined?(retried) && retried
|
||||
= icon('warning', class: 'text-warning has-tooltip', title: 'Build was retried.')
|
||||
|
||||
.label-container
|
||||
- if build.tags.any?
|
||||
- build.tags.each do |tag|
|
||||
|
|
@ -47,7 +45,6 @@
|
|||
- if build.manual?
|
||||
%span.label.label-info manual
|
||||
|
||||
|
||||
- if defined?(runner) && runner
|
||||
%td
|
||||
- if build.try(:runner)
|
||||
|
|
|
|||
|
|
@ -57,7 +57,7 @@
|
|||
|
||||
%td.pipeline-actions
|
||||
.controls.hidden-xs.pull-right
|
||||
- artifacts = pipeline.builds.latest.select { |b| b.artifacts? }
|
||||
- artifacts = pipeline.builds.latest.with_artifacts_not_expired
|
||||
- actions = pipeline.manual_actions
|
||||
- if artifacts.present? || actions.any?
|
||||
.btn-group.inline
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
= nav_link(path: 'commit#show') do
|
||||
= link_to namespace_project_commit_path(@project.namespace, @project, @commit.id) do
|
||||
Changes
|
||||
%span.badge= @diffs.count
|
||||
%span.badge= @diffs.size
|
||||
= nav_link(path: 'commit#builds') do
|
||||
= link_to builds_namespace_project_commit_path(@project.namespace, @project, @commit.id) do
|
||||
Builds
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
= render "ci_menu"
|
||||
- else
|
||||
%div.block-connector
|
||||
= render "projects/diffs/diffs", diffs: @diffs, project: @project, diff_refs: @commit.diff_refs
|
||||
= render "projects/diffs/diffs", diffs: @diffs
|
||||
= render "projects/notes/notes_with_form"
|
||||
- if can_collaborate_with_project?
|
||||
- %w(revert cherry-pick).each do |type|
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
= form_tag namespace_project_compare_index_path(@project.namespace, @project), method: :post, class: 'form-inline js-requires-input' do
|
||||
.clearfix
|
||||
- if params[:to] && params[:from]
|
||||
= link_to 'switch', {from: params[:to], to: params[:from]}, {class: 'commits-compare-switch has-tooltip', title: 'Switch base of comparison'}
|
||||
= link_to icon('exchange'), {from: params[:to], to: params[:from]}, {class: 'commits-compare-switch has-tooltip', title: 'Switch base of comparison'}
|
||||
.form-group.dropdown.compare-form-group.js-compare-from-dropdown
|
||||
.input-group.inline-input-group
|
||||
%span.input-group-addon from
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
- if @commits.present?
|
||||
= render "projects/commits/commit_list"
|
||||
= render "projects/diffs/diffs", diffs: @diffs, project: @project, diff_refs: @diff_refs
|
||||
= render "projects/diffs/diffs", diffs: @diffs
|
||||
- else
|
||||
.light-well
|
||||
.center
|
||||
|
|
|
|||
|
|
@ -1,20 +1,19 @@
|
|||
- show_whitespace_toggle = local_assigns.fetch(:show_whitespace_toggle, true)
|
||||
- diff_files = diffs.diff_files
|
||||
- if diff_view == 'parallel'
|
||||
- fluid_layout true
|
||||
|
||||
- diff_files = safe_diff_files(diffs, diff_refs: diff_refs, repository: project.repository)
|
||||
|
||||
.content-block.oneline-block.files-changed
|
||||
.inline-parallel-buttons
|
||||
- if !expand_all_diffs? && diff_files.any? { |diff_file| diff_file.collapsed? }
|
||||
= link_to 'Expand all', url_for(params.merge(expand_all_diffs: 1, format: nil)), class: 'btn btn-default'
|
||||
- if show_whitespace_toggle
|
||||
- if current_controller?(:commit)
|
||||
= commit_diff_whitespace_link(@project, @commit, class: 'hidden-xs')
|
||||
= commit_diff_whitespace_link(diffs.project, @commit, class: 'hidden-xs')
|
||||
- elsif current_controller?(:merge_requests)
|
||||
= diff_merge_request_whitespace_link(@project, @merge_request, class: 'hidden-xs')
|
||||
= diff_merge_request_whitespace_link(diffs.project, @merge_request, class: 'hidden-xs')
|
||||
- elsif current_controller?(:compare)
|
||||
= diff_compare_whitespace_link(@project, params[:from], params[:to], class: 'hidden-xs')
|
||||
= diff_compare_whitespace_link(diffs.project, params[:from], params[:to], class: 'hidden-xs')
|
||||
.btn-group
|
||||
= inline_diff_btn
|
||||
= parallel_diff_btn
|
||||
|
|
@ -23,12 +22,12 @@
|
|||
- if diff_files.overflow?
|
||||
= render 'projects/diffs/warning', diff_files: diff_files
|
||||
|
||||
.files{data: {can_create_note: (!@diff_notes_disabled && can?(current_user, :create_note, @project))}}
|
||||
.files{data: {can_create_note: (!@diff_notes_disabled && can?(current_user, :create_note, diffs.project))}}
|
||||
- diff_files.each_with_index do |diff_file, index|
|
||||
- diff_commit = commit_for_diff(diff_file)
|
||||
- blob = diff_file.blob(diff_commit)
|
||||
- next unless blob
|
||||
- blob.load_all_data!(project.repository) unless blob.only_display_raw?
|
||||
- blob.load_all_data!(diffs.project.repository) unless blob.only_display_raw?
|
||||
|
||||
= render 'projects/diffs/file', i: index, project: project,
|
||||
diff_file: diff_file, diff_commit: diff_commit, blob: blob, diff_refs: diff_refs
|
||||
= render 'projects/diffs/file', i: index, project: diffs.project,
|
||||
diff_file: diff_file, diff_commit: diff_commit, blob: blob
|
||||
|
|
|
|||
|
|
@ -9,11 +9,12 @@
|
|||
= icon('comment')
|
||||
\
|
||||
|
||||
- if editable_diff?(diff_file)
|
||||
= edit_blob_link(@merge_request.source_project,
|
||||
@merge_request.source_branch, diff_file.new_path,
|
||||
from_merge_request_id: @merge_request.id)
|
||||
- if editable_diff?(diff_file)
|
||||
= edit_blob_link(@merge_request.source_project,
|
||||
@merge_request.source_branch, diff_file.new_path,
|
||||
from_merge_request_id: @merge_request.id,
|
||||
skip_visible_check: true)
|
||||
|
||||
= view_file_btn(diff_commit.id, diff_file, project)
|
||||
= view_file_btn(diff_commit.id, diff_file.new_path, project)
|
||||
|
||||
= render 'projects/diffs/content', diff_file: diff_file, diff_commit: diff_commit, diff_refs: diff_refs, blob: blob, project: project
|
||||
= render 'projects/diffs/content', diff_file: diff_file, diff_commit: diff_commit, blob: blob, project: project
|
||||
|
|
|
|||
|
|
@ -1,8 +1,7 @@
|
|||
- plain = local_assigns.fetch(:plain, false)
|
||||
- line_code = diff_file.line_code(line)
|
||||
- position = diff_file.position(line)
|
||||
- type = line.type
|
||||
%tr.line_holder{ id: line_code, class: type }
|
||||
- line_code = diff_file.line_code(line) unless plain
|
||||
%tr.line_holder{ plain ? { class: type} : { class: type, id: line_code } }
|
||||
- case type
|
||||
- when 'match'
|
||||
= render "projects/diffs/match_line", { line: line.text,
|
||||
|
|
@ -24,4 +23,4 @@
|
|||
= link_text
|
||||
- else
|
||||
%a{href: "##{line_code}", data: { linenumber: link_text }}
|
||||
%td.line_content.noteable_line{ class: type, data: (diff_view_line_data(line_code, position, type) unless plain) }= diff_line_content(line.text, type)
|
||||
%td.line_content.noteable_line{ class: type, data: (diff_view_line_data(line_code, diff_file.position(line), type) unless plain) }= diff_line_content(line.text, type)
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
.commit-stat-summary
|
||||
Showing
|
||||
= link_to '#', class: 'js-toggle-button' do
|
||||
%strong #{pluralize(diff_files.count, "changed file")}
|
||||
%strong #{pluralize(diff_files.size, "changed file")}
|
||||
with
|
||||
%strong.cgreen #{diff_files.sum(&:added_lines)} additions
|
||||
and
|
||||
|
|
|
|||
|
|
@ -11,5 +11,5 @@
|
|||
= link_to "Email patch", merge_request_path(@merge_request, format: :patch), class: "btn btn-sm"
|
||||
%p
|
||||
To preserve performance only
|
||||
%strong #{diff_files.count} of #{diff_files.real_size}
|
||||
%strong #{diff_files.size} of #{diff_files.real_size}
|
||||
files are displayed.
|
||||
|
|
|
|||
|
|
@ -1,7 +1,22 @@
|
|||
= form_for @environment, url: namespace_project_environments_path(@project.namespace, @project), html: { class: 'col-lg-9' } do |f|
|
||||
= form_errors(@environment)
|
||||
.form-group
|
||||
= f.label :name, 'Name', class: 'label-light'
|
||||
= f.text_field :name, required: true, class: 'form-control'
|
||||
= f.submit 'Create environment', class: 'btn btn-create'
|
||||
= link_to 'Cancel', namespace_project_environments_path(@project.namespace, @project), class: 'btn btn-cancel'
|
||||
.row.prepend-top-default.append-bottom-default
|
||||
.col-lg-3
|
||||
%h4.prepend-top-0
|
||||
Environments
|
||||
%p
|
||||
Environments allow you to track deployments of your application
|
||||
= succeed "." do
|
||||
= link_to "Read more about environments", help_page_path("ci/environments")
|
||||
|
||||
= form_for [@project.namespace.becomes(Namespace), @project, @environment], html: { class: 'col-lg-9' } do |f|
|
||||
= form_errors(@environment)
|
||||
|
||||
.form-group
|
||||
= f.label :name, 'Name', class: 'label-light'
|
||||
= f.text_field :name, required: true, class: 'form-control'
|
||||
.form-group
|
||||
= f.label :external_url, 'External URL', class: 'label-light'
|
||||
= f.url_field :external_url, class: 'form-control'
|
||||
|
||||
.form-actions
|
||||
= f.submit 'Save', class: 'btn btn-save'
|
||||
= link_to 'Cancel', namespace_project_environments_path(@project.namespace, @project), class: 'btn btn-cancel'
|
||||
|
|
|
|||
|
|
@ -0,0 +1,6 @@
|
|||
- page_title "Edit", @environment.name, "Environments"
|
||||
|
||||
%h3.page-title
|
||||
Edit environment
|
||||
%hr
|
||||
= render 'form'
|
||||
|
|
@ -1,12 +1,6 @@
|
|||
- page_title 'New Environment'
|
||||
|
||||
.row.prepend-top-default.append-bottom-default
|
||||
.col-lg-3
|
||||
%h4.prepend-top-0
|
||||
New Environment
|
||||
%p
|
||||
Environments allow you to track deployments of your application
|
||||
= succeed "." do
|
||||
= link_to "Read more about environments", help_page_path("ci/environments")
|
||||
|
||||
= render 'form'
|
||||
%h3.page-title
|
||||
New environment
|
||||
%hr
|
||||
= render 'form'
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue