summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '18193-developers-can-merge' into 'master' Rémy Coutable2016-07-139-136/+213
|\
| * 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-135-134/+173
| * 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
* | ObjectRenderer doesn't crash when no objects to cache with Rails.cache.read_m...Paco Guzman2016-07-131-4/+10
|/
* 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
* | Merge branch 'jacobvosmaer-gitlab/gitlab-ce-strict-host-headers'Douwe Maan2016-07-122-2/+12
|\ \
| * | Defend against 'Host' header injectionJacob Vosmaer2016-07-122-2/+12
* | | Merge branch 'fix-gh-rate-limit' into 'master' Douwe Maan2016-07-121-1/+12
|\ \ \
| * | | 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
| |/ /
* | | Object renderer read_multi rendered entries from Cacheread-multi-rendered-objectsPaco Guzman2016-07-123-11/+72
|/ /
* | Merge branch 'remove-branch-api' into 'master' Rémy Coutable2016-07-121-0/+2
|\ \
| * | api: expose {should,force}_remove_source_branchBen Boeckel2016-07-111-0/+2
* | | Optimize system note visibility checking by hiding notes thatStan Hu2016-07-112-18/+29
* | | 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-1196-319/+1321
| |\ \ \ | | |/ /
| * | | 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-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
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
View Lorry Controller Status