summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Remove unrelated changes from changes_tab_vue_refactoringwinh-cleanup-changes_tab_vue_refactoringWinnie Hellmann2018-05-16874-7237/+27732
|\
| * Resolved conflicts with masterWinnie Hellmann2018-05-165-299/+57
| * Merge gitlab.com/master into changes_tab_vue_refactoringWinnie Hellmann2018-05-161033-15247/+28103
| |\
| | * Merge branch 'move-disussion-actions-to-the-right' into 'master'Tim Zallmann2018-05-165-30/+26
| | |\
| | | * Reorder discussion timestamp information for issuesGeorge Tsiolis2018-05-043-7/+7
| | | * Move note actions to the rightGeorge Tsiolis2018-05-011-4/+0
| | | * Move discussion actions to the right for small viewportsGeorge Tsiolis2018-05-013-20/+20
| | * | Merge branch 'fix-metrics-doorkeeper' into 'master'Nick Thomas2018-05-162-4/+8
| | |\ \
| | | * | Fix GPM content types for DoorkeeperYorick Peterse2018-05-162-4/+8
| | * | | Merge branch '43673-operations-tab-mvc' into 'master'Filipa Lacerda2018-05-165-72/+229
| | |\ \ \
| | | * | | Project Sidebar: Split CI/CD into CI/CD and OperationsLukas Eipert2018-05-165-72/+229
| | |/ / /
| | * | | Merge branch 'zj-add-branch-mandatory' into 'master'Douwe Maan2018-05-163-77/+22
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Move Gitlab::Git::Repository#add_branch to mandatoryZeger-Jan van de Weg2018-05-143-77/+22
| | * | | Merge branch 'registry-ux-improvements-remove-clipboard-prefix' into 'master'Filipa Lacerda2018-05-163-11/+7
| | |\ \ \
| | | * | | Remove docker pull prefix from registry clipboard featureLars Greiss2018-05-163-11/+7
| | |/ / /
| | * | | Merge branch 'docs-fe-vuex-updates' into 'master'Filipa Lacerda2018-05-161-12/+24
| | |\ \ \
| | | * | | code example formattingDennis Tang2018-05-141-2/+2
| | | * | | more typosDennis Tang2018-05-141-4/+4
| | | * | | typo in `endpoint`Dennis Tang2018-05-141-2/+2
| | | * | | clarify that the function export should be defaultDennis Tang2018-05-141-1/+1
| | | * | | fix typoDennis Tang2018-05-111-1/+1
| | | * | | add link for babel-plugin-rewireDennis Tang2018-05-081-1/+1
| | | * | | Update vuex.mdDennis Tang2018-05-081-1/+1
| | | * | | add rewire gotcha about testing vuex actions/gettersDennis Tang2018-05-081-0/+12
| | | * | | correct doc-nav header hierarchy Dennis Tang2018-05-081-3/+3
| | * | | | Merge branch 'docs/shared-runners-timeout' into 'master'Rémy Coutable2018-05-161-1/+6
| | |\ \ \ \
| | | * | | | Document the 3h timeout for GitLab.com shared RunnersAchilleas Pipinellis2018-05-161-1/+6
| * | | | | | Restore MockAdapter in spec/javascripts/diffs/store/actions_spec.jsWinnie Hellmann2018-05-161-4/+13
| * | | | | | Fix failing test in spec/javascripts/notes/components/comment_form_spec.jsWinnie Hellmann2018-05-161-30/+60
| * | | | | | Ignore failing tests in spec/javascripts/merge_request_tabs_spec.jsWinnie Hellmann2018-05-161-378/+378
| * | | | | | Ignore failing test in spec/javascripts/diffs/store/utils_spec.jsWinnie Hellmann2018-05-161-1/+3
| * | | | | | Ignore failing test in spec/javascripts/diffs/components/parallel_diff_view_s...Winnie Hellmann2018-05-161-1/+3
| * | | | | | Ignore failing test in spec/javascripts/diffs/components/inline_diff_view_spe...Winnie Hellmann2018-05-161-1/+3
| * | | | | | Ignore failing tests in spec/javascripts/diffs/components/diff_file_spec.jsWinnie Hellmann2018-05-161-1/+3
| * | | | | | Ignore failing tests in spec/javascripts/diffs/components/diff_file_header_sp...Winnie Hellmann2018-05-161-1/+3
| * | | | | | Ignore failing test in spec/javascripts/diffs/components/changed_files_spec.jsWinnie Hellmann2018-05-161-1/+3
| * | | | | | Ignore failing tests in spec/javascripts/notes/components/diff_with_note_spec.jsWinnie Hellmann2018-05-161-1/+3
| * | | | | | fix lintsSimon Knox2018-05-164-12/+10
| * | | | | | Revert "fix package json"Simon Knox2018-05-162-0/+17
| * | | | | | fix package jsonSimon Knox2018-05-162-4/+4
| * | | | | | frontend changes for commitSimon Knox2018-05-162-10/+17
| * | | | | | fix latest version urlSimon Knox2018-05-162-7/+41
| * | | | | | correct items in comparable diffs dropdownSimon Knox2018-05-166-76/+109
| * | | | | | Add missing required props to DiffFileHeaderWinnie Hellmann2018-05-161-5/+17
| * | | | | | Fix part of spec/features/merge_request/user_posts_diff_notes_spec.rbWinnie Hellmann2018-05-164-14/+26
| * | | | | | add merge-request-version to compare dropdownSimon Knox2018-05-165-19/+24
| * | | | | | fix fork from file specSimon Knox2018-05-166-23/+31
| * | | | | | Merge branch 'jivl-fix-locked-state' into 'changes_tab_vue_refactoring'Fatih Acet2018-05-163-5/+9
| * | | | | | Handle view type from query string.Fatih Acet2018-05-161-1/+6
| * | | | | | Fix spec/controllers/projects/issues_controller_spec.rbWinnie Hellmann2018-05-161-1/+1
View Lorry Controller Status