summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Implement fix for n+1 issue on `flatten_tree` helpergitaly-tree-entries-fixAlejandro Rodríguez2017-09-068-20/+38
|
* Merge branch '37532-fix-broken-link-on-kubernetes-monitoring-page-docs' into ↵Achilleas Pipinellis2017-09-061-1/+1
|\ | | | | | | | | | | | | | | | | 'master' Fix broken link on Kubernetes Monitoring page - docs Closes #37532 See merge request !14094
| * Fix broken link on Kubernetes Monitoring page - docsJoshua Lambert2017-09-061-1/+1
|/
* Merge branch 'jk-fix-migrate' into 'master'Robert Speicher2017-09-062-1/+1
|\ | | | | | | | | reset namespace columns in migration See merge request !14089
| * reset namespace columns in migrationjk-fix-migrateJarka Kadlecova2017-09-062-1/+1
| |
* | Merge branch 'patch-24' into 'master'Robert Speicher2017-09-061-1/+1
|\ \ | | | | | | | | | | | | Update GITALY_SERVER_VERSION to 0.38.0 See merge request !14087
| * | Update GITALY_SERVER_VERSION to 0.38.0Alejandro Rodríguez2017-09-061-1/+1
| | |
* | | Merge branch '35811-fix-copy-link-text-color' into 'master'Tim Zallmann2017-09-061-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` actionkushalpandya2017-09-061-1/+1
| | | |
* | | | Merge branch 'winh-dropdown-changelog-docs' into 'master'Annabel Dunstone Gray2017-09-061-0/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Add changelog entry for new dropdown styles See merge request !14092
| * | | | Add changelog entry for new dropdown stylesWinnie Hellmann2017-09-061-0/+5
| | | | |
* | | | | Merge branch ↵Kamil Trzciński2017-09-063-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 specShinya Maeda2017-09-071-1/+1
| | | | |
| * | | | Remove only validationfix/sm/33281-activerecord-recordinvalid-when-build-has-nil-protectedShinya Maeda2017-09-072-2/+0
| | | | |
| * | | | Revert set_protectedShinya Maeda2017-09-074-12/+12
| | | | |
| * | | | Fix /models/ci/pipeline.rbShinya Maeda2017-09-061-1/+1
| | | | |
| * | | | Use before_save :set_protectedShinya Maeda2017-09-065-12/+23
| | | | |
* | | | | Merge branch 'anakashima/gitlab-ce-fix_wiki_toc_indent' into 'master'Sean McGivern2017-09-063-18/+113
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | Wiki table of contents are now properly nested to reflect header level See merge request !13909
| * | | | Refactor table of contents buildingRobert Speicher2017-09-061-19/+11
| | | | |
| * | | | Space before closing braceRobert Speicher2017-09-061-2/+2
| | | | |
| * | | | Refactor `HeaderNode#find_parent`Robert Speicher2017-09-061-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 contentsRobert Speicher2017-09-062-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 levelAkihiro Nakashima2017-09-063-10/+86
| | |_|/ | |/| |
* | | | Merge branch 'feature/migrate-branch-operations-to-gitaly' into 'master'37407-error-500-when-creating-a-project-createservice-returns-a-nil-objectRobert Speicher2017-09-066-44/+124
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Migrate creating/deleting a branch to Gitaly See merge request !13864
| * | | | Migrate creating/deleting a branch to Gitalyfeature/migrate-branch-operations-to-gitalyAhmad Sherif2017-09-066-44/+124
| | | | |
* | | | | Merge branch 'ie-sidebar-icon-size' into 'master'Annabel Dunstone Gray2017-09-061-0/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed sidebar icon size in ie11 Closes #37512 See merge request !14080
| * | | | | Fixed sidebar icon size in ie11ie-sidebar-icon-sizePhil Hughes2017-09-061-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | Closes #37512
* | | | | | Merge branch ↵Douwe Maan2017-09-0625-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-listTiago Botelho2017-09-0627-94/+268
| | | | | | |
| * | | | | | Adds CommitDescriptionRendererTiago Botelho2017-09-062-0/+14
| | | | | | |
* | | | | | | Merge branch 'evn-clarify-times-in-pb' into 'master'Robert Speicher2017-09-061-8/+8
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clarify documentation about performance bar [ci skip] See merge request !14085
| * | | | | | | Clarify documentation about performance barernstvn2017-09-061-8/+8
| | | | | | | |
* | | | | | | | Merge branch '35161_first_time_contributor_badge' into 'master'Sean McGivern2017-09-0621-28/+199
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | First time contributor badge Closes #35161 See merge request !13902
| * | | | | | | fix the failing spec35161_first_time_contributor_badgemicael.bergeron2017-09-061-2/+2
| | | | | | | |
| * | | | | | | fixup whitespacemicael.bergeron2017-09-061-1/+1
| | | | | | | |
| * | | | | | | add controller specmicael.bergeron2017-09-067-34/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | also fix some code styling issues
| * | | | | | | remove lintmicael.bergeron2017-09-063-4/+4
| | | | | | | |
| * | | | | | | fix note-role alignmentmicael.bergeron2017-09-061-3/+2
| | | | | | | |
| * | | | | | | rework the contributor badgemicael.bergeron2017-09-068-30/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - only show in merge-requests - show as a little glyph
| * | | | | | | round of fixes after code reviewmicael.bergeron2017-09-066-26/+61
| | | | | | | |
| * | | | | | | WIP: refactor the first-contributor to Issuablemicael.bergeron2017-09-0616-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 entrymicael.bergeron2017-09-061-0/+4
| | | | | | | |
| * | | | | | | fix #35161, add a first-time contributor badgemicael.bergeron2017-09-063-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 Speicher2017-09-063-16/+32
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix division by zero for blame age map Closes #35441 See merge request !13803
| * | | | | | Refactor blame helper age class testsJeff Stubler2017-09-051-22/+15
| | | | | | |
| * | | | | | Fix division by zero for blame age mapJeff Stubler2017-08-243-7/+30
| | | | | | |
* | | | | | | Merge branch 'url-sanitizer-fixes' into 'master'Douwe Maan2017-09-063-56/+147
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix problems sanitizing URLs with empty passwords Closes gitlab-ee#3352 See merge request !14083
| * | | | | | | Remove blank passwords from sanitized URLsNick Thomas2017-09-063-54/+144
| | | | | | | |
| * | | | | | | Backport EE fixes to Gitlab::UrlSanitizer to CENick Thomas2017-09-062-6/+7
| | | | | | | |
* | | | | | | | Merge branch 'feature/gb/download-single-job-artifact-using-api' into 'master'Kamil Trzciński2017-09-0613-219/+478
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add API endpoint for downloading a single job artifact Closes #37196 See merge request !14027