| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' into sh-support-bitbucket-server-import | Stan Hu | 2018-07-17 | 318 | -1097/+2346 |
| |\ | |||||
| | * | Merge branch 'fix-web-ide-header-button-background' into 'master' | Filipa Lacerda | 2018-07-17 | 1 | -0/+1 |
| | |\ | | | | | | | | | | | | | Fix ide-tree-header button background See merge request gitlab-org/gitlab-ce!20662 | ||||
| | | * | Fix ide-tree-header button background | Paul Slaughter | 2018-07-17 | 1 | -0/+1 |
| | | | | |||||
| | * | | Merge branch 'extract-ee-specific-banzai-filters' into 'master' | Robert Speicher | 2018-07-17 | 3 | -10/+28 |
| | |\ \ | | | | | | | | | | | | | | | | | Extract EE-specific lines from Banzai pipelines See merge request gitlab-org/gitlab-ce!20636 | ||||
| | | * | | Extract EE-specific lines from Banzai pipelinesextract-ee-specific-banzai-filters | Sean McGivern | 2018-07-13 | 3 | -10/+28 |
| | | | | | |||||
| | * | | | Merge branch 'frozen-string-enable-apps-services-inner' into 'master' | Rémy Coutable | 2018-07-17 | 101 | -3/+208 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | Enable frozen string in app/services/**/*.rb See merge request gitlab-org/gitlab-ce!20656 | ||||
| | | * | | | Enable frozen string in apps/services/**/*.rbrepo-forks/gitlab-ce-frozen-string-enable-apps-services-inner | gfyoung | 2018-07-16 | 101 | -3/+208 |
| | | | |/ | | |/| | | | | | | | | | | | | | | | | | For directories application_settings --> labels. Partially addresses #47424. | ||||
| | * | | | Merge branch 'update-specific-runners-help-url' into 'master' | Clement Ho | 2018-07-17 | 3 | -11/+14 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | Update specific runners help URL See merge request gitlab-org/gitlab-ce!20213 | ||||
| | | * | | | Update specific runners help URL | George Tsiolis | 2018-07-17 | 3 | -11/+14 |
| | |/ / / | |||||
| | * | | | Merge branch 'satishperala/gitlab-ce-20720_webhooks_full_image_url' into ↵ | Douwe Maan | 2018-07-17 | 16 | -41/+258 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Include full image URL in webhooks for uploaded images Closes #20720 See merge request gitlab-org/gitlab-ce!18109 | ||||
| | | * | | | Keep #absolute_image_urls as a private instance method | Sean McGivern | 2018-07-17 | 2 | -9/+13 |
| | | | | | | |||||
| | | * | | | Simplify WikiPage#hook_attrs spec | Sean McGivern | 2018-07-17 | 1 | -6/+4 |
| | | | | | | |||||
| | | * | | | Clarify web hook image rewriting doc example | Sean McGivern | 2018-07-17 | 1 | -2/+2 |
| | | | | | | |||||
| | | * | | | Don't include a double slash when rewriting the URL | Sean McGivern | 2018-07-06 | 1 | -1/+4 |
| | | | | | | |||||
| | | * | | | Merge branch 'master' into satishperala/gitlab-ce-20720_webhooks_full_image_url | Sean McGivern | 2018-07-06 | 1929 | -33482/+64436 |
| | | |\ \ \ | |||||
| | | * | | | | Add documentation and specs for webhook URL rewriting | Sean McGivern | 2018-07-06 | 7 | -32/+139 |
| | | | | | | | |||||
| | | * | | | | Add base class for hook builders, and use it for notes and wikis | Sean McGivern | 2018-06-20 | 10 | -45/+95 |
| | | | | | | | |||||
| | | * | | | | Fix hook data specs | Sean McGivern | 2018-06-20 | 4 | -11/+12 |
| | | | | | | | |||||
| | | * | | | | Fix MR hook builder | Sean McGivern | 2018-06-20 | 1 | -1/+1 |
| | | | | | | | |||||
| | | * | | | | Removing the empty line at the class body beginning | Satish Perala | 2018-06-20 | 1 | -1/+0 |
| | | | | | | | |||||
| | | * | | | | Checking for the presense of markdown text | Satish Perala | 2018-06-20 | 1 | -1/+5 |
| | | | | | | | |||||
| | | * | | | | Passing absolute image urls in the markdown content in the webhooks | Satish Perala | 2018-06-20 | 9 | -2/+53 |
| | | | | | | | |||||
| | * | | | | | Merge branch '48964-mr-reduce-the-memory-footprint-of-the-component-tree' ↵ | Fatih Acet | 2018-07-17 | 18 | -145/+170 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "MR: Reduce the memory footprint of the component tree" Closes #48964 See merge request gitlab-org/gitlab-ce!20448 | ||||
| | | * | | | | | Resolve "MR: Reduce the memory footprint of the component tree" | Tim Zallmann | 2018-07-17 | 18 | -145/+170 |
| | |/ / / / / | |||||
| | * | | | | | Merge branch 'add-merge-request-header-branch-details-right-margin' into ↵ | Annabel Gray | 2018-07-17 | 2 | -0/+6 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Add merge request header branch actions left margin Closes #49238 See merge request gitlab-org/gitlab-ce!20643 | ||||
| | | * | | | | | Add merge request header branch actions left margin | George Tsiolis | 2018-07-17 | 2 | -0/+6 |
| | | | | | | | | |||||
| | * | | | | | | Merge branch ↵ | Annabel Gray | 2018-07-17 | 2 | -1/+3 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '49165-pipeline-graph-in-new-merge-request-widget-is-flickering' into 'master' Resolve "Pipeline graph in new merge request widget is flickering" Closes #49165 See merge request gitlab-org/gitlab-ce!20660 | ||||
| | | * | | | | | | Fix MR widget ci status icon tooltip flicker49165-pipeline-graph-in-new-merge-request-widget-is-flickering | Clement Ho | 2018-07-16 | 2 | -1/+3 |
| | | | |_|_|/ / | | |/| | | | | |||||
| | * | | | | | | Merge branch 'person-tags-better' into 'master' | Annabel Gray | 2018-07-17 | 2 | -7/+3 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Highlighting of person mentions now better visible on low contrast screens and… See merge request gitlab-org/gitlab-ce!20509 | ||||
| | | * | | | | | | Highlighting of person mentions now better visible on low contrast screens ↵ | Dimitrie Hoekstra | 2018-07-17 | 2 | -7/+3 |
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | and… | ||||
| | * | | | | | | Merge branch 'zj-remove-sanitize-repo-path' into 'master' | Sean McGivern | 2018-07-17 | 3 | -42/+1 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove sanitize_repo_path Closes gitaly#1235 See merge request gitlab-org/gitlab-ce!20666 | ||||
| | | * | | | | | | Remove sanitize_repo_path | Zeger-Jan van de Weg | 2018-07-17 | 3 | -42/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This method is unneeded given its been pushed to Gitaly, through https://gitlab.com/gitlab-org/gitaly/merge_requests/780 Closes https://gitlab.com/gitlab-org/gitaly/issues/1235 | ||||
| | * | | | | | | | Merge branch 'qa-48464-add-edit-delete-file-scenario' into 'master'44127-board-label-edit-drop-down-is-showing-incorrect-selected-labels-summary | Rémy Coutable | 2018-07-17 | 8 | -2/+197 |
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QA scenario to add/edit/delete a file via the Web UI See merge request gitlab-org/gitlab-ce!20265 | ||||
| | | * | | | | | | | QA scenario to add/edit/delete a file via the Web UI | Sanad Liaquat | 2018-07-17 | 8 | -2/+197 |
| | |/ / / / / / / | |||||
| | * | | | | | | | Merge branch 'docs-merge-templates-updates' into 'master' | Rémy Coutable | 2018-07-17 | 2 | -18/+18 |
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge Templates updates See merge request gitlab-org/gitlab-ce!20585 | ||||
| | | * | | | | | | | Merge Templates updates | Marcel Amirault | 2018-07-17 | 2 | -18/+18 |
| | |/ / / / / / / | |||||
| | * | | | | | | | Merge branch 'close-revert-and-cherry-pick-modal-on-escape-keypress' into ↵ | Rémy Coutable | 2018-07-17 | 5 | -5/+53 |
| | |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Close revert and cherry pick modal on escape keypress See merge request gitlab-org/gitlab-ce!20341 | ||||
| | | * | | | | | | Merge cherry-pick modal specs | George Tsiolis | 2018-07-17 | 3 | -28/+21 |
| | | | | | | | | | |||||
| | | * | | | | | | Add spec for closing cherry-pick modal on escape keypress | George Tsiolis | 2018-07-17 | 4 | -4/+34 |
| | | | | | | | | | |||||
| | | * | | | | | | Add spec for closing revert modal on escape keypress | George Tsiolis | 2018-07-17 | 1 | -0/+25 |
| | | | | | | | | | |||||
| | | * | | | | | | Close revert and cherry-pick modal on escape keypress | George Tsiolis | 2018-07-17 | 1 | -1/+1 |
| | | | |/ / / / | | |/| | | | | |||||
| | * | | | | | | Merge branch 'ab-docs-find-or-create' into 'master' | Yorick Peterse | 2018-07-17 | 1 | -0/+42 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document pattern for .find_or_create and siblings See merge request gitlab-org/gitlab-ce!20649 | ||||
| | | * | | | | | | Document pattern for .find_or_create and similar methods.ab-docs-find-or-create | Andreas Brandl | 2018-07-17 | 1 | -0/+42 |
| | | | | | | | | | |||||
| | * | | | | | | | Merge branch 'dz-improve-manifest-doc' into 'master' | Douwe Maan | 2018-07-17 | 1 | -1/+2 |
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add small improvement to Manifest import feature docs See merge request gitlab-org/gitlab-ce!20637 | ||||
| | | * | | | | | | | Add small improvement to Manifest import feature docsdz-improve-manifest-doc | Dmitriy Zaporozhets | 2018-07-16 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Add link to manifest used by AOSP 2. Mention both Android and AOSP keyword for better search Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| | * | | | | | | | | Merge branch 'move-danger-to-test-stage' into 'master' | Sean McGivern | 2018-07-17 | 3 | -30/+38 |
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move Danger to test stage Closes #49185 See merge request gitlab-org/gitlab-ce!20654 | ||||
| | | * | | | | | | | | Improve danger/specs/Dangerfile by not requiring new specs if specific ↵move-danger-to-test-stage | Rémy Coutable | 2018-07-17 | 1 | -4/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | labels are applied Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| | | * | | | | | | | | Improve danger/changelog/Dangerfile to include the title in the ↵ | Rémy Coutable | 2018-07-17 | 1 | -7/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bin/changelog command Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| | | * | | | | | | | | Move the 'danger-review' job to the test stage and allow it to fail | Rémy Coutable | 2018-07-17 | 1 | -19/+21 |
| | | | |_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| | * | | | | | | | | Merge branch 'gitaly-issue-cross-reference' into 'master' | Sean McGivern | 2018-07-17 | 1 | -0/+1 |
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add cross-link to N+1 issue See merge request gitlab-org/gitlab-ce!20663 | ||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |