summaryrefslogtreecommitdiff
path: root/lib/gitlab
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'fix/import-event-error' into 'master' Robert Speicher2016-07-111-0/+9
|\
| * Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/import-even...James Lopez2016-07-1166-198/+1034
| |\
| * | squashed - refactor to cope with sub sub N relations probably using the sub_r...James Lopez2016-07-111-0/+9
* | | Merge branch 'single-file-diffs' into 'master' Douwe Maan2016-07-111-0/+4
|\ \ \
| * \ \ Merge branch 'master' into single-file-diffsSean McGivern2016-07-112-1/+3
| |\ \ \ | | | |/ | | |/|
| * | | Collapse large diffs by defaultSean McGivern2016-07-081-0/+4
* | | | 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 '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 '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-0713-78/+575
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | 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-064-23/+35
| * | | | | 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-061-2/+2
* | | | | | 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 '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-3011-66/+115
| |\ \ \ \ \
| * | | | | | use class methodJames Lopez2016-06-301-7/+8
| * | | | | | few changes based on feedbackJames Lopez2016-06-301-1/+9
* | | | | | | Merge branch 'fix/project-export-error' into 'master' Rémy Coutable2016-07-063-3/+5
|\ \ \ \ \ \ \
| * | | | | | | fix typofix/project-export-errorJames Lopez2016-07-061-1/+1
| * | | | | | | even more debugJames Lopez2016-07-063-3/+5
* | | | | | | | Revert back to not defining a default Git access protocol.Patricio Cano2016-07-051-1/+1
* | | | | | | | Default Git access protocol to `web`Patricio Cano2016-07-052-5/+3
* | | | | | | | Rename `enabled_git_access_protocols` to singular.Patricio Cano2016-07-051-2/+2
* | | | | | | | Don't allow empty strings in the `protocol` check.Patricio Cano2016-07-051-1/+1
* | | | | | | | Correct access control flow for Git HTTP requests.Patricio Cano2016-07-051-4/+4
* | | | | | | | Clarify protocol access check, and make Git HTTP access call more specific.Patricio Cano2016-07-051-1/+1
* | | | | | | | Raise an error if no protocol is passed to the GitAccess check.Patricio Cano2016-07-052-2/+3
View Lorry Controller Status