summaryrefslogtreecommitdiff
path: root/lib/gitlab
Commit message (Expand)AuthorAgeFilesLines
* Allow search results to accept project_idadd-language-param-to-highlightMark Chao2018-10-301-1/+6
* Allow FoundBlob to access language from gitattributesMark Chao2018-10-302-7/+6
* Move :plain option to Highlight classMark Chao2018-10-302-4/+3
* Make Highlight accept language paramMark Chao2018-10-304-16/+39
* Add BlobPresenter for highlightingMark Chao2018-10-301-0/+5
* Add access to Blob's language from gitattributesMark Chao2018-10-301-0/+6
* Merge remote-tracking branch 'origin/master' into dev-masterDJ Mountney2018-10-2916-74/+386
|\
| * Merge branch 'rails5-deprecated-uniq' into 'master'Robert Speicher2018-10-291-1/+1
| |\
| | * Replace deprecated uniq on a Relation with distinctJasper Maes2018-10-261-1/+1
| * | Rename 'sast_container' licensed feature5979_rename_sast_container_gitlab_features-ceKamil Trzciński2018-10-291-1/+1
| * | Fix open-ended params for api_json.logAndrew Newdigate2018-10-291-1/+9
| * | Merge branch '52780-stale-pipeline-status-cache-for-_project-after-disabling-...Grzegorz Bizon2018-10-291-4/+4
| |\ \
| | * | Remove cache_sha parameterMatija Čupić2018-10-261-2/+2
| | * | Cache pipeline status only for specific shaMatija Čupić2018-10-251-5/+5
| * | | Add failure reason for execution timeoutShinya Maeda2018-10-281-1/+2
| * | | Merge branch '51335-fail-early-when-user-cannot-be-identified' into 'master'Douwe Maan2018-10-262-20/+5
| |\ \ \
| | * | | Removes idenfitication by commit from Gitlab::Identifier51335-fail-early-when-user-cannot-be-identifiedTiago Botelho2018-10-252-20/+5
| | * | | User not defined in PostReceive#process_project_changesTiago Botelho2018-10-251-1/+1
| * | | | Merge branch '42790-improve-feedback-for-internal-git-access-checks-timeouts'...Douwe Maan2018-10-266-46/+195
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Reverts commits_check messageTiago Botelho2018-10-261-1/+1
| | * | | Iterating through commit list times outTiago Botelho2018-10-253-3/+7
| | * | | Refactors TimedLogger to be more OOP compliantTiago Botelho2018-10-253-14/+26
| | * | | Adds tracing messages for slow git pushesTiago Botelho2018-10-256-46/+179
| | |/ /
| * | | Make it clear that we intent to use | over ||Lin Jen-Shin2018-10-261-2/+3
| * | | Allow CE do nothing if route doesn't exist7864-ee-routesLin Jen-Shin2018-10-261-2/+2
| * | | Extract EE only oauth routes and add testsLin Jen-Shin2018-10-261-2/+6
| * | | Make it possible to add EE only routeLin Jen-Shin2018-10-261-4/+16
| * | | Put EE routes in EE files under EE directoriesLin Jen-Shin2018-10-261-0/+21
| * | | Merge branch 'an-multithreading' into 'master'Robert Speicher2018-10-252-0/+131
| |\ \ \ | | |_|/ | |/| |
| | * | Add experimental support for Pumaan-multithreadingAndrew Newdigate2018-10-252-0/+131
| | |/
* | | Merge branch 'fix_pat_auth-11-4' into 'security-11-4'Robert Speicher2018-10-291-3/+1
* | | Merge branch 'security-redact-links' into 'master'Jan Provaznik2018-10-291-0/+62
|\ \ \
| * | | Redact unsubscribe links in issuable textsJan Provaznik2018-10-231-0/+62
* | | | Merge branch 'security-master-junit-test-report-exposes-stacktrace' into 'mas...Jan Provaznik2018-10-291-4/+4
|\ \ \ \
| * | | | Remove full exception stack trace from errorMatija Čupić2018-10-231-4/+4
| |/ / /
* | | | [master] Persist only SHA digest of PersonalAccessToken#tokenImre Farkas2018-10-293-3/+56
* | | | Merge remote-tracking branch 'origin/master' into dev-masterDJ Mountney2018-10-258-83/+124
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'refactor_gitlab_kube_client' into 'master'Kamil Trzciński2018-10-251-40/+23
| |\ \ \
| | * | | Store version within SUPPORTED_API_GROUPS hashrefactor_gitlab_kube_clientThong Kuah2018-10-231-41/+14
| | * | | DRY up *_clients methodsThong Kuah2018-10-231-25/+21
| | * | | Split hashed_clients into one per api_groupThong Kuah2018-10-231-11/+32
| | * | | Remove api_groups from KubeClient constructorThong Kuah2018-10-231-27/+20
| | |/ /
| * | | Merge branch 'jlenny-UpdateAndroidTemplate' into 'master'Grzegorz Bizon2018-10-251-34/+28
| |\ \ \ | | |_|/ | |/| |
| | * | Update link to blog post since it didn't go out on 23rdjlenny-UpdateAndroidTemplateJason Lenny2018-10-241-1/+1
| | * | Update Android.gitlab-ci.yml with result of new blog post: https://gitlab.com...Jason Lenny2018-10-231-34/+28
| * | | Merge branch '53030-ee-compat-check-frozen-literal' into 'master'test-review-root-passwordSean McGivern2018-10-231-4/+6
| |\ \ \
| | * | | Fix ee-compat-check by not modifying frozen strings53030-ee-compat-check-frozen-literalMario de la Ossa2018-10-231-4/+6
| | | |/ | | |/|
| * | | Merge branch 'mysql-migration-trigger-permissions' into 'master'Andreas Brandl2018-10-231-1/+1
| |\ \ \
| | * | | Add dbname to MySQL migration GRANT commandRyan Hefner2018-09-131-1/+1
| * | | | Merge branch 'support-license-management-and-performance' into 'master'Grzegorz Bizon2018-10-231-1/+3
| |\ \ \ \
View Lorry Controller Status