summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Resolve "Forking with namespace doesn't work (API)"Jan2018-03-262-10/+2
* Updated grape to `1.0.2` to remove workaround40843-update-grape-to-v1-0-2-when-it-is-releasedJames Edwards-Jones2018-03-261-6/+1
* Merge branch '44564-error-500-while-attempting-to-resolve-conflicts-due-to-ut...Stan Hu2018-03-234-10/+18
|\
| * Fix 500 error when trying to resolve non-ASCII conflicts in editorSean McGivern2018-03-234-10/+18
* | Merge branch 'fix/encoding-helper-clean-blowing-up-on-utf-16be' into 'master'Robert Speicher2018-03-231-1/+1
|\ \
| * | Fix EncodingHelper#clean blowing up on UTF-16BE stringsfix/encoding-helper-clean-blowing-up-on-utf-16beAhmad Sherif2018-03-221-1/+1
* | | Add ?, !, and : to trailing puncutation excluded from auto-linkingSean McGivern2018-03-231-5/+6
| |/ |/|
* | Merge branch 'jprovazn-issueref' into 'master'Douwe Maan2018-03-231-1/+9
|\ \
| * | Fix issuable state indicatorJan Provaznik2018-03-231-1/+9
* | | Merge branch 'mark-legacy-git-access' into 'master'Sean McGivern2018-03-2317-27/+64
|\ \ \ | |/ / |/| |
| * | Route path lookups through legacy_disk_pathmark-legacy-git-accessJacob Vosmaer2018-03-2117-27/+64
* | | Merge branch 'ci-pipeline-commit-lookup' into 'master'Kamil Trzciński2018-03-221-4/+4
|\ \ \ | |_|/ |/| |
| * | Use porcelain commit lookup method on CI::CreatePipelineServiceci-pipeline-commit-lookupAlejandro Rodríguez2018-03-221-4/+4
* | | Merge branch 'latest-security-to-master-21-03-18' into 'master'Douwe Maan2018-03-225-21/+76
|\ \ \
| * \ \ Merge branch 'master' into 'latest-security-to-master-21-03-18'James Lopez2018-03-226-33/+137
| |\ \ \
| * | | | Fixing request options to allow_local_requests with DELETE verblatest-security-to-master-21-03-18Francisco Javier López2018-03-211-1/+1
| * | | | Adapting mattermost to the new way of calling HTTPFrancisco Javier López2018-03-211-1/+1
| * | | | Merge branch 'fj-15329-services-callbacks-ssrf' into 'security-10-6'Douwe Maan2018-03-215-20/+75
| | |/ / | |/| |
* | | | Merge branch 'fix/remove-wiki-cache-clear' into 'master'Sean McGivern2018-03-221-3/+0
|\ \ \ \ | |_|/ / |/| | |
| * | | Remove calls to clear_cache from Git::Wikifix/remove-wiki-cache-clearAhmad Sherif2018-03-211-3/+0
| |/ /
* | | Merge branch 'sh-fix-readonly-reload' into 'master'Sean McGivern2018-03-221-1/+1
|\ \ \
| * | | Fix "A copy of Gitlab::Middleware::Readonly has been removed from the module ...Stan Hu2018-03-211-1/+1
* | | | Merge branch 'jej/omniauth-initializer-refactor' into 'master'Douwe Maan2018-03-221-0/+75
|\ \ \ \ | |/ / / |/| | |
| * | | OmniauthInitializer refactoringjej/omniauth-initializer-refactorJames Edwards-Jones2018-03-221-33/+31
| * | | Omniauth callbacks moved to methodsJames Edwards-Jones2018-03-201-26/+38
| * | | OmniauthInitializer created to improve devise.rbJames Edwards-Jones2018-03-201-0/+65
* | | | Merge branch 'add-query-counts-to-profiler-output' into 'master'Stan Hu2018-03-221-4/+8
|\ \ \ \
| * | | | Add query counts by model to profiler outputadd-query-counts-to-profiler-outputSean McGivern2018-03-211-4/+8
| | |/ / | |/| |
* | | | Merge branch 'remove-parser-warnings-workaround' into 'master'Robert Speicher2018-03-211-9/+0
|\ \ \ \
| * | | | It's now updated so we could remove itLin Jen-Shin2018-03-211-9/+0
| |/ / /
* | | | Merge branch 'gitaly-upload-archive' into 'master'Sean McGivern2018-03-211-1/+1
|\ \ \ \
| * | | | Send Gitaly payload for git-upload-archive SSH commandsAlejandro Rodríguez2018-03-211-1/+1
| |/ / /
* | | | Shortcut concurrent foreign key creation if already exists.ab-43887-concurrent-migration-helpersAndreas Brandl2018-03-201-18/+37
* | | | Shortcut concurrent index creation/removal if no effect.Andreas Brandl2018-03-201-0/+15
|/ / /
* | | Merge branch '44280-fix-code-search' into 'master'Sean McGivern2018-03-202-2/+2
|\ \ \
| * | | Split repository search result on \n instead of $ to prevent the items of the...Jasper Maes2018-03-192-2/+2
* | | | Merge branch 'issue_25542' into 'master'Sean McGivern2018-03-201-1/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | Improve JIRA event descriptionsissue_25542Felipe Artur2018-03-191-1/+1
* | | | move render_gfm into behaviors directoryMike Greiling2018-03-191-2/+2
* | | | Merge branch 'ajax-requests-in-performance-bar' into 'master'Robert Speicher2018-03-191-0/+9
|\ \ \ \
| * | | | Show Ajax requests in performance barSean McGivern2018-03-191-0/+9
* | | | | Optional '/-/' delimiter for search APIJan Provaznik2018-03-191-2/+2
|/ / / /
* | | | Merge branch '44257-viewing-a-particular-commit-gives-500-error-error-undefin...Douwe Maan2018-03-191-18/+21
|\ \ \ \
| * | | | Ensure that we never assume old_blob or new_blob are nil44257-viewing-a-particular-commit-gives-500-error-error-undefined-method-binarySean McGivern2018-03-161-18/+21
* | | | | Merge branch 'master' into 'update-kubeclient'Grzegorz Bizon2018-03-1724-36/+335
|\ \ \ \ \
| * | | | | Fix "A copy of Gitlab::Metrics::Methods" have been removed errorStan Hu2018-03-161-1/+1
| | |/ / / | |/| | |
| * | | | Merge branch '41902-add-api-option-to-overwrite-project-description-on-projec...Grzegorz Bizon2018-03-163-4/+20
| |\ \ \ \
| | * | | | Adds the option to override project description on export via APITiago Botelho2018-03-163-4/+20
| * | | | | Merge branch '44126-setup-middleware-before-adapter' into 'master'Kamil Trzciński2018-03-161-2/+3
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Setup Faraday middleware before adapterLin Jen-Shin2018-03-161-2/+3
| | |/ / /
View Lorry Controller Status