summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'single-file-diffs' into 'master' Douwe Maan2016-07-111-0/+4
|\
| * Merge branch 'master' into single-file-diffsSean McGivern2016-07-118-16/+131
| |\
| * | Collapse large diffs by defaultSean McGivern2016-07-081-0/+4
* | | Merge branch 'remove-duplicate-api-field' into 'master' Rémy Coutable2016-07-111-1/+0
|\ \ \
| * | | entities: remove :description from MergeRequestBen Boeckel2016-07-111-1/+0
| | |/ | |/|
* | | Merge branch 'send-entry-via-Gitlab-Workhorse-Send-Data' into 'master' Douwe Maan2016-07-111-0/+12
|\ \ \ | |/ / |/| |
| * | Use Gitlab-Workhorse-Send-Data to send entry:Lin Jen-Shin2016-07-051-0/+12
* | | Merge branch 'fix/remove-import-url-migration' into 'master' Rémy Coutable2016-07-111-0/+2
|\ \ \
| * | | spec and fix for sanitize methodJames Lopez2016-07-111-0/+2
| | |/ | |/|
* | | Merge branch 'blockquote-fence-filter' into 'master' Robert Speicher2016-07-102-1/+73
|\ \ \
| * | | Add more comments to regexDouwe Maan2016-07-101-11/+32
| * | | Add blockquote fence syntax to MarkdownDouwe Maan2016-07-092-1/+52
* | | | Re-use queries in reference parsersreuse-queries-in-reference-parsersYorick Peterse2016-07-082-4/+37
|/ / /
* | | Merge branch 'rubocop/enable-identical-conditional-branches-cop' into 'master' Robert Speicher2016-07-081-10/+6
|\ \ \
| * | | Enable Style/IdenticalConditionalBranches Rubocop copGrzegorz Bizon2016-07-081-10/+6
| |/ /
* | | Merge branch '1548-average-commits-per-day' into 'master' Rémy Coutable2016-07-081-1/+1
|\ \ \
| * | | Infinity Bug in Commit StatisticsJonas Weber2016-05-201-1/+1
* | | | Merge branch 'api-shared-projects' into 'master' Rémy Coutable2016-07-081-0/+12
|\ \ \ \ | |_|/ / |/| | |
| * | | API: Expose shared projects in a groupapi-shared-projectsRobert Schilling2016-07-081-0/+1
| * | | Expose shared groups for projectsapi-shared-groupsRobert Schilling2016-07-081-0/+11
* | | | Merge branch 'feature/option-set-new-users-external' into 'master' Rémy Coutable2016-07-081-0/+1
|\ \ \ \
| * | | | Added setting to set new users by default as externalDravere2016-07-071-0/+1
* | | | | Merge branch '18627-wildcard-branch-protection' into 'master' Douwe Maan2016-07-071-6/+3
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Improve the error message displayed when branch creation fails.Timothy Andrew2016-07-051-6/+3
* | | | | Merge branch 'new-diff-notes' into 'master' Douwe Maan2016-07-0715-83/+580
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Remove duplication, unused methods, and some other style thingsDouwe Maan2016-07-062-9/+9
| * | | | Add some more code comments.Douwe Maan2016-07-063-1/+16
| * | | | Add send_git_patch helperDouwe Maan2016-07-061-3/+3
| * | | | Display new diff notes and allow creation through the web interfaceDouwe Maan2016-07-061-3/+13
| * | | | Allow reply-by-email with diff notesDouwe Maan2016-07-061-9/+1
| * | | | Add Gitlab::Git::PositionTracerDouwe Maan2016-07-061-0/+168
| * | | | Add Gitlab::Diff::LineMapperDouwe Maan2016-07-061-0/+64
| * | | | Add Gitlab::Git::PositionDouwe Maan2016-07-062-0/+182
| * | | | Extract parts of LegacyDiffNote into DiffOnNote concern and move part of resp...Douwe Maan2016-07-065-26/+38
| * | | | Style diff and blob file headers the same wayDouwe Maan2016-07-061-10/+5
| * | | | Add DiffFile#blob and #old_blobDouwe Maan2016-07-061-5/+21
| * | | | Add Timeless helper module to prevent updated_at from being updatedDouwe Maan2016-07-061-0/+16
| * | | | Represent DiffRefs as proper class instead of tuple arrayDouwe Maan2016-07-065-22/+49
| * | | | Rename MergeRequest methods that return commits or shas to be more clear and ...Douwe Maan2016-07-062-4/+4
* | | | | Merge branch 'fix/import-export-log' into 'master' Rémy Coutable2016-07-072-2/+2
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | fix log statements in import/exportJames Lopez2016-07-072-2/+2
* | | | | Consider that a GH exists only if both `ref`, and `sha` existDouglas Barbosa Alexandre2016-07-061-4/+8
* | | | | Doesn't trigger Git hooks when cleaning up restored branches from GitHubDouglas Barbosa Alexandre2016-07-061-1/+3
* | | | | Merge branch 'gh-labels' into 'master' Robert Speicher2016-07-061-2/+6
|\ \ \ \ \
| * | | | | Use CGI.unescapeHTML rather than doing the gsub with a mapDouglas Barbosa Alexandre2016-07-051-1/+1
| * | | | | Move `unescape_html_entities` from LabelsHelper to Label modelDouglas Barbosa Alexandre2016-07-051-1/+1
| * | | | | Render references for labels that name contains ?, or &Douglas Barbosa Alexandre2016-07-051-2/+6
* | | | | | Merge branch 'fix/import-url-validator' into 'master' Robert Speicher2016-07-061-1/+9
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | few more changes from suggestionsJames Lopez2016-06-301-1/+0
| * | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/import-url-...James Lopez2016-06-3024-266/+358
| |\ \ \ \ \
View Lorry Controller Status