summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dont-blow-up-when-email-has-no-references-header' into 'master' Douwe Maan2017-05-011-0/+2
|\
| * Don't blow up when email has no References headerdont-blow-up-when-email-has-no-references-headerSean McGivern2017-05-011-0/+2
| * Revert "Merge branch 'tc-no-todo-service-select' into 'master'"revert-c3c465acStan Hu2017-04-292-4/+4
| * Merge branch 'tc-no-todo-service-select' into 'master' Robert Speicher2017-04-282-4/+4
| |\
| | * Avoid plucking Todo ids and use sub-queries insteadtc-no-todo-service-selectToon Claes2017-04-272-4/+4
* | | Merge branch '28968-revert-allow-people-with-merge-access-to-create-branches'...Douwe Maan2017-05-011-3/+1
|\ \ \
| * | | Prevent people from creating branches if they don't have persmission to pushPawel Chojnacki2017-04-281-3/+1
* | | | Fix Gitaly::Commit#is_ancestor30586-fix-gitaly-is-ancestorKim "BKC" Carlbäcker2017-04-282-13/+22
| |/ / |/| |
* | | Merge branch 'grpc-fork-tests' into 'master' 24339-job-page-step-2Sean McGivern2017-04-281-1/+1
|\ \ \ | |/ / |/| |
| * | Add test that asserts unicorns terminateJacob Vosmaer2017-04-261-1/+1
* | | Merge branch 'dm-blob-viewers' into 'master' Tim Zallmann2017-04-281-4/+0
|\ \ \
| * | | Small code tweaksDouwe Maan2017-04-271-4/+0
* | | | Merge branch '31138-improve-test-settings-for-services-in-empty-projects' int...Douwe Maan2017-04-271-5/+4
|\ \ \ \ | |/ / / |/| | |
| * | | improves test settings for chat notification services for empty projects31138-improve-test-settings-for-services-in-empty-projectsTiago Botelho2017-04-271-5/+4
* | | | Merge branch '30973-fix-network-graph-ordering' into 'master' Douwe Maan2017-04-271-6/+17
|\ \ \ \
| * | | | Fix ordering of commits in the network graph.Timothy Andrew2017-04-271-6/+17
* | | | | Merge branch '26585-remove-readme-view-caching' into 'master' Douwe Maan2017-04-272-25/+5
|\ \ \ \ \
| * | | | | Remove unused optional parameter `asciidoc_opts`Toon Claes2017-04-271-8/+4
| * | | | | Refactor MarkupHelperDouwe Maan2017-04-272-14/+2
| * | | | | Cache the rendered README, but post-process on showToon Claes2017-04-272-4/+0
* | | | | | Merge branch '29505-allow-admins-sudo-to-blocked-users' into 'master' Rémy Coutable2017-04-271-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Allow admins to sudo to blocked users.29505-allow-admins-sudo-to-blocked-usersTimothy Andrew2017-04-261-1/+1
* | | | | | Merge branch 'blackst0ne/gitlab-ce-fix_emoji_parser'Sean McGivern2017-04-271-1/+4
|\ \ \ \ \ \
| * | | | | | Fix rendering emoji inside a stringblackst0ne2017-04-251-1/+4
* | | | | | | Merge branch 'lleoni-fix-notify-post-receive'Rémy Coutable2017-04-271-1/+1
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Wrong method call on notify_post_receive.Luigi Leoni2017-04-271-1/+1
* | | | | | | Merge branch '31458-fix-rubocop-failure' into 'master' Rémy Coutable2017-04-261-17/+21
|\ \ \ \ \ \ \
| * | | | | | | Fix a failing Rubocop rule on masterDouglas Barbosa Alexandre2017-04-261-17/+21
* | | | | | | | Merge branch 'gl-version-backup-file' into 'master' Rémy Coutable2017-04-261-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Expose GitLab version in backup fileAchilleas Pipinellis2017-04-251-1/+1
* | | | | | | | Submodule Dockerfile templatesZeger-Jan van de Weg2017-04-262-4/+8
* | | | | | | | Load a project's CI status in batch from redisBob Van Landuyt2017-04-261-9/+44
| |/ / / / / / |/| | | | | |
* | | | | | | Merge branch '26437-closed-by' into 'master' Rémy Coutable2017-04-261-0/+15
|\ \ \ \ \ \ \
| * | | | | | | Add issues/:iid/closed_by api endpointmhasbini2017-04-121-0/+15
* | | | | | | | Merge branch 'fix/github-importer' into 'master' Sean McGivern2017-04-2620-90/+916
|\ \ \ \ \ \ \ \
| * | | | | | | | Add basic progress output to GitHub importDouglas Barbosa Alexandre2017-04-252-3/+12
| * | | | | | | | Fix undefined attribute params from import taskDouglas Barbosa Alexandre2017-04-251-1/+0
| * | | | | | | | Fix Rubocop offensesDouglas Barbosa Alexandre2017-04-251-2/+6
| * | | | | | | | Fix import of notes on Pull Request diffDouglas Barbosa Alexandre2017-04-253-9/+12
| * | | | | | | | Create project repository only when it not existsDouglas Barbosa Alexandre2017-04-251-1/+1
| * | | | | | | | Fix small typo on GitHub::ImportDouglas Barbosa Alexandre2017-04-251-1/+1
| * | | | | | | | Remove the Github::Error base classDouglas Barbosa Alexandre2017-04-251-2/+1
| * | | | | | | | Add blank line before the raise method on Github::CollectionDouglas Barbosa Alexandre2017-04-251-0/+1
| * | | | | | | | Fix small typoDouglas Barbosa Alexandre2017-04-241-2/+2
| * | | | | | | | Use Class.new(SuperClass) to define an empty custom error classDouglas Barbosa Alexandre2017-04-241-4/+2
| * | | | | | | | Set timeout options to the Github::ClientDouglas Barbosa Alexandre2017-04-241-0/+2
| * | | | | | | | Use the base initiliazer for representationsDouglas Barbosa Alexandre2017-04-243-14/+11
| * | | | | | | | Cache labels at the same time we fetch them from the GH APIDouglas Barbosa Alexandre2017-04-241-8/+6
| * | | | | | | | Avoid unnecessary use of Arel to find users by external uidDouglas Barbosa Alexandre2017-04-241-3/+1
| * | | | | | | | Finish the import process if some error occurs when fetching the repoDouglas Barbosa Alexandre2017-04-242-3/+14