summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ce-7927-filter-none-any-weight-issues-api' into 'master'Sean McGivern2018-10-311-4/+13
|\
| * Extract EE params in issues API to separate moduleHeinrich Lee Yu2018-10-301-4/+13
* | Merge branch 'add-language-param-to-highlight' into 'master'Douwe Maan2018-10-306-20/+57
|\ \
| * | 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 branch 'bvl-move-wrapped-gitaly-errors' into 'master'Douwe Maan2018-10-309-35/+48
|\ \ \
| * | | Move Repository#wrapped_gitaly_errors into concernBob Van Landuyt2018-10-309-35/+48
| |/ /
* | | Merge branch 'frozen-string-enable-lib-gitlab-ci' into 'master'Stan Hu2018-10-3089-2/+183
|\ \ \ | |/ / |/| |
| * | Enable frozen string for lib/gitlab/cigfyoung2018-10-2689-2/+183
* | | Merge remote-tracking branch 'origin/master' into dev-masterDJ Mountney2018-10-2924-84/+434
|\ \ \
| * \ \ 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-267-46/+197
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | 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-257-46/+181
| | |/ /
| * | | Feature/add license to project APIJ.D. Bean2018-10-262-5/+27
| * | | Merge branch '7864-ee-routes' into 'master'Sean McGivern2018-10-261-0/+38
| |\ \ \
| | * | | 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 '52384-api-filter-assignee-none-any' into 'master'Sean McGivern2018-10-263-2/+17
| |\ \ \ \
| | * | | | Support lowercase none / anyHeinrich Lee Yu2018-10-261-1/+1
| | * | | | Refactor api validator to separate classHeinrich Lee Yu2018-10-263-8/+15
| | * | | | Apply similar change to MRs APIHeinrich Lee Yu2018-10-262-2/+6
| | * | | | Issues API: Add None/Any option to assignee_idHeinrich Lee Yu2018-10-261-1/+5
| | |/ / /
| * | | | Support backward compatibility when introduce new failure reasonShinya Maeda2018-10-261-2/+1
| |/ / /
| * | | Merge branch 'an-multithreading' into 'master'Robert Speicher2018-10-252-0/+131
| |\ \ \
| | * | | Add experimental support for Pumaan-multithreadingAndrew Newdigate2018-10-252-0/+131
| * | | | Use gitlab_environment for ldap rake task52993-ldap-rename_provider-rake-task-brokenCindy Pallares2018-10-251-1/+1
| | |_|/ | |/| |
* | | | 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 'sh-fix-wiki-security-issue-53072' into 'master'Jan Provaznik2018-10-292-2/+17
|\ \ \ \ \