summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* reset namespace columns in migrationjk-fix-migrateJarka Kadlecova2017-09-062-1/+1
|
* 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
| * | | | | | Revert moving authorization hook in jobs APIfeature/gb/download-single-job-artifact-using-apiGrzegorz Bizon2017-09-061-2/+2
| | | | | | |
| * | | | | | Merge commit 'd1b60cbc67dc14b21820ef3f823a8e1ea851697d' into ↵Grzegorz Bizon2017-09-06317-3948/+13758
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/gb/download-single-job-artifact-using-api * commit 'd1b60cbc67dc14b21820ef3f823a8e1ea851697d': (210 commits)
| * | | | | | | Fix artifacts controller specsGrzegorz Bizon2017-09-061-8/+0
| | | | | | | |
| * | | | | | | Remove unneeded string interpolation from entry classGrzegorz Bizon2017-09-061-1/+1
| | | | | | | |
| * | | | | | | Add basic docs about new artifact access API endpointGrzegorz Bizon2017-09-061-2/+36
| | | | | | | |
| * | | | | | | Add changelog entry for new artifacts API endpointGrzegorz Bizon2017-09-061-0/+5
| | | | | | | |
| * | | | | | | Respond with a bad request if artifact path is invalidGrzegorz Bizon2017-09-062-2/+2
| | | | | | | |
| * | | | | | | Extract job artifacts API code to a separate fileGrzegorz Bizon2017-09-065-101/+102
| | | | | | | |
| * | | | | | | Do not require API authentication if artifacts are publicGrzegorz Bizon2017-09-052-43/+81
| | | | | | | |
| * | | | | | | Do not use artifacts metadata to access single artifactGrzegorz Bizon2017-09-053-16/+11
| | | | | | | |
| * | | | | | | Make it explicit that workhorse needs artifact pathGrzegorz Bizon2017-09-051-2/+2
| | | | | | | |
| * | | | | | | Extract a class that represents artifacts file pathGrzegorz Bizon2017-09-053-122/+237
| | | | | | | |
| * | | | | | | Use API helper to send artifact file through WorkhorseGrzegorz Bizon2017-09-053-4/+7
| | | | | | | |
| * | | | | | | Set project / pipeline before context in job API specsGrzegorz Bizon2017-09-041-2/+2
| | | | | | | |
| * | | | | | | Add API endpoint for downloading single job artifactGrzegorz Bizon2017-09-042-0/+76
| | | | | | | |
* | | | | | | | Merge branch 'tc-test-admin-log-links' into 'master'Dmitriy Zaporozhets2017-09-062-4/+13
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-linksToon Claes2017-09-062-4/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 McGivern2017-09-068-12/+66
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | API fix for non UTF-8 data Closes #35942 See merge request !14038
| * | | | | | | | | [ci-skip] spec for an instance method35942_api_binary_encodingmicael.bergeron2017-09-061-1/+1
| | | | | | | | | |
| * | | | | | | | | remove useless commentmicael.bergeron2017-09-061-2/+0
| | | | | | | | | |
| * | | | | | | | | added changelog entrymicael.bergeron2017-09-061-0/+3
| | | | | | | | | |
| * | | | | | | | | renames ambiguous methods and add specmicael.bergeron2017-09-064-7/+15
| | | | | | | | | |
View Lorry Controller Status