summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'fix/remove-legacy-ci-static-model' into 'master' Robert Speicher2016-08-081-49/+0
|\
| * Remove legacy Ci::StaticModel we do not use anymorefix/remove-legacy-ci-static-modelGrzegorz Bizon2016-08-081-49/+0
* | Merge branch 'zj-enable-deploy-keys-api' into 'master' Douwe Maan2016-08-081-38/+66
|\ \
| * | Namespace EnableDeployKeyService under ProjectsZ.J. van de Weg2016-08-081-1/+2
| * | Create service for enabling deploy keysZ.J. van de Weg2016-08-051-3/+3
| * | Move deploy_key tests to deploy_key_spec.rbZ.J. van de Weg2016-08-041-5/+6
| * | Use Grape DSL for deploy keys endpointsZ.J. van de Weg2016-08-031-39/+34
| * | Endpoints to enable and disable deploy keysZ.J. van de Weg2016-08-031-0/+31
* | | Merge branch 'git-http-push-check' into 'master' Robert Speicher2016-08-081-1/+1
|\ \ \
| * | | Stop 'git push' over HTTP earlyJacob Vosmaer2016-08-031-1/+1
| |/ /
* | | Merge branch 'rubocop/EmptyLinesAroundModuleBody' into 'master' Douwe Maan2016-08-082-4/+0
|\ \ \
| * | | Enable Style/EmptyLinesAroundClassBody coprubocop/EmptyLinesAroundModuleBodyGabriel Mazetto2016-08-062-2/+0
| * | | Enable Style/EmptyLinesAroundModuleBody copGabriel Mazetto2016-08-061-2/+0
| | |/ | |/|
* | | Merge branch 'revert-host-header-overwrite' into 'master' Douwe Maan2016-08-082-12/+2
|\ \ \
| * | | Revert "Defend against 'Host' header injection"Jacob Vosmaer2016-08-082-12/+2
| |/ /
* | | Merge branch 'rubocop/SpaceAroundEqualsInParameterDefault' into 'master' Douwe Maan2016-08-084-4/+4
|\ \ \
| * | | Enable Style/SpaceAroundEqualsInParameterDefault coprubocop/SpaceAroundEqualsInParameterDefaultGabriel Mazetto2016-08-064-4/+4
| |/ /
* | | Merge branch 'decode-log-postreceive-args' into 'master' Douwe Maan2016-08-081-1/+0
|\ \ \
| * | | Log base64-decoded PostReceive argumentsJacob Vosmaer2016-08-051-1/+0
* | | | Merge branch 'fix/import-pending-user' into 'master' Rémy Coutable2016-08-081-5/+8
|\ \ \ \
| * | | | Support pending invitation project members importing projectsJames Lopez2016-08-081-5/+8
| | |/ / | |/| |
* | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2016-08-081-1/+2
|\ \ \ \ | |/ / /
| * | | Ignore URLs starting with // (!5677)winniehell2016-08-051-1/+2
* | | | Merge branch '14898-protected-branches-developer-can-not-push-without-permiss...Douwe Maan2016-08-051-0/+2
|\ \ \ \ | |/ / / |/| | |
| * | | changes default_branch_protection to allow devs_can_merge protection option a...tiagonbotelho2016-08-041-0/+2
* | | | Merge branch 'master' of https://dev.gitlab.org/gitlab/gitlabhqRémy Coutable2016-08-041-1/+3
|\ \ \ \
| * \ \ \ Merge branch '20527-fork-commits-have-impact-on-original-project' into 'master' Rémy Coutable2016-08-041-1/+3
| |\ \ \ \
| | * | | | Don’t close issues on original project from a forkPaco Guzman2016-08-041-1/+3
* | | | | | Merge branch '20512-fix-rename-add-users-into-project-to-add-users-to-project...Rémy Coutable2016-08-042-8/+8
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Fix Rename `add_users_into_project` and `projects_ids`Herminio Torres2016-08-042-8/+8
* | | | | | Merge branch 'fix/ha-mode-import-issue' into 'master' Rémy Coutable2016-08-041-0/+4
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | using shared path for project import uploads and refactored gitlab remove exp...James Lopez2016-08-041-0/+4
* | | | | | Merge branch 'syntax-highlight-filter-performance' into 'master' Rémy Coutable2016-08-041-8/+18
|\ \ \ \ \ \
| * | | | | | Improve performance of SyntaxHighlightFiltersyntax-highlight-filter-performanceYorick Peterse2016-08-031-8/+18
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'fix/import-error' into 'master' Rémy Coutable2016-08-041-1/+1
|\ \ \ \ \ \
| * | | | | | Fix Import/Export error checking versionsfix/import-errorJames Lopez2016-08-031-1/+1
| |/ / / / /
* | | | | | Merge branch 'autolink-filter-text-parse' into 'master' Rémy Coutable2016-08-041-6/+9
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Improve AutolinkFilter#text_parse performanceautolink-filter-text-parseYorick Peterse2016-08-031-6/+9
| |/ / / /
* | | | | Merge branch 'update-gitlab-shell-in-tests' into 'master' Robert Speicher2016-08-031-2/+8
|\ \ \ \ \
| * | | | | Update the gitlab-shell version in the tmp/tests directory to the right versionupdate-gitlab-shell-in-testsStan Hu2016-08-031-2/+8
| |/ / / /
* | | | | Make Compare#diffs diff_options a regular argumentDouwe Maan2016-08-031-1/+1
* | | | | switch from diff_file_collection to diffs20034-safe-diffsPaco Guzman2016-08-038-44/+24
* | | | | Introduce Compare model in the codebase.Paco Guzman2016-08-035-17/+19
* | | | | Move to Gitlab::Diff::FileCollectionPaco Guzman2016-08-037-5/+162
* | | | | Cache highlighted diff lines for merge requestsPaco Guzman2016-08-034-5/+23
|/ / / /
* | | | Merge branch 'fix-downtime-check-compare-with-branch' into 'master' Yorick Peterse2016-08-021-20/+6
|\ \ \ \
| * | | | Always compare with FETCH_HEAD in downtime_checkYorick Peterse2016-08-021-20/+6
| |/ / /
* | | | fix TODO comment [ci skip]James Lopez2016-08-021-1/+1
|/ / /
* | | Add support for relative links starting with ./ or / to RelativeLinkFilter (!...winniehell2016-08-021-0/+3
|/ /
* | Catch what warden might throw when profiling requests to re-throw itfix/request-profiler-error-when-unauthenticatedAhmad Sherif2016-08-011-2/+8
View Lorry Controller Status