summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Rename Todos.with_api_entity_associations to with_entity_associationssh-optimize-todos-controllerStan Hu2019-06-241-1/+1
* Merge branch 'search-blob-basenames' into 'master'Kamil Trzciński2019-06-241-3/+6
|\
| * Build correct basenames for title search resultssearch-blob-basenamesMarkus Koller2019-06-201-3/+6
* | Add name & search parameters to project environments APILee Tickett2019-06-241-1/+6
* | Merge branch 'fix-labels-in-hooks' into 'master'Ash McKenzie2019-06-242-2/+2
|\ \
| * | Added labels_hook_attrs methodfix-labels-in-hooksJan Provaznik2019-06-242-2/+2
| * | Fix label serialisation in issue and note hooksSean McGivern2019-06-202-2/+2
* | | Merge branch 'sync-merge-ref-upon-mergeability-check' into 'master'Douwe Maan2019-06-242-19/+7
|\ \ \
| * | | Automatically update MR merge-ref along merge statusOswaldo Ferreira2019-06-202-19/+7
* | | | Merge branch '60617-enable-project-cluster-jit' into 'master'Thong Kuah2019-06-241-1/+0
|\ \ \ \
| * | | | Enable project-level JIT resource creation60617-enable-project-cluster-jitTiger2019-06-181-1/+0
* | | | | Select deployments that only has the app labelThong Kuah2019-06-211-0/+8
* | | | | Include the GitLab version in the cache key for Gitlab::JsonCacheDouglas Barbosa Alexandre2019-06-211-2/+2
* | | | | Merge branch 'sh-clean-up-bitbucket-import-errors' into 'master'Douglas Barbosa Alexandre2019-06-211-1/+27
|\ \ \ \ \
| * | | | | Avoid storing backtraces from Bitbucket Cloud imports in the databasesh-clean-up-bitbucket-import-errorsStan Hu2019-06-191-1/+27
* | | | | | Merge branch '63406-selecting-a-line-in-ci-job-trace-using-triple-click-selec...Stan Hu2019-06-211-1/+3
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into '63406-selecting-a-line-in-ci-job-trace-using-trip...63406-selecting-a-line-in-ci-job-trace-using-triple-click-selects-the-previous-line-alsoAdam Hegyi2019-06-196-6/+10
| |\ \ \ \ \ \
| * | | | | | | Fix copying a single line from FirefoxAdam Hegyi2019-06-191-1/+3
* | | | | | | | Don't show private keys for letsencrypt certsVladimir Shushlin2019-06-211-7/+8
* | | | | | | | Sanitize LDAP output in Rake tasksDrew Blessing2019-06-211-2/+7
* | | | | | | | Merge branch 'default-enable-complex-ci-variables-expressions' into 'master'Kamil Trzciński2019-06-213-3/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | Enabled complex ci variable expression statements by defaultdefault-enable-complex-ci-variables-expressionsdrew cimino2019-06-203-3/+3
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'bug/63162-duplicate_path_in_links' into 'master'Sean McGivern2019-06-211-0/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Do not rewrite relative links for system notesbug/63162-duplicate_path_in_linksMario de la Ossa2019-06-201-0/+2
* | | | | | | | | Merge branch 'zj-gitaly-usage-data' into 'master'Stan Hu2019-06-202-3/+18
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add Gitaly data to the usage pingZeger-Jan van de Weg2019-06-202-3/+18
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge branch 'config-yaml-differences' into 'master'Robert Speicher2019-06-201-6/+10
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | |
| * | | | | | | | Backport gitlab.yml.example from EEconfig-yaml-differencesYorick Peterse2019-06-201-6/+10
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Add embedding flag and filter to CPU/MemSarah Yasonik2019-06-203-10/+98
* | | | | | | | Merge branch '63510-error-parsing-true-boolean-in-gitlab-jsoncache' into 'mas...Ash McKenzie2019-06-201-1/+1
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Gitlab::JsonCache#parse_value ensure string63510-error-parsing-true-boolean-in-gitlab-jsoncacheAsh McKenzie2019-06-201-1/+1
* | | | | | | | Render GFM html in GraphQLBob Van Landuyt2019-06-202-0/+48
|/ / / / / / /
* | | | | | | Merge branch 'fix/facivon-url-if-uploads-object-store-enabled' into 'master'Stan Hu2019-06-201-6/+2
|\ \ \ \ \ \ \
| * | | | | | | fix(favicon): get favicon_path, so it works also with uploads object storeRoger Meier2019-06-141-6/+2
* | | | | | | | Updating CE repo to include new EE users API changesMichael Leopard2019-06-191-14/+1
| |_|_|/ / / / |/| | | | | |
* | | | | | | CE backport for changes in EE MR 14017Luke Duncalfe2019-06-191-5/+4
* | | | | | | Merge branch 'pderichs-52123' into 'master'Robert Speicher2019-06-195-29/+31
|\ \ \ \ \ \ \
| * | | | | | | Simplify result of find_noteablepderichs-52123Patrick Derichs2019-06-191-3/+1
| * | | | | | | Use NotesFinder to fetch notes on API and ControllersPatrick Derichs2019-06-195-28/+32
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'pj/fix-emacs-style' into 'master'Lin Jen-Shin2019-06-191-1/+4
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Use correct arg namepjaspers2019-06-191-1/+1
| * | | | | | Fix syntax coloring on emacspjaspers2019-06-191-1/+4
| | |_|/ / / | |/| | | |
* | | | | | Merge branch '63417-add-missing-class' into 'master'Kamil Trzciński2019-06-191-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Adds missing class63417-add-missing-classFilipa Lacerda2019-06-191-1/+1
* | | | | | Add documentation and testsManoj MJ2019-06-194-4/+8
* | | | | | Fix Container Scanning job with K8S runnersPhilippe Lafoucrière2019-06-191-1/+1
| |_|_|/ / |/| | | |
* | | | | Adds identity information while making external authorization requestsManoj MJ2019-06-191-1/+2
* | | | | Merge branch 'fix-microsoft-teams-notification-flags' into 'master'Stan Hu2019-06-191-2/+3
|\ \ \ \ \
| * | | | | 59702 Fix API notification flags for MS TeamsSeiji Suenaga2019-06-181-2/+3
* | | | | | Merge branch 'remove-support-for-app-label-matching' into 'master'Ash McKenzie2019-06-191-6/+1
|\ \ \ \ \ \