Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Implement fix for n+1 issue on `flatten_tree` helpergitaly-tree-entries-fix | Alejandro Rodríguez | 2017-09-06 | 8 | -20/+38 |
| | |||||
* | Merge branch '37532-fix-broken-link-on-kubernetes-monitoring-page-docs' into ↵ | Achilleas Pipinellis | 2017-09-06 | 1 | -1/+1 |
|\ | | | | | | | | | | | | | | | | | 'master' Fix broken link on Kubernetes Monitoring page - docs Closes #37532 See merge request !14094 | ||||
| * | Fix broken link on Kubernetes Monitoring page - docs | Joshua Lambert | 2017-09-06 | 1 | -1/+1 |
|/ | |||||
* | Merge branch 'jk-fix-migrate' into 'master' | Robert Speicher | 2017-09-06 | 2 | -1/+1 |
|\ | | | | | | | | | reset namespace columns in migration See merge request !14089 | ||||
| * | reset namespace columns in migrationjk-fix-migrate | Jarka Kadlecova | 2017-09-06 | 2 | -1/+1 |
| | | |||||
* | | Merge branch 'patch-24' into 'master' | Robert Speicher | 2017-09-06 | 1 | -1/+1 |
|\ \ | | | | | | | | | | | | | Update GITALY_SERVER_VERSION to 0.38.0 See merge request !14087 | ||||
| * | | Update GITALY_SERVER_VERSION to 0.38.0 | Alejandro Rodríguez | 2017-09-06 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch '35811-fix-copy-link-text-color' into 'master' | Tim Zallmann | 2017-09-06 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | | | | | | | | | Fix text color for `Copy link` action on Note more actions dropdown See merge request !14084 | ||||
| * | | | Prevent `btn-transparent` class from being added on `Copy link` action | kushalpandya | 2017-09-06 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge branch 'winh-dropdown-changelog-docs' into 'master' | Annabel Dunstone Gray | 2017-09-06 | 1 | -0/+5 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Add changelog entry for new dropdown styles See merge request !14092 | ||||
| * | | | | Add changelog entry for new dropdown styles | Winnie Hellmann | 2017-09-06 | 1 | -0/+5 |
| | | | | | |||||
* | | | | | Merge branch ↵ | Kamil Trzciński | 2017-09-06 | 3 | -2/+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 |
| | | | | | |||||
| * | | | | Remove only validationfix/sm/33281-activerecord-recordinvalid-when-build-has-nil-protected | Shinya Maeda | 2017-09-07 | 2 | -2/+0 |
| | | | | | |||||
| * | | | | Revert set_protected | Shinya Maeda | 2017-09-07 | 4 | -12/+12 |
| | | | | | |||||
| * | | | | Fix /models/ci/pipeline.rb | Shinya Maeda | 2017-09-06 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Use before_save :set_protected | Shinya Maeda | 2017-09-06 | 5 | -12/+23 |
| | | | | | |||||
* | | | | | Merge branch 'anakashima/gitlab-ce-fix_wiki_toc_indent' into 'master' | Sean McGivern | 2017-09-06 | 3 | -18/+113 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | Wiki table of contents are now properly nested to reflect header level See merge request !13909 | ||||
| * | | | | Refactor table of contents building | Robert Speicher | 2017-09-06 | 1 | -19/+11 |
| | | | | | |||||
| * | | | | Space before closing brace | Robert Speicher | 2017-09-06 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Refactor `HeaderNode#find_parent` | Robert Speicher | 2017-09-06 | 1 | -6/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Now the instance variable assignment is all contained within `#initialize`, and the `children.push` behavior is more explicit. | ||||
| * | | | | Refactor TableOfContentsFilter's nested table of contents | Robert Speicher | 2017-09-06 | 2 | -72/+98 |
| | | | | | | | | | | | | | | | | | | | | 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 | 3 | -10/+86 |
| | |_|/ | |/| | | |||||
* | | | | 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 | 6 | -44/+124 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | 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 | 6 | -44/+124 |
| | | | | | |||||
* | | | | | Merge branch 'ie-sidebar-icon-size' into 'master' | Annabel Dunstone Gray | 2017-09-06 | 1 | -0/+4 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed sidebar icon size in ie11 Closes #37512 See merge request !14080 | ||||
| * | | | | | Fixed sidebar icon size in ie11ie-sidebar-icon-size | Phil Hughes | 2017-09-06 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | Closes #37512 | ||||
* | | | | | | Merge branch ↵ | Douwe Maan | 2017-09-06 | 25 | -80/+268 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '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 | 27 | -94/+268 |
| | | | | | | | |||||
| * | | | | | | Adds CommitDescriptionRenderer | Tiago Botelho | 2017-09-06 | 2 | -0/+14 |
| | | | | | | | |||||
* | | | | | | | Merge branch 'evn-clarify-times-in-pb' into 'master' | Robert Speicher | 2017-09-06 | 1 | -8/+8 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clarify documentation about performance bar [ci skip] See merge request !14085 | ||||
| * | | | | | | | Clarify documentation about performance bar | ernstvn | 2017-09-06 | 1 | -8/+8 |
| | | | | | | | | |||||
* | | | | | | | | Merge branch '35161_first_time_contributor_badge' into 'master' | Sean McGivern | 2017-09-06 | 21 | -28/+199 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 |
| | | | | | | | | |||||
| * | | | | | | | fixup whitespace | micael.bergeron | 2017-09-06 | 1 | -1/+1 |
| | | | | | | | | |||||
| * | | | | | | | add controller spec | micael.bergeron | 2017-09-06 | 7 | -34/+33 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | also fix some code styling issues | ||||
| * | | | | | | | remove lint | micael.bergeron | 2017-09-06 | 3 | -4/+4 |
| | | | | | | | | |||||
| * | | | | | | | fix note-role alignment | micael.bergeron | 2017-09-06 | 1 | -3/+2 |
| | | | | | | | | |||||
| * | | | | | | | rework the contributor badge | micael.bergeron | 2017-09-06 | 8 | -30/+41 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - only show in merge-requests - show as a little glyph | ||||
| * | | | | | | | round of fixes after code review | micael.bergeron | 2017-09-06 | 6 | -26/+61 |
| | | | | | | | | |||||
| * | | | | | | | WIP: refactor the first-contributor to Issuable | micael.bergeron | 2017-09-06 | 16 | -93/+143 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | | | | | | | add changelog entry | micael.bergeron | 2017-09-06 | 1 | -0/+4 |
| | | | | | | | | |||||
| * | | | | | | | fix #35161, add a first-time contributor badge | micael.bergeron | 2017-09-06 | 3 | -0/+73 |
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 3 | -16/+32 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 3 | -7/+30 |
| | | | | | | | |||||
* | | | | | | | Merge branch 'url-sanitizer-fixes' into 'master' | Douwe Maan | 2017-09-06 | 3 | -56/+147 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 3 | -54/+144 |
| | | | | | | | | |||||
| * | | | | | | | Backport EE fixes to Gitlab::UrlSanitizer to CE | Nick Thomas | 2017-09-06 | 2 | -6/+7 |
| | | | | | | | | |||||
* | | | | | | | | Merge branch 'feature/gb/download-single-job-artifact-using-api' into 'master' | Kamil Trzciński | 2017-09-06 | 13 | -219/+478 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add API endpoint for downloading a single job artifact Closes #37196 See merge request !14027 |