Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | fix tests - update selector for copy buttonpsimyn-diff-discussion-vue | Simon Knox | 2018-01-16 | 1 | -13/+12 |
| | |||||
* | Merge branch 'acet-mr-notes-index' of gitlab.com:gitlab-org/gitlab-ce into ↵ | Simon Knox | 2018-01-16 | 10 | -54/+107 |
|\ | | | | | | | psimyn-diff-discussion-vue | ||||
| * | MRNotesRefactor: Prevent duplicate rendering of new notes on Discussions tab ↵ | Fatih Acet | 2018-01-12 | 2 | -0/+9 |
| | | | | | | | | in realtime. | ||||
| * | MRNotesRefactor: Fix ESLint, Karma and Haml linters. | Fatih Acet | 2018-01-11 | 4 | -8/+12 |
| | | |||||
| * | MRNotesRefactor: Fix wrapper el in cookieless version | Fatih Acet | 2018-01-11 | 1 | -1/+2 |
| | | |||||
| * | MRNotesRefactor: Fix adding emojis from non Vue discussions. | Fatih Acet | 2018-01-09 | 1 | -2/+7 |
| | | |||||
| * | MRNotesRefactor: Fixes to make vue and non vue MR notes play nice together. | Fatih Acet | 2018-01-09 | 6 | -51/+85 |
| | | |||||
* | | fix test | Simon Knox | 2018-01-12 | 2 | -2/+1 |
| | | |||||
* | | fix tooltip on copy button | Simon Knox | 2018-01-11 | 1 | -6/+14 |
| | | |||||
* | | fix lints | Simon Knox | 2018-01-10 | 2 | -4/+3 |
| | | |||||
* | | fix icon test | Simon Knox | 2018-01-10 | 2 | -3/+3 |
| | | |||||
* | | fix fixtures for spec | Simon Knox | 2018-01-09 | 4 | -141/+31 |
| | | |||||
* | | revert template change that broke tests | Simon Knox | 2018-01-09 | 2 | -21/+19 |
| | | |||||
* | | fix static analysis task | Simon Knox | 2018-01-09 | 2 | -7/+7 |
| | | |||||
* | | Merge branch 'acet-mr-notes-index' into psimyn-diff-discussion-vue | Simon Knox | 2018-01-08 | 6 | -43/+28 |
|\ \ | |/ | |||||
| * | skeleton notes for discussions instead of notes | Simon Knox | 2018-01-08 | 1 | -1/+1 |
| | | |||||
| * | dedupe notes template data with helper | Simon Knox | 2018-01-08 | 5 | -40/+27 |
| | | |||||
| * | fix hover style of usernames | Simon Knox | 2018-01-08 | 1 | -3/+1 |
| | | | | | | | | there was previously an underlined space due to the linebreak | ||||
* | | fix some specs | Simon Knox | 2018-01-08 | 3 | -7/+7 |
| | | |||||
* | | Merge branch 'acet-mr-notes-index' into psimyn-diff-discussion-vue | Simon Knox | 2018-01-08 | 6 | -8/+43 |
|\ \ | |/ | |||||
| * | skeleton loading for notes | Simon Knox | 2018-01-06 | 6 | -8/+43 |
| | | |||||
* | | add blob icon to endpoint | Simon Knox | 2018-01-06 | 1 | -3/+5 |
| | | |||||
* | | generate mock data for diffdiscussions | Simon Knox | 2018-01-06 | 2 | -8/+32 |
| | | |||||
* | | fix error | Simon Knox | 2018-01-05 | 1 | -4/+6 |
| | | |||||
* | | generate discussions.json fixture | Simon Knox | 2018-01-04 | 2 | -3/+18 |
| | | |||||
* | | clearer name for camelcase function | Simon Knox | 2018-01-04 | 3 | -6/+29 |
| | | |||||
* | | prefer ternary | Simon Knox | 2018-01-04 | 1 | -8/+2 |
| | | |||||
* | | remove unnecessary computed prop | Simon Knox | 2018-01-04 | 1 | -4/+1 |
| | | |||||
* | | Merge branch 'acet-mr-notes-index' of gitlab.com:gitlab-org/gitlab-ce into ↵ | Simon Knox | 2018-01-04 | 233 | -1134/+3331 |
|\ \ | |/ | | | | | psimyn-diff-discussion-vue | ||||
| * | MRNotesRefactor: Fix haml linter and karma spec. | Fatih Acet | 2018-01-03 | 2 | -2/+2 |
| | | |||||
| * | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵ | Fatih Acet | 2018-01-03 | 231 | -1132/+3329 |
| |\ | | | | | | | | | | acet-mr-notes-index | ||||
| | * | Merge branch ↵ | Kamil Trzciński | 2018-01-03 | 3 | -1/+10 |
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '37843-ci-trace-ansi-colours-256-bold-have-no-css-due-wrongly-ansi2html-light-color-variant-conversion-feature' into 'master' fix issue #37843 Closes #37843 See merge request gitlab-org/gitlab-ce!15902 | ||||
| | | * | fix issue #37843 | Danny | 2018-01-03 | 3 | -1/+10 |
| | |/ | |||||
| | * | Merge branch 'update-autodevops-template' into 'master' | Kamil Trzciński | 2018-01-03 | 2 | -0/+60 |
| | |\ | | | | | | | | | | | | | | | | | Update Auto DevOps template See merge request gitlab-org/gitlab-ce!16042 | ||||
| | | * | Set Auto Browser Performance Testing to 10.4update-autodevops-template | Joshua Lambert | 2017-12-21 | 1 | -1/+1 |
| | | | | |||||
| | | * | Add docs for AutoDevOps | Joshua Lambert | 2017-12-21 | 1 | -0/+15 |
| | | | | |||||
| | | * | Merge branch 'update-autodevops-template' of gitlab.com:gitlab-org/gitlab-ce ↵ | Joshua Lambert | 2017-12-21 | 0 | -0/+0 |
| | | |\ | | | | | | | | | | | | | | | | into update-autodevops-template | ||||
| | | | * | Remove SAST:Image for now. | Joshua Lambert | 2017-12-20 | 1 | -25/+0 |
| | | | | | |||||
| | | | * | Update Auto DevOps template | Joshua Lambert | 2017-12-20 | 1 | -0/+70 |
| | | | | | |||||
| | | * | | Remove SAST:Image for now. | Joshua Lambert | 2017-12-21 | 1 | -25/+0 |
| | | | | | |||||
| | | * | | Update Auto DevOps template | Joshua Lambert | 2017-12-21 | 1 | -0/+70 |
| | | | | | |||||
| | * | | | Merge branch 'docs-update-doc-for-prometheus-and-kubernetes-integrations' ↵ | Kamil Trzciński 🎆 Back on Jan 2! | 2018-01-03 | 3 | -2/+6 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Updates documentation for Prometheus and Kubernetes integration Closes #41432 See merge request gitlab-org/gitlab-ce!16156 | ||||
| | | * | | | Updates documentation for prometheus and kubernetes integrationdocs-update-doc-for-prometheus-and-kubernetes-integrations | Mayra Cabrera | 2017-12-28 | 3 | -2/+6 |
| | | | | | | |||||
| | * | | | | Merge branch 'da-handle-hashed-storage-repos-using-repo-import-task' into ↵ | Robert Speicher | 2018-01-03 | 18 | -61/+259 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Handle GitLab hashed storage repositories using the repo import task Closes #39870 See merge request gitlab-org/gitlab-ce!16027 | ||||
| | | * | | | | Use if instead of unless on Projects::HashedStorage::MigrateRepositoryServiceda-handle-hashed-storage-repos-using-repo-import-task | Douglas Barbosa Alexandre | 2018-01-03 | 1 | -3/+3 |
| | | | | | | | |||||
| | | * | | | | Refactoring Gitlab::BareRepositoryImport::Repository | Douglas Barbosa Alexandre | 2018-01-03 | 1 | -6/+6 |
| | | | | | | | |||||
| | | * | | | | Remove unused variable from bare repository importer spec | Douglas Barbosa Alexandre | 2018-01-03 | 1 | -1/+0 |
| | | | | | | | |||||
| | | * | | | | Refactoring spec for Gitlab::BareRepositoryImport::Repository | Douglas Barbosa Alexandre | 2018-01-03 | 1 | -6/+11 |
| | | | | | | | |||||
| | | * | | | | Fix Projects::TransferService#write_repository_config method | Douglas Barbosa Alexandre | 2018-01-03 | 1 | -1/+1 |
| | | | | | | | |||||
| | | * | | | | Fix Repository#processable? to allow .git repos in the root folder | Douglas Barbosa Alexandre | 2018-01-03 | 2 | -3/+10 |
| | | | | | | |