Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | add article to listdocs-update-articles-list | Marcia Ramos | 2017-08-01 | 1 | -3/+4 |
| | | | | also, trigger build | ||||
* | link to CI/CD Deep Dive demo for #5800 | Marcia Ramos | 2017-08-01 | 1 | -0/+1 |
| | |||||
* | copyedit, add article to the list | Marcia Ramos | 2017-08-01 | 1 | -3/+3 |
| | |||||
* | Merge branch 'rc/fetch-before-finding-merge-base-in-ee_compat_check' into ↵ | Sean McGivern | 2017-08-01 | 1 | -2/+0 |
|\ | | | | | | | | | | | | | 'master' Always fetch branches before finding the merge base, otherwise we could find an outdated merge base See merge request !13226 | ||||
| * | Always fetch branches before finding the merge base, otherwise we could find ↵rc/fetch-before-finding-merge-base-in-ee_compat_check | Rémy Coutable | 2017-08-01 | 1 | -2/+0 |
| | | | | | | | | | | | | an outdated merge base Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | | Merge branch 'blob-limit-test' into 'master' | Sean McGivern | 2017-08-01 | 1 | -2/+8 |
|\ \ | | | | | | | | | | | | | Fix bug in blob test See merge request !13224 | ||||
| * | | Fix bug in blob test | Jacob Vosmaer | 2017-08-01 | 1 | -2/+8 |
| | | | |||||
* | | | Merge branch '28283-legacy-storage-format' into 'master' | Sean McGivern | 2017-08-01 | 117 | -481/+590 |
|\ \ \ | | | | | | | | | | | | | | | | | [CE] Added Legacy Storage format See merge request !13149 | ||||
| * | | | Small refactor in LegacyNamespace and moved back send_update_instructions28283-legacy-storage-format | Gabriel Mazetto | 2017-08-01 | 2 | -9/+8 |
| | | | | |||||
| * | | | Rename ensure_dir_exist -> ensure_storage_path_exist | Gabriel Mazetto | 2017-08-01 | 5 | -6/+6 |
| | | | | |||||
| * | | | Added some extra TODOs for the Legacy Storage refactor | Gabriel Mazetto | 2017-08-01 | 2 | -0/+3 |
| | | | | |||||
| * | | | Make disk_path keyword argument and optional | Gabriel Mazetto | 2017-08-01 | 4 | -8/+7 |
| | | | | |||||
| * | | | Rename more path_with_namespace -> full_path or disk_path | Gabriel Mazetto | 2017-08-01 | 38 | -109/+137 |
| | | | | |||||
| * | | | Rename path_with_namespace -> disk_path when dealing with the filesystem | Gabriel Mazetto | 2017-08-01 | 14 | -26/+26 |
| | | | | |||||
| * | | | Rename many path_with_namespace -> full_path | Gabriel Mazetto | 2017-08-01 | 70 | -185/+239 |
| | | | | |||||
| * | | | Move storage specific code from Namespace and Project to concerns | Gabriel Mazetto | 2017-08-01 | 4 | -168/+194 |
| | | | | |||||
* | | | | Merge branch '35627-lint-for-conflict' into 'master' | Rémy Coutable | 2017-08-01 | 2 | -1/+7 |
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | Make sure we didn't commit conflicts Closes #35627 See merge request !13141 | ||||
| * | | | Make sure we didn't commit conflicts | Lin Jen-Shin (godfat) | 2017-08-01 | 2 | -1/+7 |
|/ / / | |||||
* | | | Merge branch '35690-dropdown' into 'master' | Phil Hughes | 2017-08-01 | 1 | -3/+1 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Fixes dropdown margin in sidebar Closes #35690 See merge request !13205 | ||||
| * | | | Fixes dropdown margin in sidebar | Filipa Lacerda | 2017-08-01 | 1 | -3/+1 |
|/ / / | |||||
* | | | Merge branch 'gitaly-commit-languages' into 'master' | Sean McGivern | 2017-08-01 | 12 | -62/+125 |
|\ \ \ | |_|/ |/| | | | | | | | | Add option to use Gitaly CommitLanguages RPC See merge request !13084 | ||||
| * | | Add option to use CommitLanguages RPC | Jacob Vosmaer | 2017-08-01 | 6 | -51/+75 |
| | | | |||||
| * | | CI fixes for gitaly-ruby | Jacob Vosmaer | 2017-08-01 | 6 | -11/+50 |
| | | | |||||
* | | | Merge branch ↵ | Rémy Coutable | 2017-08-01 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | 'fix/sm/remove-services-true-from-pipeline_trigger_service_spec' into 'master' Remove `services: true` from spec/services/ci/pipeline_trigger_service_spec.rb See merge request !13219 | ||||
| * | | | fixfix/sm/remove-services-true-from-pipeline_trigger_service_spec | Shinya Maeda | 2017-08-01 | 1 | -1/+1 |
| | |/ | |/| | |||||
* | | | Merge branch 'mk-fix-deploy-key-deletion' into 'master' | Yorick Peterse | 2017-08-01 | 3 | -10/+49 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Fix deletion of deploy keys linked to other projects Closes #35630 See merge request !13162 | ||||
| * | | | Exclude keys linked to other projectsmk-fix-deploy-key-deletion | Michael Kozono | 2017-07-28 | 3 | -10/+49 |
| | | | | |||||
* | | | | Merge branch 'remove-content-commit' into 'master' | Douwe Maan | 2017-08-01 | 2 | -26/+0 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Remove unused Gitlab::Diff code See merge request !13195 | ||||
| * | | | | Remove unused (?) code | Jacob Vosmaer | 2017-07-31 | 2 | -26/+0 |
| | | | | | |||||
* | | | | | Merge branch 'patch-25' into 'master' | Rémy Coutable | 2017-08-01 | 1 | -3/+3 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Invalid variable See merge request !13214 | ||||
| * | | | | | Invalid variable | Semen Romanov | 2017-08-01 | 1 | -3/+3 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge branch 'patch-24' into 'master' | Rémy Coutable | 2017-08-01 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Fix username typo (jonh to John) See merge request !13210 | ||||
| * | | | | | Fix username typo (jonh to John) | John Landa | 2017-08-01 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | Merge branch '34492-firefox-job' into 'master' | Phil Hughes | 2017-08-01 | 2 | -9/+14 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Uses jQuery to scroll since setting document.body.scrollTop does not work in firefox Closes #34492 See merge request !13203 | ||||
| * | | | | | | Uses jQuery to scroll since setting document.body.scrollTop does not work in ↵34492-firefox-job | Filipa Lacerda | 2017-07-31 | 2 | -9/+14 |
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | firefox | ||||
* | | | | | | Merge branch '34519-extend-api-group-secret-variable' into 'master' | Kamil Trzciński | 2017-08-01 | 8 | -7/+458 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extend API: Group Secret Variable Closes #34519 See merge request !12936 | ||||
| * | | | | | | Document update34519-extend-api-group-secret-variable | Shinya Maeda | 2017-07-19 | 3 | -7/+133 |
| | | | | | | | |||||
| * | | | | | | Add changelog | Shinya Maeda | 2017-07-19 | 1 | -0/+4 |
| | | | | | | | |||||
| * | | | | | | Ini | Shinya Maeda | 2017-07-19 | 4 | -0/+321 |
| | | | | | | | |||||
* | | | | | | | Merge branch 'docs-add-blog-articles' into 'master' | Job van der Voort | 2017-08-01 | 1 | -24/+90 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs add blog articles Closes #34633 See merge request !13209 | ||||
| * | | | | | | | Docs add blog articles | Marcia Ramos | 2017-08-01 | 1 | -24/+90 |
|/ / / / / / / | |||||
* | | | | | | | Merge branch 'inline-script-cleanup-globals-and-easy' into 'master' | Phil Hughes | 2017-08-01 | 28 | -262/+290 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Inline script cleanup globals and easy See merge request !12969 | ||||
| * | | | | | | | Inline script cleanup globals and easy | Tim Zallmann | 2017-08-01 | 28 | -262/+290 |
|/ / / / / / / | |||||
* | | | | | | | Merge branch ↵ | Kamil Trzciński | 2017-08-01 | 1 | -0/+1 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'fix/sm/forbid-to-use-add_column_with_default-on-ci_pipelines-by-rubocop' into 'master' Forbid to use add_column_with_default on ci_pipelines by rubocop See merge request !13215 | ||||
| * | | | | | | | inifix/sm/forbid-to-use-add_column_with_default-on-ci_pipelines-by-rubocop | Shinya Maeda | 2017-08-01 | 1 | -0/+1 |
| | |_|_|/ / / | |/| | | | | | |||||
* | | | | | | | Merge branch '35697-allow-logged-in-user-to-read-user-list' into 'master' | Rémy Coutable | 2017-08-01 | 3 | -18/+28 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow logged in users to read user list under public restriction Closes #35697 See merge request !13201 | ||||
| * | | | | | | | Allow logged in users to read user list under public restriction | Lin Jen-Shin (godfat) | 2017-08-01 | 3 | -18/+28 |
|/ / / / / / / | |||||
* | | | | | | | Merge branch 'mk-fix-ldap-ca-file-docs' into 'master' | Douwe Maan | 2017-08-01 | 2 | -4/+4 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix LDAP documentation and example config Closes #35770 See merge request !13196 | ||||
| * | | | | | | Fix LDAP documentation and example configmk-fix-ldap-ca-file-docs | Michael Kozono | 2017-07-31 | 2 | -4/+4 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | Update CHANGELOG.md for 9.4.3 | Jose Ivan Vargas | 2017-07-31 | 8 | -29/+10 |
| |_|_|/ / |/| | | | | | | | | | [ci skip] |