Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'qa-264' into 'master' | Rémy Coutable | 2018-07-12 | 17 | -22/+229 |
|\ | |||||
| * | Adding spec to test basic forking functionalities | Mykhailo Formus | 2018-07-12 | 17 | -22/+229 |
|/ | |||||
* | Merge branch '48690-follow-up-from-milestone-tests' into 'master' | Rémy Coutable | 2018-07-12 | 3 | -11/+13 |
|\ | |||||
| * | move #has_milestone? to issuable sidebar;48690-follow-up-from-milestone-tests | ddavison | 2018-07-11 | 3 | -11/+13 |
* | | Merge branch 'dz-manifest-import' into 'master' | Douwe Maan | 2018-07-12 | 30 | -55/+1313 |
|\ \ | |||||
| * | | Fix CI/CD importdz-manifest-import | Dmitriy Zaporozhets | 2018-07-11 | 1 | -1/+1 |
| * | | Add newly translated strings to locale/gitlab.pot | Dmitriy Zaporozhets | 2018-07-11 | 1 | -0/+21 |
| * | | Add mysql and postgres spec for manifest import button | Dmitriy Zaporozhets | 2018-07-11 | 1 | -2/+17 |
| * | | Fix a link to subgroup doc from manifest doc | Dmitriy Zaporozhets | 2018-07-11 | 1 | -1/+1 |
| * | | Improve manifest feature after backend review | Dmitriy Zaporozhets | 2018-07-11 | 12 | -53/+57 |
| * | | Improve manifest feature frontend after review | Dmitriy Zaporozhets | 2018-07-11 | 3 | -21/+26 |
| * | | Rename button at manifest import form | Dmitriy Zaporozhets | 2018-07-11 | 4 | -4/+4 |
| * | | Make the manifest import feature spec a postgres only | Dmitriy Zaporozhets | 2018-07-11 | 1 | -1/+1 |
| * | | Refactor manifest import code | Dmitriy Zaporozhets | 2018-07-11 | 6 | -17/+12 |
| * | | Add feature specs for manifest import | Dmitriy Zaporozhets | 2018-07-11 | 3 | -3/+26 |
| * | | Move manifest import to separate page and add feature specs | Dmitriy Zaporozhets | 2018-07-11 | 5 | -9/+38 |
| * | | Fix icon for manifest import and mention manifest feature in API | Dmitriy Zaporozhets | 2018-07-11 | 2 | -2/+2 |
| * | | Add documentation for manifest import feature | Dmitriy Zaporozhets | 2018-07-11 | 5 | -1/+46 |
| * | | Add ability to disable manifest import | Dmitriy Zaporozhets | 2018-07-11 | 3 | -5/+21 |
| * | | Improve manifest import logic | Dmitriy Zaporozhets | 2018-07-11 | 4 | -28/+41 |
| * | | More reliable manifest parser and group-only selector | Dmitriy Zaporozhets | 2018-07-11 | 4 | -10/+26 |
| * | | Fix tests in import_sources_spec.rb | Dmitriy Zaporozhets | 2018-07-11 | 3 | -5/+10 |
| * | | Add changelog for manifest import feature | Dmitriy Zaporozhets | 2018-07-11 | 1 | -0/+5 |
| * | | Add manifest import feature | Dmitriy Zaporozhets | 2018-07-11 | 14 | -18/+1084 |
* | | | Merge branch 'docs-add-api-params-array-hash' into 'master' | Douwe Maan | 2018-07-12 | 1 | -1/+31 |
|\ \ \ | |||||
| * | | | Add examples for array and hash type API paramsdocs-add-api-params-array-hash | Athar Hameed | 2018-07-12 | 1 | -1/+31 |
* | | | | Merge branch 'sh-optimize-wiki-empty-check' into 'master' | Douwe Maan | 2018-07-12 | 3 | -2/+18 |
|\ \ \ \ | |||||
| * | | | | Fix Dangerfilesh-optimize-wiki-empty-check | Stan Hu | 2018-07-12 | 1 | -1/+1 |
| * | | | | Optimize ProjectWiki#empty? check | Stan Hu | 2018-07-12 | 3 | -2/+18 |
| |/ / / | |||||
* | | | | Merge branch 'i18n-extract-app/views/explore' into 'master' | Rémy Coutable | 2018-07-12 | 9 | -21/+57 |
|\ \ \ \ | |||||
| * | | | | i18n: externalize strings from 'app/views/explore' | Tao Wang | 2018-07-10 | 9 | -21/+57 |
* | | | | | Merge branch 'docs-fix-typo-eks' into 'master' | Marcia Ramos | 2018-07-12 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | typo | Marcia Ramos | 2018-07-12 | 1 | -1/+1 |
* | | | | | | Merge branch 'gitaly-serverservice-info-timeout' into 'master' | Rémy Coutable | 2018-07-12 | 3 | -2/+7 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Add a fast_timeout for the `ServerService.ServerInfo` endpointgitaly-serverservice-info-timeout | Andrew Newdigate | 2018-07-11 | 3 | -2/+7 |
* | | | | | | | Merge branch 'project_import_export_update' into 'master' | Marcia Ramos | 2018-07-12 | 1 | -1/+27 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Update project_import_export.md. Removed cURL statementproject_import_export_update | Michael Leopard | 2018-07-10 | 1 | -5/+0 |
| * | | | | | | | Update project_import_export.md to include example remote import script and a... | Michael Leopard | 2018-07-10 | 1 | -0/+31 |
* | | | | | | | | Merge branch 'mk/remove-push-output-logging' into 'master' | Rémy Coutable | 2018-07-12 | 1 | -18/+6 |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | |||||
| * | | | | | | | Revert "Log push output on exception"mk/remove-push-output-logging | Michael Kozono | 2018-07-11 | 1 | -18/+6 |
* | | | | | | | | Merge branch 'select-letters-and-numbers' into 'master' | Nick Thomas | 2018-07-12 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | We want letters and numbersselect-letters-and-numbers | Lin Jen-Shin | 2018-07-12 | 1 | -1/+1 |
| | |_|_|_|/ / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'gitlab-git-dont-memoize-path' into 'master' | Sean McGivern | 2018-07-12 | 9 | -176/+107 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Remove Repository#path memoization | Jacob Vosmaer (GitLab) | 2018-07-12 | 9 | -176/+107 |
|/ / / / / / / / | |||||
* | | | | | | | | Merge branch '46930-fix-updated_at-if-created_at-is-set-note-api' into 'master' | Rémy Coutable | 2018-07-12 | 4 | -0/+10 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Resolve "do not set updated_at when creating note" | Kia Mei Somabes | 2018-07-12 | 4 | -0/+10 |
|/ / / / / / / / | |||||
* | | | | | | | | Merge branch 'ide-row-dropdown-design-update' into 'master' | Filipa Lacerda | 2018-07-12 | 22 | -247/+357 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Improvements to new entry dropdowns in Web IDE | Phil Hughes | 2018-07-11 | 22 | -247/+357 |
| | |_|_|_|_|/ / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'sh-fix-dangerfile' into 'master' | Rémy Coutable | 2018-07-12 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Fix Dangerfile | Stan Hu | 2018-07-12 | 1 | -1/+1 |
|/ / / / / / / / |