summaryrefslogtreecommitdiff
path: root/app/views
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'change-url-in-specific-runners-registration-steps' into 'master'Kamil Trzciński2017-05-181-1/+1
|\ | | | | | | | | Remove references to '/ci' path while describing Runner's registration See merge request !10518
| * Remove references to '/ci' path while describing Runner's registrationchange-url-in-specific-runners-registration-stepsTomasz Maczukin2017-05-151-1/+1
| |
* | Merge branch 'dm-empty-tree-readme' into 'master'Robert Speicher2017-05-181-7/+8
|\ \ | | | | | | | | | | | | | | | | | | Don't blow up when a tree readme is empty and consequently has no rich viewer Closes #32396 See merge request !11459
| * | Don't blow up when a tree readme is empty and consequently has no rich viewerdm-empty-tree-readmeDouwe Maan2017-05-171-7/+8
| | |
* | | Merge branch '32465-center' into 'master'Annabel Dunstone Gray2017-05-181-2/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | recenter profile page nav links Closes #32465 See merge request !11464
| * | | recenter profile page nav links32465-centerSimon Knox2017-05-181-2/+2
| | | |
* | | | Merge branch '32449-fix-note-comparison-trailing-newline-edge-case' into ↵Phil Hughes2017-05-182-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Fix note flicker with note you can't edit and trailing new line edge case Closes #32449 See merge request !11472
| * | | | Fix missing .original-note-content and trailing new line edge case32449-fix-note-comparison-trailing-newline-edge-caseEric Eastwood2017-05-182-2/+2
| | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/32449
* | | | | Disable reference prefixes in notes for SnippetsSam Rose2017-05-181-1/+1
| | | | |
* | | | | Merge branch 'patch-20' into 'master'Achilleas Pipinellis2017-05-181-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Update link to documentation See merge request !11468
| * | | | | Update link to documentationMax Raab2017-05-181-1/+1
| | |_|/ / | |/| | |
* | | | | Merge branch 'dm-readme-viewer' into 'master'Rémy Coutable2017-05-183-4/+10
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | Add auxiliary blob viewer for README See merge request !11366
| * | | | Add auxiliary viewer for READMEdm-readme-viewerDouwe Maan2017-05-173-4/+10
| |/ / /
* | | | Merge branch 'dm-tree-last-commit' into 'master'Dmitriy Zaporozhets2017-05-172-3/+2
|\ \ \ \ | |/ / / |/| | | | | | | | | | | Show last commit for current tree on tree page See merge request !11442
| * | | Show last commit for current tree on tree pageDouwe Maan2017-05-172-3/+2
| | | |
* | | | Add auxiliary blob viewer for CHANGELOGDouwe Maan2017-05-171-0/+4
|/ / /
* | | Merge branch 'dm-consistent-commit-widget' into 'master' Dmitriy Zaporozhets2017-05-174-28/+10
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Use same last commit widget on project homepage and tree view Closes #32245 See merge request !11424
| * | | Use same last commit widget on project homepage and tree viewdm-consistent-commit-widgetDouwe Maan2017-05-174-28/+10
| | | |
* | | | Fix unassigned checkmarkClement Ho2017-05-171-2/+1
| | | |
* | | | Convert fa-history to svg; tweak alignmentAnnabel Dunstone Gray2017-05-172-1/+2
| | | |
* | | | Merge branch 'dm-contributing-viewer' into 'master' Rémy Coutable2017-05-171-0/+9
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Add auxiliary blob viewer for CONTRIBUTING See merge request !11364
| * | | | Add auxiliary viewer for CONTRIBUTINGdm-contributing-viewerDouwe Maan2017-05-161-0/+9
| |/ / /
* | | | Merge branch 'acet-mr-widget-nothing-to-commit-state' into 'master' Filipa Lacerda2017-05-171-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MRWidget: Implement new design for nothing to commit state. Closes #29320 See merge request !11266
| * | | | MRWidget: Implement new design for nothing to commit state.Fatih Acet2017-05-161-0/+1
| | | | |
* | | | | Merge branch 'update-admin-health-page' into 'master' Filipa Lacerda2017-05-171-14/+5
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | Update admin health page with the application readiness endpoints Closes #31359 See merge request !11388
| * | | | Removed old endpoints from the monitoring viewupdate-admin-health-pageJose Ivan Vargas2017-05-161-17/+2
| | | | |
| * | | | update admin health page with the application readiness endpointsJose Ivan Vargas2017-05-161-0/+6
| | | | |
* | | | | Merge branch '32172-improve-responsive-styling-of-pipeline-schedules-form' ↵Tim Zallmann2017-05-171-7/+7
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Polish UI on pipeline schedules form Closes #32172 See merge request !11332
| * | | | | Clean up UI and styles.Bryce Johnson2017-05-151-7/+7
| | | | | |
* | | | | | Merge branch 'ability_to_cancel_attaching_file' into 'master' Douwe Maan2017-05-161-3/+24
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add an ability to cancel attaching file and redesign attaching files UI Closes #15611, #24270, and #28905 See merge request !9431
| * | | | | Add an ability to cancel attaching file and redesign attaching files UIblackst0ne2017-05-161-3/+24
| | | | | |
* | | | | | Merge branch 'dm-blob-viewer-concerns' into 'master' Robert Speicher2017-05-161-3/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move some blob viewer stuff around without changing behavior See merge request !11358
| * | | | | | Specify explicitly whether a blob viewer should be loaded asynchronouslyDouwe Maan2017-05-131-3/+3
| | | | | | |
* | | | | | | Merge branch 'use-common-vue-for-merge-request-widget' into 'master' Fatih Acet2017-05-161-1/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure vue_merge_request_widget utilizes common_vue bundle See merge request !11269
| * | | | | | | ensure merge-request-widget utilizes common_vue bundleuse-common-vue-for-merge-request-widgetMike Greiling2017-05-151-1/+2
| | |_|/ / / / | |/| | | | |
* | | | | | | Make `gfm_auto_complete` into a module and fix up tech debtEric Eastwood2017-05-162-3/+2
| |_|_|/ / / |/| | | | |
* | | | | | Merge branch 'disable-css-and-jquery-animations-for-capybara' into 'master' Douwe Maan2017-05-161-0/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | disable animations for tests Closes #32194 See merge request !11324
| * | | | | | Add test.js and test.css to disable animations during testing and include ↵disable-css-and-jquery-animations-for-capybaraLuke "Jared" Bennett2017-05-151-0/+2
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | these in _head when testing
* | | | | | Merge branch 'cherry-pick-0663458c' into 'master' Douwe Maan2017-05-163-5/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename `build_events` to `job_events`, take 2. Closes #31620 See merge request !11403
| * | | | | | Merge branch 'bvl-rename-build-events-to-job-events' into 'master' cherry-pick-0663458cDouwe Maan2017-05-163-5/+5
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename `build_events` to `job_events` Closes #31620 See merge request !11287
* | | | | | Merge branch '31386-profile-fix-externallinks' into 'master' Douwe Maan2017-05-161-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Make Twitter Link on Profile page useable by fixing wrong target URL's" Closes #31386 See merge request !10931
| * | | | | | Created Application Helpers based on suggestion for easier parsingTim Zallmann2017-05-081-2/+2
| | | | | | |
| * | | | | | Doing the commit again with the correct E-Mail address setupTim Zallmann2017-05-081-2/+2
| | | | | | |
| * | | | | | Replacing Base URL's if they have been entered into the profileTim Zallmann2017-05-081-2/+2
| | | | | | |
* | | | | | | Rename Personal Audit LogTim Zallmann2017-05-163-5/+4
| | | | | | |
* | | | | | | Resolve ""Username or email" label on login form does not point to its ↵Tim Zallmann2017-05-162-3/+3
| |/ / / / / |/| | | | | | | | | | | | | | | | | corresponding input field"
* | | | | | Replace broken autocomplete field for new tags with dropdownWinnie Hellmann2017-05-161-9/+10
| | | | | |
* | | | | | Merge branch '31902-namespace-recent-searches-to-project' into 'master' Annabel Dunstone Gray2017-05-151-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Scope recent searches to project Closes #31902 See merge request !11142
| * | | | | | Scope recent searches to projectEric Eastwood2017-05-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/31902
* | | | | | | Revert "Merge branch 'bvl-rename-build-events-to-job-events' into 'master'"Douwe Maan2017-05-153-5/+5
| | | | | | | | | | | | | | | | | | | | | This reverts merge request !11287