summaryrefslogtreecommitdiff
path: root/lib/gitlab
Commit message (Expand)AuthorAgeFilesLines
* Revert "Merge branch '18193-developers-can-merge' into 'master' "Robert Speicher2016-07-138-212/+135
* Merge branch 'better-parallel-diff' into 'master' Robert Speicher2016-07-131-74/+55
|\
| * Actually render old and new sections of parallel diff next to each otherbetter-parallel-diffDouwe Maan2016-07-131-74/+55
* | Keeps issue number when importing from Gitlab.comDouglas Barbosa Alexandre2016-07-131-0/+1
* | Implement last round of review comments from !4892.18193-developers-can-mergeTimothy Andrew2016-07-131-2/+4
* | Move all "checks" under `GitLab::Checks`.Timothy Andrew2016-07-134-21/+21
* | Appease rubocop.Timothy Andrew2016-07-131-1/+0
* | Refactor `Gitlab::GitAccess`Timothy Andrew2016-07-134-133/+172
* | Enforce "developers can merge" during `pre-receive`.Timothy Andrew2016-07-132-0/+25
* | Added "developers can merge" setting to protected branchesMathias Vestergaard2016-07-132-3/+15
* | Merge branch 'multi-line-inline-diff' into 'master' Douwe Maan2016-07-131-14/+38
|\ \
| * | Rename constant to be more descriptiveDouwe Maan2016-07-131-2/+2
| * | Extended regexes ignore whitespace, so use \smulti-line-inline-diffDouwe Maan2016-07-121-2/+2
| * | Render inline diffs for multiple changed lines following eachotherDouwe Maan2016-07-111-14/+38
| |/
* | Memoize response from `has_rate_limit?` to avoid extra API callfix-gh-rate-limitDouglas Barbosa Alexandre2016-07-121-1/+3
* | Checks if rate limit is enabled instead of stubbing responseDouglas Barbosa Alexandre2016-07-121-2/+6
* | Fix GItHub client requests when rate limit is disabledDouglas Barbosa Alexandre2016-07-121-0/+5
* | 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
View Lorry Controller Status