summaryrefslogtreecommitdiff
path: root/app/views
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'hide-edit-comment-and-report-as-abuse-conditionally' into 'master'Douwe Maan2017-06-201-14/+19
* Merge branch 'fix-i18n-helpers' into 'master'Douwe Maan2017-06-203-4/+4
* Merge branch '33823_do_not_enable_defaults_when_metrics_folder_is_missing' in...Sean McGivern2017-06-201-0/+4
* Merge branch '33840-revert-sticky-confidential-header' into 'master'Clement Ho2017-06-202-7/+7
* Resolve "slash command" vs "quick action" conflicts9-3-stable-rc5-autocompleteEric Eastwood2017-06-192-24/+5
* Merge branch '33594-disable-autocomplete-on-snippet-comments' into 'master'Clement Ho2017-06-193-1/+27
* Merge branch '33676-update-ruby-metrics-endpoint-text' into 'master'Jacob Schatz2017-06-191-2/+3
* Merge branch '33819-authorby' into 'master'Douwe Maan2017-06-191-1/+1
* Merge branch 'bvl-missing-translations' into 'master'9-3-stable-rc3-i18nDouwe Maan2017-06-1614-50/+59
* Revert 'New file from interface on existing branch'Douwe Maan2017-06-156-38/+8
* Merge branch '29010-perf-bar' into 'master'Robert Speicher2017-06-156-0/+28
* Merge branch '33466-jobs-navigation-menu' into 'master'Phil Hughes2017-06-151-1/+1
* Merge branch '33467-remove-nicescroll' into 'master'Phil Hughes2017-06-151-16/+11
* Merge branch '25426-group-dashboard-ui' into 'master'Douwe Maan2017-06-083-12/+18
|\
| * Merge branch 'master' into 25426-group-dashboard-ui25426-group-dashboard-uiAlfredo Sumaran2017-06-0841-175/+223
| |\
| * \ Merge branch 'master' into 25426-group-dashboard-uiAlfredo Sumaran2017-06-0793-318/+712
| |\ \
| * | | Restore code to make explore groups workAlfredo Sumaran2017-06-071-1/+1
| * | | Minor visual adjustmentsAlfredo Sumaran2017-06-061-1/+7
| * | | Improve pagination when searching or filteringAlfredo Sumaran2017-06-061-1/+1
| * | | Merge remote-tracking branch 'origin/master' into 25426-group-dashboard-uiDmitriy Zaporozhets2017-06-02321-1797/+2022
| |\ \ \
| * | | | Use webpack_bundle_tag instead of deprecated page_specific_javascript_bundle_tagAlfredo Sumaran2017-05-311-2/+2
| * | | | Paginate group resultsAlfredo Sumaran2017-05-221-1/+1
| * | | | Add support to filter groups by filter optionsAlfredo Sumaran2017-05-101-6/+6
| * | | | Add support to filter by name to Group listAlfredo Sumaran2017-05-101-1/+3
| * | | | List groups with basic detailsAlfredo Sumaran2017-05-051-7/+1
| * | | | Add GroupsService to fetch data from serverAlfredo Sumaran2017-05-041-1/+1
| * | | | Set Groups Vue app for Dashboard pageAlfredo Sumaran2017-05-041-0/+1
| * | | | Add “groups” JS bundleAlfredo Sumaran2017-05-041-0/+2
| * | | | Serialize groups as json for Dashboard::GroupsControllerDmitriy Zaporozhets2017-05-042-3/+4
* | | | | Merge branch 'ce#31853-projects-shared-groups' into 'master'Annabel Dunstone Gray2017-06-085-78/+55
|\ \ \ \ \
| * | | | | fixes project_group_links spec by adding click tab eventtauriedavis2017-06-082-3/+3
| * | | | | 31853 Remove duplication for sharing projects with groups in project settingstauriedavis2017-06-085-78/+55
* | | | | | Merge branch 'dm-diff-file-diffable' into 'master'Sean McGivern2017-06-081-1/+1
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Move diffable? method from Repository to Diff::Filedm-diff-file-diffableDouwe Maan2017-06-081-1/+1
| |/ / / /
* | | | | Merge branch 'allow-reporters-to-promote-group-labels' into 'master'Douwe Maan2017-06-081-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Allow group reporters to promote labelsallow-reporters-to-promote-group-labelsSean McGivern2017-06-081-1/+1
* | | | | Merge branch 'zj-i18n-pipeline-schedules' into 'master'Douwe Maan2017-06-087-30/+30
|\ \ \ \ \
| * | | | | Allow translation of Pipeline SchedulesZ.J. van de Weg2017-06-087-30/+30
| |/ / / /
* | | | | Merge branch 'blob-load-all-data' into 'master'Grzegorz Bizon2017-06-081-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Blob#load_all_data! doesn’t need an argumentblob-load-all-dataDouwe Maan2017-06-071-1/+1
| | |_|/ | |/| |
* | | | Responsive table fixesAnnabel Dunstone Gray2017-06-084-25/+30
* | | | Merge branch '23603-add-extra-functionality-for-the-top-right-plus-button' in...Douwe Maan2017-06-082-7/+49
|\ \ \ \
| * | | | Added additional classes for easier identifaction during testsTim Zallmann2017-06-071-2/+2
| * | | | FIxes based on MRTim Zallmann2017-06-071-4/+4
| * | | | Should fix problem if you have an project without a project ID (Test in new_p...Tim Zallmann2017-06-071-1/+1
| * | | | Fixing more broken unscoped testsTim Zallmann2017-06-071-3/+3
| * | | | Check for Merge Request fixedTim Zallmann2017-06-071-1/+1
| * | | | Externalised DropdownTim Zallmann2017-06-071-26/+29
| * | | | Seperated Dropdown in new partialTim Zallmann2017-06-072-45/+46
| * | | | Enabled TooltipsTim Zallmann2017-06-071-1/+1