| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' into 'docs-specific-review-examples'docs-specific-review-examples | Clement Ho | 2017-08-01 | 281 | -1615/+3371 |
| |\ | | | | | | | # Conflicts: # doc/development/code_review.md | ||||
| | * | Merge branch 'winh-derive-project-name' into 'master' | Clement Ho | 2017-08-01 | 3 | -11/+184 |
| | |\ | | | | | | | | | | | | | | | | | | | Derive project path from import URL Closes #27341 See merge request !13131 | ||||
| | | * | Derive project path from import URL | Winnie Hellmann | 2017-08-01 | 3 | -11/+184 |
| | |/ | |||||
| | * | Merge branch 'docs-update-articles-list' into 'master' | Achilleas Pipinellis | 2017-08-01 | 2 | -6/+8 |
| | |\ | | | | | | | | | | | | | | | | | | | Docs: update articles list Closes #35800 See merge request !13229 | ||||
| | | * | 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 'search-flickering' into 'master' | Filipa Lacerda | 2017-08-01 | 2 | -3/+7 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Fixes the search losing focus Closes #35515 See merge request !13221 | ||||
| | | * | | Fixes the search losing focussearch-flickering | Phil Hughes | 2017-08-01 | 2 | -3/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | This was caused by the blur & then the focus after transition end Closes #35515 | ||||
| | * | | | Merge branch '33620-remove-events-from-notification_settings' into 'master' | Douwe Maan | 2017-08-01 | 8 | -42/+29 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Remove `events` from `notification_settings`" Closes #33620 See merge request !13152 | ||||
| | | * | | | Remove events column from notification settings33620-remove-events-from-notification_settings | Sean McGivern | 2017-07-31 | 8 | -42/+29 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | This was migrated to separate columns in 9.4, and now just needs to be removed for real. | ||||
| | * | | | | Merge branch '34869-bump-rubocop-to-0-49-1-and-rubocop-rspec-to-1-15-1' into ↵ | Robert Speicher | 2017-08-01 | 5 | -314/+383 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Bump rubocop to 0.49.1 and rubocop-rspec to 1.15.1 Closes #34869 See merge request !12741 | ||||
| | | * | | | | Bump rubocop to 0.49.1 and rubocop-rspec to 1.15.1 | Takuya Noguchi | 2017-08-01 | 5 | -314/+383 |
| | | | | | | | |||||
| | * | | | | | Merge branch 'doc_code_review' into 'master' | Rémy Coutable | 2017-08-01 | 1 | -0/+3 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add code review guidelines related to Build [CI skip]. See merge request !13223 | ||||
| | | * | | | | | Add code review guidelines related to Build [CI skip]. | Marin Jankovski | 2017-08-01 | 1 | -0/+3 |
| | |/ / / / / | |||||
| | * | | | | | Merge branch 'fix/sm/35825-api-specs-and-linting-failing-on-master' into ↵ | Rémy Coutable | 2017-08-01 | 2 | -4/+1 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Fix "API specs and linting failing on master" Closes #35825 See merge request !13227 | ||||
| | | * | | | | | Add 204. Remove duplicated method.fix/sm/35825-api-specs-and-linting-failing-on-master | Shinya Maeda | 2017-08-01 | 2 | -4/+1 |
| | | | | | | | | |||||
| | * | | | | | | Merge branch 'winh-cycle-analytics-dropdown-style' into 'master' | Annabel Dunstone Gray | 2017-08-01 | 1 | -0/+22 |
| | |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | Make time span dropdown style on cycle analytics page consistent See merge request !13183 | ||||
| | | * | | | | | Make time span dropdown style on cycle analytics page consistent | Winnie Hellmann | 2017-08-01 | 1 | -0/+22 |
| | |/ / / / / | |||||
| | * | | | | | 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 | ||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |