summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* fix tests - update selector for copy buttonpsimyn-diff-discussion-vueSimon Knox2018-01-161-13/+12
* Merge branch 'acet-mr-notes-index' of gitlab.com:gitlab-org/gitlab-ce into ps...Simon Knox2018-01-1610-54/+107
|\
| * MRNotesRefactor: Prevent duplicate rendering of new notes on Discussions tab ...Fatih Acet2018-01-122-0/+9
| * MRNotesRefactor: Fix ESLint, Karma and Haml linters.Fatih Acet2018-01-114-8/+12
| * MRNotesRefactor: Fix wrapper el in cookieless versionFatih Acet2018-01-111-1/+2
| * MRNotesRefactor: Fix adding emojis from non Vue discussions.Fatih Acet2018-01-091-2/+7
| * MRNotesRefactor: Fixes to make vue and non vue MR notes play nice together.Fatih Acet2018-01-096-51/+85
* | fix testSimon Knox2018-01-122-2/+1
* | fix tooltip on copy buttonSimon Knox2018-01-111-6/+14
* | fix lintsSimon Knox2018-01-102-4/+3
* | fix icon testSimon Knox2018-01-102-3/+3
* | fix fixtures for specSimon Knox2018-01-094-141/+31
* | revert template change that broke testsSimon Knox2018-01-092-21/+19
* | fix static analysis taskSimon Knox2018-01-092-7/+7
* | Merge branch 'acet-mr-notes-index' into psimyn-diff-discussion-vueSimon Knox2018-01-086-43/+28
|\ \ | |/
| * skeleton notes for discussions instead of notesSimon Knox2018-01-081-1/+1
| * dedupe notes template data with helperSimon Knox2018-01-085-40/+27
| * fix hover style of usernamesSimon Knox2018-01-081-3/+1
* | fix some specsSimon Knox2018-01-083-7/+7
* | Merge branch 'acet-mr-notes-index' into psimyn-diff-discussion-vueSimon Knox2018-01-086-8/+43
|\ \ | |/
| * skeleton loading for notesSimon Knox2018-01-066-8/+43
* | add blob icon to endpointSimon Knox2018-01-061-3/+5
* | generate mock data for diffdiscussionsSimon Knox2018-01-062-8/+32
* | fix errorSimon Knox2018-01-051-4/+6
* | generate discussions.json fixtureSimon Knox2018-01-042-3/+18
* | clearer name for camelcase functionSimon Knox2018-01-043-6/+29
* | prefer ternarySimon Knox2018-01-041-8/+2
* | remove unnecessary computed propSimon Knox2018-01-041-4/+1
* | Merge branch 'acet-mr-notes-index' of gitlab.com:gitlab-org/gitlab-ce into ps...Simon Knox2018-01-04233-1134/+3331
|\ \ | |/
| * MRNotesRefactor: Fix haml linter and karma spec.Fatih Acet2018-01-032-2/+2
| * Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into acet-mr-notes-i...Fatih Acet2018-01-03231-1132/+3329
| |\
| | * Merge branch '37843-ci-trace-ansi-colours-256-bold-have-no-css-due-wrongly-an...Kamil Trzciński2018-01-033-1/+10
| | |\
| | | * fix issue #37843Danny2018-01-033-1/+10
| | |/
| | * Merge branch 'update-autodevops-template' into 'master'Kamil Trzciński2018-01-032-0/+60
| | |\
| | | * Set Auto Browser Performance Testing to 10.4update-autodevops-templateJoshua Lambert2017-12-211-1/+1
| | | * Add docs for AutoDevOpsJoshua Lambert2017-12-211-0/+15
| | | * Merge branch 'update-autodevops-template' of gitlab.com:gitlab-org/gitlab-ce ...Joshua Lambert2017-12-210-0/+0
| | | |\
| | | | * Remove SAST:Image for now.Joshua Lambert2017-12-201-25/+0
| | | | * Update Auto DevOps templateJoshua Lambert2017-12-201-0/+70
| | | * | Remove SAST:Image for now.Joshua Lambert2017-12-211-25/+0
| | | * | Update Auto DevOps templateJoshua Lambert2017-12-211-0/+70
| | * | | Merge branch 'docs-update-doc-for-prometheus-and-kubernetes-integrations' int...Kamil Trzciński 🎆 Back on Jan 2!2018-01-033-2/+6
| | |\ \ \
| | | * | | Updates documentation for prometheus and kubernetes integrationdocs-update-doc-for-prometheus-and-kubernetes-integrationsMayra Cabrera2017-12-283-2/+6
| | * | | | Merge branch 'da-handle-hashed-storage-repos-using-repo-import-task' into 'ma...Robert Speicher2018-01-0318-61/+259
| | |\ \ \ \
| | | * | | | Use if instead of unless on Projects::HashedStorage::MigrateRepositoryServiceda-handle-hashed-storage-repos-using-repo-import-taskDouglas Barbosa Alexandre2018-01-031-3/+3
| | | * | | | Refactoring Gitlab::BareRepositoryImport::RepositoryDouglas Barbosa Alexandre2018-01-031-6/+6
| | | * | | | Remove unused variable from bare repository importer specDouglas Barbosa Alexandre2018-01-031-1/+0
| | | * | | | Refactoring spec for Gitlab::BareRepositoryImport::RepositoryDouglas Barbosa Alexandre2018-01-031-6/+11
| | | * | | | Fix Projects::TransferService#write_repository_config methodDouglas Barbosa Alexandre2018-01-031-1/+1
| | | * | | | Fix Repository#processable? to allow .git repos in the root folderDouglas Barbosa Alexandre2018-01-032-3/+10