summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Remove unrelated changes from changes_tab_vue_refactoringwinh-cleanup-changes_tab_vue_refactoringWinnie Hellmann2018-05-16315-2544/+11960
|\
| * Resolved conflicts with masterWinnie Hellmann2018-05-161-7/+0
| * Merge gitlab.com/master into changes_tab_vue_refactoringWinnie Hellmann2018-05-16321-5664/+11639
| |\
| | * Merge branch 'move-disussion-actions-to-the-right' into 'master'Tim Zallmann2018-05-164-30/+21
| | |\
| | | * 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-012-20/+15
| | * | Project Sidebar: Split CI/CD into CI/CD and OperationsLukas Eipert2018-05-162-48/+69
| | * | Remove docker pull prefix from registry clipboard featureLars Greiss2018-05-162-11/+2
| * | | fix lintsSimon Knox2018-05-164-12/+10
| * | | 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-163-2/+12
| * | | 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-162-3/+7
| * | | Handle view type from query string.Fatih Acet2018-05-161-1/+6
| * | | Fix eslintWinnie Hellmann2018-05-165-6/+7
| * | | Move some properties to MergeRequestUserEntityFelipe Artur2018-05-164-25/+25
| * | | Fix spec/features/issues/create_issue_for_discussions_in_merge_request_spec.rbWinnie Hellmann2018-05-161-1/+1
| * | | Fix spec/features/projects/merge_requests/user_views_diffs_spec.rbWinnie Hellmann2018-05-162-2/+2
| * | | Fix spec/features/projects/merge_requests/user_comments_on_diff_spec.rbWinnie Hellmann2018-05-169-10/+13
| * | | Add todo for simonFelipe Artur2018-05-161-0/+2
| * | | Fix 500 on diff_file_entity and some feature specsFelipe Artur2018-05-161-2/+2
| * | | Revert "Revert "Code improvements and add some properties to user entity""Felipe Artur2018-05-164-11/+46
| * | | Fix some tests in app/assets/javascripts/diffs/components/parallel_diff_view.vueWinnie Hellmann2018-05-161-0/+1
| * | | correct compare versions contentSimon Knox2018-05-162-26/+23
| * | | partial check for show/hide compare versions sectionSimon Knox2018-05-161-0/+1
* | | | fix lintsSimon Knox2018-05-164-13/+9
* | | | Revert "Merge branch 'master' into changes_tab_vue_refactoring"Simon Knox2018-05-1671-914/+445
* | | | Merge branch 'master' into changes_tab_vue_refactoringSimon Knox2018-05-1671-445/+914
|\ \ \ \ | | |/ / | |/| |
| * | | Fix bug with long strings in issue boardsPaul Slaughter2018-05-152-3/+17
| * | | Merge branch '45584-add-nip-io-domain-suggestion-in-auto-devops' into 'master'Grzegorz Bizon2018-05-153-1/+13
| |\ \ \
| | * | | Display help text below auto devops domain with nip.io domain name (#45561)45584-add-nip-io-domain-suggestion-in-auto-devopsDylan Griffith2018-05-153-1/+13
| * | | | Merge branch '46361-does-not-log-failed-sign-in-attempts-when-the-database-is...Rémy Coutable2018-05-151-0/+3
| |\ \ \ \
| | * | | | Does not log failed sign-in attempts when database is in read-only modeDouglas Barbosa Alexandre2018-05-141-0/+3
| * | | | | Merge branch 'blackst0ne-remove-spinach' into 'master'Rémy Coutable2018-05-151-13/+0
| |\ \ \ \ \
| | * | | | | Clean up `notes_controller`blackst0ne2018-05-141-13/+0
| * | | | | | Merge branch 'update-wiki-modal' into 'master'Tim Zallmann2018-05-153-2/+114
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| | * | | | | Changed copy of delete button to sentence caseConstance Okoghenun2018-05-071-2/+2
| | * | | | | Made delete wiki modal component props required and changed the component ini...Constance Okoghenun2018-05-072-21/+26
| | * | | | | Removed quotes around page titleConstance Okoghenun2018-05-071-2/+2
| | * | | | | Fixed linit errorsConstance Okoghenun2018-05-072-22/+22
| | * | | | | Added modal message and removed traget branch and commit message fields for d...Constance Okoghenun2018-05-071-40/+10
| | * | | | | Added commit form fields for delete page confirmationConstance Okoghenun2018-05-033-12/+56
| | * | | | | Changed delete wiki prompt from 'confirm' for 'gl_modal'Constance Okoghenun2018-05-033-2/+95
| | | |_|_|/ | | |/| | |
| * | | | | Enable update_(build|pipeline) for maintainersJan Provaznik2018-05-154-3/+22
| | |_|/ / | |/| | |
| * | | | Merge branch 'refactor/move-squash-before-merge-vue-component' into 'master'Phil Hughes2018-05-142-4/+4
| |\ \ \ \