summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Change fetchNotes to fetchDiscussions in pollSuccessCallBackwinh-changes_tab_vue_refactoring-note-renameWinnie Hellmann2018-06-051-1/+1
* Replace notes with discussions in discussionTabCounter getterWinnie Hellmann2018-06-051-2/+2
* Pass note/discussion as parameter to initAutoSaveWinnie Hellmann2018-06-053-7/+7
* Wrap hasTruncatedDiffLines in computed propertyWinnie Hellmann2018-06-051-5/+5
* Fix condition for fetching diff linesWinnie Hellmann2018-06-051-2/+2
* Handle missing truncatedDiffLinesWinnie Hellmann2018-06-051-2/+5
* Fix lintingWinnie Hellmann2018-06-051-4/+9
* Rename remaining occurrences of note to discussionWinnie Hellmann2018-06-056-25/+29
* Rename note to discussion in noteable_discussion.vueWinnie Hellmann2018-06-056-73/+64
* Rename notes to discussions in diff_discussions.vueWinnie Hellmann2018-06-054-10/+10
* Rename SET_INITIAL_NOTES to SET_INITIAL_DISCUSSIONSWinnie Hellmann2018-06-055-14/+15
* Temporarily disable ee_compat_checkWinnie Hellmann2018-06-051-1/+1
* Rename fetchNotes action to fetchDiscussionsWinnie Hellmann2018-06-054-12/+10
* Replace notes with discussions in notes store stateWinnie Hellmann2018-06-0511-79/+79
* ESLint fixes.Fatih Acet2018-06-053-6/+3
* Update discussions tab counter.Fatih Acet2018-06-053-7/+26
* Fix diff line numbers on Discussions tab.Fatih Acet2018-06-051-2/+2
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into changes_tab_vue...Fatih Acet2018-06-05758-21438/+9225
|\
| * Merge branch 'update-doorkeeper' into 'master'Rémy Coutable2018-06-041-1/+1
| |\
| | * Update Doorkeeper OpenID for Kubernetes supportMaxime Guyot2018-05-311-1/+1
| * | Merge branch '46845-update-email_spec-to-2-2-0' into 'master'Robert Speicher2018-06-046-39/+40
| |\ \
| | * | Replace have_html_espaced_body_text after 517598baTakuya Noguchi2018-06-032-21/+21
| | * | Revert "Add a new have_html_escaped_body_text that match an HTML-escaped text"Takuya Noguchi2018-06-032-14/+9
| | * | Update email_spec to 2.2.0Takuya Noguchi2018-06-033-4/+10
| * | | Merge branch 'github-import-docs' into 'master'Achilleas Pipinellis2018-06-0413-119/+348
| |\ \ \
| | * | | Port repository mirroring from EEgithub-import-docsAchilleas Pipinellis2018-06-0411-5/+245
| | * | | Copyedit GitHub importer docsAchilleas Pipinellis2018-06-042-64/+103
| | * | | Update GitHub import instructions (github.md)Mike Lewis2018-06-041-111/+61
| * | | | Merge branch '6022-ee-extract-slash_commands-in-ce' into 'master'Nick Thomas2018-06-041-8/+10
| |\ \ \ \
| | * | | | Backport EE SlashCommand RefactorMark Chao2018-06-041-8/+10
| |/ / / /
| * | | | Merge branch 'rails5-fix-46281' into 'master'Yorick Peterse2018-06-042-2/+12
| |\ \ \ \
| | * | | | Rails5 Fix arel fromJasper Maes2018-06-022-2/+12
| * | | | | Merge branch 'workhorse-4-3-0' into 'master'Douwe Maan2018-06-041-1/+1
| |\ \ \ \ \
| | * | | | | Update to GitLab Workhorse v4.3.0Nick Thomas2018-06-011-1/+1
| * | | | | | Merge branch 'fj-34526-enabling-wiki-search-by-title' into 'master'Douwe Maan2018-06-0414-107/+159
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| | * | | | | Add ability to search wiki titlesFrancisco Javier López2018-06-0414-107/+159
| |/ / / / /
| * | | | | Merge branch 'sh-fix-source-project-nplus-one' into 'master'47213-epics-page-styling-is-brokenSean McGivern2018-06-042-1/+6
| |\ \ \ \ \
| | * | | | | Fix N+1 with source projects in merge requests APIsh-fix-source-project-nplus-oneStan Hu2018-06-032-1/+6
| | | |_|/ / | | |/| | |
| * | | | | Merge branch 'bvl-bump-gitlab-shell-7-1-3' into 'master'Douwe Maan2018-06-042-1/+6
| |\ \ \ \ \
| | * | | | | Bump gitlab-shell to 7.1.3bvl-bump-gitlab-shell-7-1-3Bob Van Landuyt2018-06-042-1/+6
| * | | | | | Merge branch 'ide-highlighter-type-fox' into 'master'Filipa Lacerda2018-06-041-1/+1
| |\ \ \ \ \ \
| | * | | | | | Fixed typo in commit message help popoveride-highlighter-type-foxPhil Hughes2018-06-011-1/+1
| * | | | | | | Merge branch 'sh-fix-issue-43981' into 'master'Douwe Maan2018-06-042-22/+21
| |\ \ \ \ \ \ \
| | * | | | | | | Fix intermittent failing spec in spec/support/helpers/cycle_analytics_helpers.rbsh-fix-issue-43981Stan Hu2018-06-022-22/+21
| | | |_|/ / / / | | |/| | | | |
| * | | | | | | Merge branch 'sh-fix-secrets-not-working' into 'master'Douwe Maan2018-06-045-12/+24
| |\ \ \ \ \ \ \
| | * | | | | | | Fix missing key change in 20171124104327_migrate_kubernetes_service_to_new_cl...sh-fix-secrets-not-workingStan Hu2018-06-021-1/+1
| | * | | | | | | Fix attr_encryption key settingsStan Hu2018-06-024-11/+23
| | |/ / / / / /
| * | | | | | | Merge branch 'sh-add-missing-squash-param-api-docs' into 'master'Achilleas Pipinellis2018-06-041-0/+1
| |\ \ \ \ \ \ \
| | * | | | | | | Fix missing squash parameter in doc/api/merge_requests.mdsh-add-missing-squash-param-api-docsStan Hu2018-05-301-0/+1
| * | | | | | | | Merge branch 'per-project-pipeline-iid' into 'master'Grzegorz Bizon2018-06-0423-28/+165
| |\ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | |