summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Don't escape html entities when rich == raw line36041-notification-titleJarka Kadlecova2017-08-171-12/+22
* Merge branch 'issue_31790' into 'master'Douwe Maan2017-08-151-0/+3
|\
| * Fix API responses when dealing with txt filesissue_31790Felipe Artur2017-08-151-0/+3
* | Merge branch 'workhorse-deprecate-gitaly-address' into 'master'Douwe Maan2017-08-151-1/+0
|\ \ | |/ |/|
| * Remove deprecated field from workhorse API responsesworkhorse-deprecate-gitaly-addressJacob Vosmaer2017-08-151-1/+0
* | Add two more project templateszj-add-two-more-project-templatesZ.J. van de Weg2017-08-152-3/+10
* | Merge branch 'malformed-submodule' into 'master'Douwe Maan2017-08-151-0/+2
|\ \
| * | Handle missing .gitmodules when getting submodule urlsmalformed-submoduleJacob Vosmaer2017-08-141-0/+2
| |/
* | Merge branch 'forks-count-cache' into 'master'Douwe Maan2017-08-152-0/+4
|\ \
| * | Cache the number of forks of a projectforks-count-cacheYorick Peterse2017-08-142-0/+4
* | | Merge branch 'gitaly-test-bundle-path' into 'master'Rémy Coutable2017-08-141-2/+6
|\ \ \
| * | | Use existing BUNDLE_PATH for gitaly in local testsgitaly-test-bundle-pathJacob Vosmaer2017-08-111-2/+6
* | | | Merge branch 'gitaly-404-commit-list-files' into 'master'Douwe Maan2017-08-142-22/+48
|\ \ \ \
| * | | | Migrate Git::Repository.ls_files to Gitalygitaly-404-commit-list-filesKim "BKC" Carlbäcker2017-08-102-22/+48
* | | | | Merge branch 'fix/thread-safe-gpgme-tmp-directory' into 'master'Dmitriy Zaporozhets2017-08-141-11/+29
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | reset original directory in ensureAlexis Reigel2017-08-141-8/+4
| * | | | use mutex for keychain interactionAlexis Reigel2017-08-141-8/+26
| * | | | store gpg return directory locallyAlexis Reigel2017-08-111-5/+9
* | | | | 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
View Lorry Controller Status