Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | Merge branch 'graphql-file-renames' into 'master' | Kushal Pandya | 2019-06-20 | 11 | -6/+6 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Rename graphql files to match frontend docs | Phil Hughes | 2019-06-19 | 11 | -6/+6 | |
* | | | | | | | | | | Merge branch 'docs-registry-restore-workaround' into 'master' | Achilleas Pipinellis | 2019-06-20 | 1 | -0/+31 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Document the workaround for issues after registry restore | DJ Mountney | 2019-06-20 | 1 | -0/+31 | |
|/ / / / / / / / / / | ||||||
* | | | | | | | | | | Merge branch 'sh-remove-import-columns-from-projects' into 'master' | Douwe Maan | 2019-06-20 | 5 | -8/+22 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Remove import columns from projects tablesh-remove-import-columns-from-projects | Stan Hu | 2019-06-19 | 5 | -8/+22 | |
* | | | | | | | | | | | Merge branch 'bvl-markdown-graphql' into 'master' | Douwe Maan | 2019-06-20 | 19 | -19/+207 | |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | Render GFM html in GraphQL | Bob Van Landuyt | 2019-06-20 | 19 | -19/+207 | |
|/ / / / / / / / / / | ||||||
* | | | | | | | | | | Merge branch 'fix/facivon-url-if-uploads-object-store-enabled' into 'master' | Stan Hu | 2019-06-20 | 2 | -6/+7 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | fix(favicon): get favicon_path, so it works also with uploads object store | Roger Meier | 2019-06-14 | 2 | -6/+7 | |
* | | | | | | | | | | | Merge branch 'expose-saml-provider-id-to-users-api' into 'master' | Stan Hu | 2019-06-19 | 5 | -25/+37 | |
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | Updating CE repo to include new EE users API changes | Michael Leopard | 2019-06-19 | 5 | -25/+37 | |
|/ / / / / / / / / / | ||||||
* | | | | | | | | | | Merge branch 'docs-gitaly-without-nfs' into 'master' | Mike Lewis | 2019-06-19 | 1 | -0/+18 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Minor edits to Eliminating NFS section | Mike Lewis | 2019-06-19 | 1 | -9/+9 | |
| * | | | | | | | | | | Prefer cd path over ee path in docs linksdocs-gitaly-without-nfs | Diana Stanley | 2019-06-18 | 1 | -5/+5 | |
| * | | | | | | | | | | Modify to conform to style guide | Diana Stanley | 2019-06-18 | 1 | -5/+5 | |
| * | | | | | | | | | | Update gitaly docs to enumerate how to eliminate NFS altogether | Diana Stanley | 2019-06-18 | 1 | -0/+18 | |
* | | | | | | | | | | | Merge branch 'fix-jobs-controller-index-n-1' into 'master' | Stan Hu | 2019-06-19 | 4 | -5/+81 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Fix N+1 problem in `JobsController#index`fix-jobs-controller-index-n-1 | Kamil Trzciński | 2019-06-19 | 4 | -5/+81 | |
* | | | | | | | | | | | | Merge branch '9490-static-gitattributes-for-design-repos-ce' into 'master' | Mayra Cabrera | 2019-06-19 | 3 | -7/+24 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | CE backport for changes in EE MR 14017 | Luke Duncalfe | 2019-06-19 | 3 | -7/+24 | |
|/ / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | Merge branch '63227-fix-double-border' into 'master' | Annabel Dunstone Gray | 2019-06-19 | 3 | -2/+6 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Fix double border in profile page | Yoginth | 2019-06-19 | 3 | -2/+6 | |
|/ / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | Merge branch 'nested-lists-margin-fix' into 'master' | Annabel Dunstone Gray | 2019-06-19 | 2 | -0/+10 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Remove unnecessary margin in markdown nested lists | Kuba Kopeć | 2019-06-19 | 2 | -0/+10 | |
|/ / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | Merge branch 'test-script-watch' into 'master' | Mike Greiling | 2019-06-19 | 1 | -7/+16 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Add watch option to test script | Paul Gascou-Vaillancourt | 2019-06-19 | 1 | -7/+16 | |
|/ / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | Merge branch 'pderichs-52123' into 'master' | Robert Speicher | 2019-06-19 | 7 | -31/+71 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Simplify result of find_noteablepderichs-52123 | Patrick Derichs | 2019-06-19 | 1 | -3/+1 | |
| * | | | | | | | | | | | | Remove unneeded parentheses | Patrick Derichs | 2019-06-19 | 1 | -1/+1 | |
| * | | | | | | | | | | | | Separate conditions to increase readability | Patrick Derichs | 2019-06-19 | 1 | -1/+2 | |
| * | | | | | | | | | | | | Use NotesFinder to fetch notes on API and Controllers | Patrick Derichs | 2019-06-19 | 7 | -30/+71 | |
* | | | | | | | | | | | | | Merge branch 'fe-vue-test-utils-for-tooltip-on-truncate-spec' into 'master' | Mike Greiling | 2019-06-19 | 1 | -82/+98 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | Use @vue/test-utils for tooltip_on_truncate_specfe-vue-test-utils-for-tooltip-on-truncate-spec | Paul Slaughter | 2019-06-17 | 1 | -82/+98 | |
* | | | | | | | | | | | | | | Merge branch '52442-minimal-remove-mysql-support' into 'master' | Robert Speicher | 2019-06-19 | 20 | -531/+30 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | Update the docs to reflect lack of MySQL support52442-minimal-remove-mysql-support | Nick Thomas | 2019-06-19 | 16 | -461/+21 | |
| * | | | | | | | | | | | | | | Only support postgresql | Nick Thomas | 2019-06-19 | 4 | -70/+9 | |
* | | | | | | | | | | | | | | | Merge branch 'api-js-forked-projects' into 'master' | Filipa Lacerda | 2019-06-19 | 2 | -0/+39 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Added forked projects API call function | Phil Hughes | 2019-06-19 | 2 | -0/+39 | |
| | |_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | Merge branch 'pj/fix-emacs-style' into 'master' | Lin Jen-Shin | 2019-06-19 | 1 | -1/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | Use correct arg name | pjaspers | 2019-06-19 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | Fix syntax coloring on emacs | pjaspers | 2019-06-19 | 1 | -1/+4 | |
| |/ / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | Merge branch 'sh-pipeline-typo-docs' into 'master' | Marcia Ramos | 2019-06-19 | 1 | -1/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | Fix typo in doc/user/project/pipelines/settings.md | Stan Hu | 2019-06-19 | 1 | -1/+2 | |
|/ / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | Merge branch 'docs/update-e2e-quick-start-guide' into 'master' | Sanad Liaquat | 2019-06-19 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | Backport EE MR | Walmyr Lima | 2019-06-19 | 1 | -2/+2 | |
| | |_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge branch 'danger-comply-with-suggestions' into 'master' | Lin Jen-Shin | 2019-06-19 | 1 | -1/+11 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | When using suggestions, squash must be enabled | Achilleas Pipinellis | 2019-06-19 | 1 | -1/+11 | |
|/ / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | Merge branch '62722-include-derailed-benchmarks-data-to-ci-report' into 'master' | Kamil Trzciński | 2019-06-19 | 4 | -0/+67 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Run static benchmarks from 'derailed_benchmarks'62722-include-derailed-benchmarks-data-to-ci-report | Aleksei Lipniagov | 2019-06-19 | 4 | -0/+67 | |
| |/ / / / / / / / / / / |