| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Improve MR feature specs and reduce duplicationrc/improve-mr-feature-specs | Rémy Coutable | 2018-01-18 | 60 | -1748/+1087 |
| | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | Merge branch 'sh-fix-mermaid-start-on-load-typo' into 'master' | Jacob Schatz | 2018-01-18 | 2 | -1/+10 |
| |\ | | | | | | | | | | | | | Fix Mermaid drawings not loading on some browsers Closes #42052 See merge request gitlab-org/gitlab-ce!16537 | ||||
| | * | Fix Mermaid drawings not loading on some browserssh-fix-mermaid-start-on-load-typo | Stan Hu | 2018-01-17 | 2 | -1/+10 |
| | | | | | | | | | | | | | | | | | | | | | As mentioned in https://github.com/knsv/mermaid/issues/291#issuecomment-287673609, the parameter should be `startOnLoad` instead of `loadOnStart`. In addition, `mermaid.initialize()` expects to see `startOnLoad` in the `mermaid` hash: https://github.com/knsv/mermaid/blob/6cd5ffe637d88525b93417bf3954e9c0e5a4deb8/src/mermaid.js#L118 Closes #42052 | ||||
| * | | Merge branch 'feature/merge-request-system-hook' into 'master' | Douwe Maan | 2018-01-18 | 29 | -61/+419 |
| |\ \ | | | | | | | | | | | | | System hooks for Merge Requests See merge request gitlab-org/gitlab-ce!14387 | ||||
| | * | | accept_confirm requires js driver | Alexis Reigel | 2018-01-17 | 1 | -1/+1 |
| | | | | |||||
| | * | | reference triggers.values for permitted parameters | Alexis Reigel | 2018-01-17 | 4 | -17/+33 |
| | | | | |||||
| | * | | add missing permitted param | Alexis Reigel | 2018-01-17 | 2 | -0/+2 |
| | | | | |||||
| | * | | use class reader instead of dynamic constant | Alexis Reigel | 2018-01-17 | 6 | -10/+12 |
| | | | | |||||
| | * | | no need for a named parameter | Alexis Reigel | 2018-01-17 | 3 | -3/+3 |
| | | | | |||||
| | * | | accepts `.all` as a hook scope as well | Alexis Reigel | 2018-01-17 | 2 | -2/+11 |
| | | | | |||||
| | * | | use safer .hooks_for instead of .public_send | Alexis Reigel | 2018-01-17 | 4 | -2/+26 |
| | | | | | | | | | | | | | | | | with .public_send we can't make sure that the scope on the model actually exists. | ||||
| | * | | extract concern for hook triggers | Alexis Reigel | 2018-01-17 | 4 | -23/+67 |
| | | | | |||||
| | * | | doc for system hook merge_requests_events | Alexis Reigel | 2018-01-17 | 1 | -0/+129 |
| | | | | |||||
| | * | | doc for system hook merge_requests_events api | Alexis Reigel | 2018-01-04 | 1 | -0/+2 |
| | | | | |||||
| | * | | api support for merge_requests_events system hook | Alexis Reigel | 2018-01-04 | 4 | -3/+23 |
| | | | | |||||
| | * | | add changelog | Alexis Reigel | 2018-01-04 | 1 | -0/+5 |
| | | | | |||||
| | * | | we only need a test for the happy path | Alexis Reigel | 2018-01-04 | 1 | -8/+0 |
| | | | | | | | | | | | | | | | | the failure case is already covered by the test in spec/services/test_hooks/system_service_spec.rb | ||||
| | * | | use sentence case for "Merge request events" | Alexis Reigel | 2018-01-04 | 4 | -4/+4 |
| | | | | |||||
| | * | | merge requests on system hook admin page | Alexis Reigel | 2018-01-04 | 2 | -8/+70 |
| | | | | |||||
| | * | | test hook for system merge request hook | Alexis Reigel | 2018-01-04 | 2 | -0/+27 |
| | | | | |||||
| | * | | invoke SystemHooksService instead of direct model | Alexis Reigel | 2018-01-04 | 2 | -10/+4 |
| | | | | |||||
| | * | | execute system hooks from project | Alexis Reigel | 2018-01-04 | 4 | -2/+32 |
| | | | | |||||
| * | | | Merge branch '42129-fix-project-snippet-user-agent-detail' into 'master' | Sean McGivern | 2018-01-18 | 3 | -8/+16 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Fix the user-agent detail API endpoint for project snippets Closes #42129 See merge request gitlab-org/gitlab-ce!16521 | ||||
| | * | | | Fix the user-agent detail API endpoint for project snippets | Nick Thomas | 2018-01-17 | 3 | -8/+16 |
| | | | | | |||||
| * | | | | Merge branch 'winh-stop-jobs-modal' into 'master' | Phil Hughes | 2018-01-18 | 8 | -10/+160 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add modal for stopping jobs in admin area Closes #41305 See merge request gitlab-org/gitlab-ce!16283 | ||||
| | * | | | | Add modal for stopping jobs in admin area | Winnie Hellmann | 2018-01-18 | 8 | -10/+160 |
| | | | | | | |||||
| * | | | | | Merge branch 'jramsay-improved-convdev-image-docs' into 'master' | Sean McGivern | 2018-01-18 | 1 | -0/+0 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Update ConvDev Index docs w better screenshot See merge request gitlab-org/gitlab-ce!16533 | ||||
| | * | | | | | Update ConvDev Index docs w better screenshotjramsay-improved-convdev-image-docs | James Ramsay | 2018-01-17 | 1 | -0/+0 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'add-opensuse-to-supported-list' into 'master' | Marin Jankovski | 2018-01-18 | 1 | -0/+1 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add openSUSE to the supported Unix OS list See merge request gitlab-org/gitlab-ce!16544 | ||||
| | * | | | | | | Add openSUSE to the supported Unix OS list | Balasankar C | 2018-01-18 | 1 | -0/+1 |
| |/ / / / / / | |||||
| * | | | | | | Merge branch 'patch-28' into 'master' | Achilleas Pipinellis | 2018-01-18 | 1 | -1/+0 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove a broken link in the docs See merge request gitlab-org/gitlab-ce!16532 | ||||
| | * | | | | | | Remove the second link, blog URL has changed hands and I can't find any new ↵ | Connor Shea | 2018-01-17 | 1 | -1/+0 |
| | |/ / / / / | | | | | | | | | | | | | | | | | | | blog by this guy. | ||||
| * | | | | | | Merge branch 'rc/port-from-ee-4119' into 'master' | Sean McGivern | 2018-01-18 | 1 | -26/+39 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the :migration metadata, and don't use factories in FixWronglyRenamedRoutes spec See merge request gitlab-org/gitlab-ce!16535 | ||||
| | * | | | | | | Add the :migration metadata, and don't use factories in ↵rc/port-from-ee-4119 | Rémy Coutable | 2018-01-17 | 1 | -26/+39 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | FixWronglyRenamedRoutes spec Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | | | | | | | Merge branch '34252-trailing-plus' into 'master' | Phil Hughes | 2018-01-18 | 4 | -1/+44 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Cannot filter issues by labels ending with a plus char in board view" Closes #41715 and #34252 See merge request gitlab-org/gitlab-ce!16490 | ||||
| | * | | | | | | | sentence-case changelog entry34252-trailing-plus | Simon Knox | 2018-01-18 | 1 | -2/+2 |
| | | | | | | | | | |||||
| | * | | | | | | | feature spec for #34252 | Simon Knox | 2018-01-18 | 1 | -0/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/issues/34252 | ||||
| | * | | | | | | | consistent code style | Simon Knox | 2018-01-18 | 1 | -2/+1 |
| | | | | | | | | | |||||
| | * | | | | | | | add test for search terms with + | Simon Knox | 2018-01-18 | 1 | -2/+9 |
| | | | | | | | | | |||||
| | * | | | | | | | fix board filter parsing - don't replace encoded + symbols with spaces | Simon Knox | 2018-01-16 | 3 | -1/+27 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge branch '41743-unused-selectors-for-cycle-analytics' into 'master' | Annabel Dunstone Gray | 2018-01-18 | 2 | -41/+5 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove unused CSS selectors for Cycle Analytics (between 1st iteration and 2nd iteration) Closes #41743 See merge request gitlab-org/gitlab-ce!16270 | ||||
| | * | | | | | | | | Remove unused CSS selectors for Cycle Analytics | Takuya Noguchi | 2018-01-07 | 2 | -41/+5 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Merge branch 'file-content-large-screen-padding' into 'master' | Annabel Dunstone Gray | 2018-01-17 | 2 | -0/+9 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Double padding for file-content wiki class on larger screens See merge request gitlab-org/gitlab-ce!16534 | ||||
| | * | | | | | | | | | Double padding for file-content wiki class on larger screensfile-content-large-screen-padding | tauriedavis | 2018-01-17 | 2 | -0/+9 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Merge branch 'winh-search-page-filters' into 'master' | Clement Ho | 2018-01-17 | 4 | -0/+65 |
| |\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Filter groups and projects dropdowns of search page on backend Closes #38739 See merge request gitlab-org/gitlab-ce!16336 | ||||
| | * | | | | | | | | | Filter groups and projects dropdowns of search page on backend | Winnie Hellmann | 2018-01-17 | 4 | -0/+65 |
| |/ / / / / / / / / | |||||
| * | | | | | | | | | Merge branch 'fj-42112-fix-deploy-keys-migration-mysql' into 'master' | Stan Hu | 2018-01-17 | 3 | -28/+111 |
| |\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Fix bug in security release with deploy keys migration See merge request gitlab-org/gitlab-ce!16531 | ||||
| | * | | | | | | | | Applied fix | Francisco Javier López | 2018-01-17 | 3 | -28/+111 |
| | |/ / / / / / / | |||||
| * | | | | | | | | Merge branch 'rs-buttons-partial' into 'master' | Rémy Coutable | 2018-01-17 | 1 | -21/+14 |
| |\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Further simplify app/views/projects/buttons/_dropdown.html.haml See merge request gitlab-org/gitlab-ce!16503 | ||||
| | * | | | | | | | Further simplify app/views/projects/buttons/_dropdown.html.hamlrs-buttons-partial | Robert Speicher | 2018-01-16 | 1 | -21/+14 |
| | | |_|_|/ / / | |/| | | | | | |||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |