Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch ↵ | Kamil Trzciński | 2017-09-06 | 1 | -0/+11 |
|\ | | | | | | | | | | | | | | | | | 'fix/sm/33281-activerecord-recordinvalid-when-build-has-nil-protected' into 'master' Fix 422 error when retry job Closes #33281 See merge request !14082 | ||||
| * | Fix spec | Shinya Maeda | 2017-09-07 | 1 | -1/+1 |
| | | |||||
| * | Use before_save :set_protected | Shinya Maeda | 2017-09-06 | 1 | -0/+11 |
| | | |||||
* | | Merge branch 'anakashima/gitlab-ce-fix_wiki_toc_indent' into 'master' | Sean McGivern | 2017-09-06 | 1 | -0/+36 |
|\ \ | | | | | | | | | | | | | Wiki table of contents are now properly nested to reflect header level See merge request !13909 | ||||
| * | | Space before closing brace | Robert Speicher | 2017-09-06 | 1 | -2/+2 |
| | | | |||||
| * | | Refactor TableOfContentsFilter's nested table of contents | Robert Speicher | 2017-09-06 | 1 | -30/+34 |
| | | | | | | | | | | | | Most of the logic is now self-contained within the `HeaderNode` class. | ||||
| * | | Fix indentation level in Wiki's TOC items to regard header level | Akihiro Nakashima | 2017-09-06 | 1 | -6/+38 |
| | | | |||||
* | | | Merge branch 'feature/migrate-branch-operations-to-gitaly' into 'master'37407-error-500-when-creating-a-project-createservice-returns-a-nil-object | Robert Speicher | 2017-09-06 | 2 | -30/+57 |
|\ \ \ | | | | | | | | | | | | | | | | | Migrate creating/deleting a branch to Gitaly See merge request !13864 | ||||
| * | | | Migrate creating/deleting a branch to Gitalyfeature/migrate-branch-operations-to-gitaly | Ahmad Sherif | 2017-09-06 | 2 | -30/+57 |
| | | | | |||||
* | | | | Merge branch ↵ | Douwe Maan | 2017-09-06 | 4 | -50/+186 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '34509-improves-markdown-rendering-performance-for-commits-list' into 'master' Resolve "Projects::CommitsController#show is slow partially due to SQL queries" Closes #34509 See merge request !13762 | ||||
| * | | | | Adds cacheless render to Banzai object render34509-improves-markdown-rendering-performance-for-commits-list | Tiago Botelho | 2017-09-06 | 4 | -50/+186 |
| | | | | | |||||
* | | | | | Merge branch '35161_first_time_contributor_badge' into 'master' | Sean McGivern | 2017-09-06 | 4 | -8/+97 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | First time contributor badge Closes #35161 See merge request !13902 | ||||
| * | | | | fix the failing spec35161_first_time_contributor_badge | micael.bergeron | 2017-09-06 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | add controller spec | micael.bergeron | 2017-09-06 | 3 | -24/+25 |
| | | | | | | | | | | | | | | | | | | | | also fix some code styling issues | ||||
| * | | | | remove lint | micael.bergeron | 2017-09-06 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | rework the contributor badge | micael.bergeron | 2017-09-06 | 1 | -10/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | - only show in merge-requests - show as a little glyph | ||||
| * | | | | round of fixes after code review | micael.bergeron | 2017-09-06 | 2 | -19/+42 |
| | | | | | |||||
| * | | | | WIP: refactor the first-contributor to Issuable | micael.bergeron | 2017-09-06 | 2 | -71/+79 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this will remove the need make N queries (per-note) at the cost of having to mark notes with an attribute this opens up the possibility for other special roles for notes | ||||
| * | | | | fix #35161, add a first-time contributor badge | micael.bergeron | 2017-09-06 | 1 | -0/+65 |
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a new badge will be added when an user that doesn't yet have any merged merge request is discussing on either issues or merge requests that he created. this is indented for people to use extra care when discussing with a new contributor. | ||||
* | | | | Merge branch '35441-fix-division-by-zero' into 'master' | Robert Speicher | 2017-09-06 | 1 | -10/+17 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix division by zero for blame age map Closes #35441 See merge request !13803 | ||||
| * | | | | Refactor blame helper age class tests | Jeff Stubler | 2017-09-05 | 1 | -22/+15 |
| | | | | | |||||
| * | | | | Fix division by zero for blame age map | Jeff Stubler | 2017-08-24 | 1 | -1/+15 |
| | | | | | |||||
* | | | | | Merge branch 'url-sanitizer-fixes' into 'master' | Douwe Maan | 2017-09-06 | 1 | -50/+129 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix problems sanitizing URLs with empty passwords Closes gitlab-ee#3352 See merge request !14083 | ||||
| * | | | | | Remove blank passwords from sanitized URLs | Nick Thomas | 2017-09-06 | 1 | -51/+129 |
| | | | | | | |||||
| * | | | | | Backport EE fixes to Gitlab::UrlSanitizer to CE | Nick Thomas | 2017-09-06 | 1 | -0/+1 |
| | | | | | | |||||
* | | | | | | Merge branch 'feature/gb/download-single-job-artifact-using-api' into 'master' | Kamil Trzciński | 2017-09-06 | 3 | -15/+151 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add API endpoint for downloading a single job artifact Closes #37196 See merge request !14027 | ||||
| * \ \ \ \ \ | Merge commit 'd1b60cbc67dc14b21820ef3f823a8e1ea851697d' into ↵ | Grzegorz Bizon | 2017-09-06 | 90 | -2620/+9396 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/gb/download-single-job-artifact-using-api * commit 'd1b60cbc67dc14b21820ef3f823a8e1ea851697d': (210 commits) | ||||
| * | | | | | | | Fix artifacts controller specs | Grzegorz Bizon | 2017-09-06 | 1 | -8/+0 |
| | | | | | | | | |||||
| * | | | | | | | Extract job artifacts API code to a separate file | Grzegorz Bizon | 2017-09-06 | 1 | -2/+3 |
| | | | | | | | | |||||
| * | | | | | | | Do not require API authentication if artifacts are public | Grzegorz Bizon | 2017-09-05 | 1 | -7/+38 |
| | | | | | | | | |||||
| * | | | | | | | Do not use artifacts metadata to access single artifact | Grzegorz Bizon | 2017-09-05 | 1 | -8/+0 |
| | | | | | | | | |||||
| * | | | | | | | Extract a class that represents artifacts file path | Grzegorz Bizon | 2017-09-05 | 1 | -0/+64 |
| | | | | | | | | |||||
| * | | | | | | | Use API helper to send artifact file through Workhorse | Grzegorz Bizon | 2017-09-05 | 1 | -3/+2 |
| | | | | | | | | |||||
| * | | | | | | | Set project / pipeline before context in job API specs | Grzegorz Bizon | 2017-09-04 | 1 | -2/+2 |
| | | | | | | | | |||||
| * | | | | | | | Add API endpoint for downloading single job artifact | Grzegorz Bizon | 2017-09-04 | 1 | -0/+57 |
| | | | | | | | | |||||
* | | | | | | | | Merge branch 'tc-test-admin-log-links' into 'master' | Dmitriy Zaporozhets | 2017-09-06 | 1 | -3/+5 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Put Admin loggers in before_action for easier overriding in EE See merge request !14081 | ||||
| * | | | | | | | | Put loggers in before_action for easier overriding in EEtc-test-admin-log-links | Toon Claes | 2017-09-06 | 1 | -3/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make it easier to override the set of loggers, by putting them in a separate method. Also modify spec so it tests for links, instead of checking for regular text. | ||||
* | | | | | | | | | Merge branch '35942_api_binary_encoding' into 'master' | Sean McGivern | 2017-09-06 | 2 | -0/+25 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | API fix for non UTF-8 data Closes #35942 See merge request !14038 | ||||
| * | | | | | | | | | [ci-skip] spec for an instance method35942_api_binary_encoding | micael.bergeron | 2017-09-06 | 1 | -1/+1 |
| | | | | | | | | | | |||||
| * | | | | | | | | | renames ambiguous methods and add spec | micael.bergeron | 2017-09-06 | 1 | -0/+6 |
| | | | | | | | | | | |||||
| * | | | | | | | | | add .json_safe_diff spec | micael.bergeron | 2017-09-06 | 1 | -0/+19 |
| | |_|_|_|_|/ / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'generalize-profile-updates' into 'master' | Douwe Maan | 2017-09-06 | 5 | -24/+307 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Profile updates from providers See merge request !12968 | ||||
| * | | | | | | | | | Profile updates from providers | Alexander Keramidas | 2017-09-06 | 5 | -24/+307 |
| | |_|_|_|/ / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'breadcrumbs-improvements' into 'master' | Filipa Lacerda | 2017-09-06 | 4 | -12/+7 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improvements to breadcrumbs Closes #35269 and #36460 See merge request !13582 | ||||
| * | | | | | | | | Merge branch 'master' into breadcrumbs-improvements | Phil Hughes | 2017-09-06 | 18 | -294/+813 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'master' into breadcrumbs-improvements | Phil Hughes | 2017-09-05 | 5 | -13/+152 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | fixed karma spec | Phil Hughes | 2017-09-05 | 1 | -1/+10 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Merge branch 'master' into breadcrumbs-improvements | Phil Hughes | 2017-09-05 | 25 | -209/+1497 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | removed comment from helper spec | Phil Hughes | 2017-09-05 | 1 | -1/+0 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Merge branch 'master' into breadcrumbs-improvements | Phil Hughes | 2017-09-05 | 27 | -1956/+6332 |
| |\ \ \ \ \ \ \ \ \ \ \ |