summaryrefslogtreecommitdiff
path: root/lib/gitlab
Commit message (Expand)AuthorAgeFilesLines
* Squashed - fix encoding issuefix/import-export-encodingJames Lopez2016-07-193-2/+11
* Merge branch 'cs-gemojione-3' into 'master' Robert Speicher2016-07-181-17/+7
|\
| * Upgrade Gemojione from 2.6.1 to 3.0.1.Connor Shea2016-07-181-17/+7
* | Merge branch '19820-safer-diffs' into 'master' Douwe Maan2016-07-181-5/+1
|\ \ | |/ |/|
| * Collapsed diffs lines/size don't accumulate to overflow diffs.19820-safer-diffsPaco Guzman2016-07-181-5/+1
* | Merge branch 'undo-revert-of-4892' into 'master' 19396-api-allow-admin-owner-to-set-timestamp-when-changing-issue-stateRémy Coutable2016-07-188-135/+212
|\ \
| * | Revert "Revert "Merge branch '18193-developers-can-merge' into 'master' ""Rémy Coutable2016-07-188-135/+212
* | | allow empty repos on import/exportJames Lopez2016-07-184-10/+5
|/ /
* | Merge branch 'fix-lfs-ci-fetch' into 'master' Rémy Coutable2016-07-183-3/+3
|\ \ | |/ |/|
| * Fix LFS specsfix-lfs-ci-fetchKamil Trzcinski2016-07-152-2/+2
| * Fix fetching LFS objects for private CI projectsKamil Trzcinski2016-07-151-1/+1
* | Merge branch 'feature.rouge-20' into 'master' Robert Speicher2016-07-151-25/+18
|\ \
| * | use the proper variable names o_Ohttp://jneen.net/2016-07-141-2/+2
| * | style: factor out `@lexer` into a methodhttp://jneen.net/2016-07-141-9/+13
| * | fix Gitlab::Highlight#initializer bugs from rebasehttp://jneen.net/2016-07-141-1/+2
| * | use the local lexer variable to respect plain: ...http://jneen.net/2016-07-141-1/+1
| * | inline #rouge_formatterhttp://jneen.net/2016-07-141-6/+2
| * | use the new token_lines interface to format lineshttp://jneen.net/2016-07-141-4/+1
| * | kill the :cssclass optionhttp://jneen.net/2016-07-141-1/+0
| * | kill the nowrap optionhttp://jneen.net/2016-07-141-11/+5
| * | the call site always specifies this optionhttp://jneen.net/2016-07-141-1/+0
| * | do this thing in a clearer wayhttp://jneen.net/2016-07-141-3/+6
* | | Merge branch 'fix/project-export-filename' into 'master' Douwe Maan2016-07-152-2/+10
|\ \ \
| * \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/project-exp...fix/project-export-filenameJames Lopez2016-07-153-26/+42
| |\ \ \
| * | | | add project name and namespace to filename on project exportJames Lopez2016-07-152-2/+10
| | |/ / | |/| |
* | | | Merge branch 'fix/ee-to-ce-import'Douwe Maan2016-07-151-2/+6
|\ \ \ \ | |_|/ / |/| | |
| * | | fix EE => CE project import, and updated JSON specJames Lopez2016-07-141-2/+6
| |/ /
* | | Merge branch 'disable-statement-timeout' into 'master' Robert Speicher2016-07-151-0/+10
|\ \ \
| * | | Disable statement timeout outside of transaction and during adding concurrent...Stan Hu2016-07-141-1/+3
| * | | Disable PostgreSQL statement timeout during migrationsStan Hu2016-07-141-0/+8
| |/ /
* | | fixed similar issue with gitlab.com importer because why not!James Lopez2016-07-141-25/+28
* | | fix updated_at not preserved after import - for GitLab projectsJames Lopez2016-07-141-1/+4
|/ /
* | 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
|\ \ \
View Lorry Controller Status