summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'grpc-fork-tests' into 'master' 24339-job-page-step-2Sean McGivern2017-04-281-1/+1
|\ | | | | | | | | Unicorn worker termination tests See merge request !10818
| * Add test that asserts unicorns terminateJacob Vosmaer2017-04-261-1/+1
| |
* | Merge branch 'dm-blob-viewers' into 'master' Tim Zallmann2017-04-281-4/+0
|\ \ | | | | | | | | | | | | | | | | | | Refactor rich blob viewers and add Code|Rendered switch Closes #24287 See merge request !10566
| * | Small code tweaksDouwe Maan2017-04-271-4/+0
| | |
* | | Merge branch '31138-improve-test-settings-for-services-in-empty-projects' ↵Douwe Maan2017-04-271-5/+4
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | into 'master' improves test settings for chat notification services for empty projects Closes #31138 See merge request !10886
| * | 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. Closes #30973 See merge request !10936
| * | | Fix ordering of commits in the network graph.Timothy Andrew2017-04-271-6/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - We upgraded `rugged` to 0.25.1.1 in !10286 for %9.1 - Prior to this upgrade, the default sort order for commits returned by `Gitlab::Git::Repository#find_commits` was `Rugged::SORT_DATE`, which the graph relied on. - While upgrading `rugged`, the MR also changed this default to `Rugged::SORT_NONE`, which broke commit ordering in the graph. - This commit adds an option to `Gitlab::Git::Repository#find_commits` to sort by date, and changes the graph builder `Network::Graph` so it explictly requests the `:date` sort order
* | | | Merge branch '26585-remove-readme-view-caching' into 'master' Douwe Maan2017-04-272-25/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove view fragment caching for project READMEs Closes #26585 and #29594 See merge request !8838
| * | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because the post-processing of the rendered README is dependent on the context (i.e. the current user), do the post-processing when the README is being displayed.
* | | | | 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 See merge request !10842
| * | | | Allow admins to sudo to blocked users.29505-allow-admins-sudo-to-blocked-usersTimothy Andrew2017-04-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Currently, (for example) admins can't delete snippets for blocked users, which is an unexpected limitation. - We modify `authenticate!` to conduct the `access_api` policy check against the `initial_current_user`, instead of the user being impersonated. - Update CHANGELOG for !10842
* | | | | 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
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | See pull request https://github.com/gitlabhq/gitlabhq/pull/10429
| * | | | | | 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 master Closes #31458 See merge request !10947
| * | | | | | | 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
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | Add GitLab version to backup file name See merge request !10901
| * | | | | | | Expose GitLab version in backup fileAchilleas Pipinellis2017-04-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of doing hacks like http://stackoverflow.com/a/26082612/974710
* | | | | | | | 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 endpoint Closes #26437 See merge request !10511
| * | | | | | | Add issues/:iid/closed_by api endpointmhasbini2017-04-121-0/+15
| | | | | | | |
* | | | | | | | Merge branch 'fix/github-importer' into 'master' Sean McGivern2017-04-2620-90/+916
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactoring rake task to import GitHub repositories See merge request !10695
| * | | | | | | | 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
| | | | | | | | |
| * | | | | | | | Use only one cache hash with with a hash initializer by defaultDouglas Barbosa Alexandre2017-04-241-11/+8
| | | | | | | | |
| * | | | | | | | Refactoring Github::RateLimitDouglas Barbosa Alexandre2017-04-242-27/+14
| | | | | | | | |
| * | | | | | | | Extract rate limit URL to a constantDouglas Barbosa Alexandre2017-04-241-5/+2
| | | | | | | | |
| * | | | | | | | Does not freeze integer valuesDouglas Barbosa Alexandre2017-04-241-2/+2
| | | | | | | | |
| * | | | | | | | Add Github::Representation::Base#idDouglas Barbosa Alexandre2017-04-243-7/+4
| | | | | | | | |
| * | | | | | | | Rename find_by_email/find_by_external_uid methodsDouglas Barbosa Alexandre2017-04-241-3/+3
| | | | | | | | |
| * | | | | | | | Refactor rake task to to import GitHub repositoresDouglas Barbosa Alexandre2017-04-243-92/+28
| | | | | | | | |
| * | | | | | | | Keep track of import errorsDouglas Barbosa Alexandre2017-04-241-0/+10
| | | | | | | | |