summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'bvl-rollback-renamed-system-namespace' into 'master'Douwe Maan2017-08-141-0/+79
|\
| * Move the personal snippet uploads from `system` to `-/system`bvl-rollback-renamed-system-namespaceBob Van Landuyt2017-08-111-0/+79
* | Merge branch 'feature/migrate-force-push-check-to-gitaly' into 'master'Robert Speicher2017-08-112-7/+16
|\ \
| * | Migrate force push check to Gitalyfeature/migrate-force-push-check-to-gitalyAhmad Sherif2017-08-112-7/+16
* | | Merge branch 'disable-project-export' into 'master'Rémy Coutable2017-08-111-0/+1
|\ \ \
| * | | Add option to disable project export on instanceRobin Bobbitt2017-08-111-0/+1
| | |/ | |/|
* | | Merge branch 'rs-coverage-updates' into 'master'Rémy Coutable2017-08-114-16/+6
|\ \ \
| * | | Better categorize test coverage resultsrs-coverage-updatesRobert Speicher2017-08-114-16/+6
| |/ /
* | | Merge branch '36213-return-is_admin-in-users-api-when-current_user-is-admin' ...Sean McGivern2017-08-111-9/+4
|\ \ \
| * | | Include the `is_admin` field in the `GET /users/:id` API when current user is...Rémy Coutable2017-08-111-9/+4
* | | | Merge branch 'rc/32308-rspec-retry-hack' into 'master'Sean McGivern2017-08-113-0/+160
|\ \ \ \ | |_|/ / |/| | |
| * | | Use a new RspecFlakyListener to detect flaky specsRémy Coutable2017-08-113-0/+160
* | | | Merge branch 'split-events-into-push-events' into 'master'Sean McGivern2017-08-115-10/+220
|\ \ \ \
| * | | | Use a specialized class for querying eventsYorick Peterse2017-08-101-0/+4
| * | | | Migrate events into a new formatYorick Peterse2017-08-104-10/+216
* | | | | Show error message for API 500 error in tests, andLin Jen-Shin2017-08-111-1/+9
| |/ / / |/| | |
* | | | Fix merge request diff deserialisation when too_large was absentSean McGivern2017-08-111-0/+2
| |/ / |/| |
* | | Merge branch 'gitlab-git-expose-raw-log' into 'master'Sean McGivern2017-08-111-16/+17
|\ \ \
| * | | Expose the raw_log methodgitlab-git-expose-raw-logJacob Vosmaer2017-08-091-16/+17
| | |/ | |/|
* | | Merge branch 'jej/security-release-2017-08-10' into 'master'Stan Hu2017-08-102-1/+13
|\ \ \
| * | | Merge branch 'rs-alphanumeric-ssh-params' into 'security-9-4'jej/security-release-2017-08-10James Edwards-Jones2017-08-101-0/+8
| * | | Merge branch 'import-symlinks-9-3' into 'security-9-3'James Edwards-Jones2017-08-101-1/+5
| | |/ | |/|
* | | Filter sensitive query string parameters from NGINX access logsNick Thomas2017-08-102-3/+71
|/ /
* | Merge branch 'gitaly-repository-exists' into 'master'32665-make-project-and-features-visibility-settings-less-confusingSean McGivern2017-08-091-1/+1
|\ \
| * | Rename RPC 'Exists' to 'RepositoryExists'Jacob Vosmaer2017-08-091-1/+1
* | | Merge branch 'fix-gitlab-pages-cache-config' into 'master'Grzegorz Bizon2017-08-092-2/+8
|\ \ \
| * | | Fix proxy config in Gitlab Pages nginx examplesNick Thomas2017-08-082-2/+8
* | | | Merge branch '36003-do-not-include-to-kernel' into 'master'Robert Speicher2017-08-093-13/+3
|\ \ \ \ | |_|/ / |/| | |
| * | | We shouldn't include utility methods everywhereLin Jen-Shin2017-08-081-0/+2
| * | | Just extend main, rather than include to KernelLin Jen-Shin2017-08-082-13/+1
* | | | Merge branch 'rc/enable-the-Layout/SpaceBeforeBlockBraces-cop' into 'master'Robert Speicher2017-08-095-7/+8
|\ \ \ \
| * | | | Fix ee_compat_check when EE branch uses a prefixRémy Coutable2017-08-091-2/+3
| * | | | Enable the Layout/SpaceBeforeBlockBraces coprc/enable-the-Layout/SpaceBeforeBlockBraces-copRémy Coutable2017-08-094-5/+5
| | |_|/ | |/| |
* | | | Explain why we use select all for project_url_constrainer.rbDmitriy Zaporozhets2017-08-091-0/+2
|/ / /
* | | Merge branch 'add-rubocop-gitlab-security' into 'master'Robert Speicher2017-08-0810-14/+16
|\ \ \
| * | | Re-enable SqlInjection and CommandInjectionBrian Neel2017-08-0810-14/+16
* | | | Merge branch 'gitaly-bundle-gemfile' into 'master'Rémy Coutable2017-08-081-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Unset BUNDLE_GEMFILE when installing GitalyJacob Vosmaer2017-08-081-1/+1
* | | | Merge branch 'gitaly-find-commit' into 'master'Dmitriy Zaporozhets2017-08-0811-89/+108
|\ \ \ \ | |_|/ / |/| | |
| * | | Incorporate Gitaly's CommitService.FindCommit RPCgitaly-find-commitAlejandro Rodríguez2017-08-074-22/+55
| * | | Move `deltas` and `diff_from_parents` logic to Gitlab::Git::CommitAlejandro Rodríguez2017-08-073-28/+39
| * | | Refactor Gitlab::Git::Commit to include a repositoryAlejandro Rodríguez2017-08-078-45/+20
* | | | Merge branch '35098-raise-encoding-confidence-threshold' into 'master'Sean McGivern2017-08-081-1/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | Raise encoding confidence threshold to 50Lin Jen-Shin2017-08-081-1/+1
* | | | Merge branch 'rc/fix-commits-api' into 'master'Sean McGivern2017-08-081-16/+17
|\ \ \ \ | |_|_|/ |/| | |
| * | | Fix the /projects/:id/repository/commits endpoint to handle dots in the ref n...rc/fix-commits-apiRémy Coutable2017-08-081-16/+17
| |/ /
* | | Merge branch 'winh-scope-haml-linter' into 'master'Grzegorz Bizon2017-08-081-9/+11
|\ \ \
| * | | Restrict InlineJavaScript for haml_lint to dev and test environmentwinh-scope-haml-linterwinh2017-08-081-9/+11
* | | | Expose noteable_iid in Notesue4452017-08-081-0/+6
* | | | Merge branch 'rc/fix-tags-api' into 'master'Sean McGivern2017-08-082-7/+9
|\ \ \ \ | |_|/ / |/| | |
View Lorry Controller Status