Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 32623 Change order of commits ahead and behind on divergence graph for ↵ce#32623-browser-tooltip-commits-branch-list | tauriedavis | 2017-05-19 | 1 | -1/+1 |
| | | | | branch list | ||||
* | Merge branch '32551-fix-system-note-comparison-and-standardize-note-setup' ↵ | Filipa Lacerda | 2017-05-19 | 1 | -2/+0 |
|\ | | | | | | | | | | | | | | | | | into 'master' Fix system note comparison and standardize note setup Closes #32551 See merge request !11532 | ||||
| * | Fix system note comparison and standardize note setup | Eric Eastwood | 2017-05-19 | 1 | -2/+0 |
| | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/32551 | ||||
* | | Merge branch 'patch-21' into 'master' | Clement Ho | 2017-05-19 | 1 | -1/+1 |
|\ \ | | | | | | | | | | | | | | | | | | | Fix wording in settings / CI/CD Pipelines Closes #32555 See merge request !11516 | ||||
| * | | Update edit.html.hamlpatch-21 | Fabio Busatto | 2017-05-18 | 1 | -1/+1 |
| |/ | | | | | Closes #32555 | ||||
* | | Remove readme project_view option | Douwe Maan | 2017-05-19 | 1 | -21/+0 |
|/ | |||||
* | Merge branch 'dm-gemfile-viewer' | Rémy Coutable | 2017-05-18 | 3 | -2/+13 |
|\ | | | | | | | See merge request !11346. | ||||
| * | Add auxiliary blob viewers to dependency files | Douwe Maan | 2017-05-17 | 3 | -2/+13 |
| | | |||||
* | | Merge branch 'change-url-in-specific-runners-registration-steps' into 'master' | Kamil Trzciński | 2017-05-18 | 1 | -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-steps | Tomasz Maczukin | 2017-05-15 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'dm-empty-tree-readme' into 'master' | Robert Speicher | 2017-05-18 | 1 | -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-readme | Douwe Maan | 2017-05-17 | 1 | -7/+8 |
| | | | | |||||
* | | | | Merge branch '32465-center' into 'master' | Annabel Dunstone Gray | 2017-05-18 | 1 | -2/+2 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | recenter profile page nav links Closes #32465 See merge request !11464 | ||||
| * | | | | recenter profile page nav links32465-center | Simon Knox | 2017-05-18 | 1 | -2/+2 |
| | | | | | |||||
* | | | | | Merge branch '32449-fix-note-comparison-trailing-newline-edge-case' into ↵ | Phil Hughes | 2017-05-18 | 2 | -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-case | Eric Eastwood | 2017-05-18 | 2 | -2/+2 |
| | |_|_|/ | |/| | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/32449 | ||||
* | | | | | Disable reference prefixes in notes for Snippets | Sam Rose | 2017-05-18 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge branch 'patch-20' into 'master' | Achilleas Pipinellis | 2017-05-18 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Update link to documentation See merge request !11468 | ||||
| * | | | | | Update link to documentation | Max Raab | 2017-05-18 | 1 | -1/+1 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge branch 'dm-readme-viewer' into 'master' | Rémy Coutable | 2017-05-18 | 3 | -4/+10 |
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | Add auxiliary blob viewer for README See merge request !11366 | ||||
| * | | | | Add auxiliary viewer for READMEdm-readme-viewer | Douwe Maan | 2017-05-17 | 3 | -4/+10 |
| |/ / / | |||||
* | | | | Merge branch 'dm-tree-last-commit' into 'master' | Dmitriy Zaporozhets | 2017-05-17 | 2 | -3/+2 |
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | Show last commit for current tree on tree page See merge request !11442 | ||||
| * | | | Show last commit for current tree on tree page | Douwe Maan | 2017-05-17 | 2 | -3/+2 |
| | | | | |||||
* | | | | Add auxiliary blob viewer for CHANGELOG | Douwe Maan | 2017-05-17 | 1 | -0/+4 |
|/ / / | |||||
* | | | Merge branch 'dm-consistent-commit-widget' into 'master' | Dmitriy Zaporozhets | 2017-05-17 | 4 | -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-widget | Douwe Maan | 2017-05-17 | 4 | -28/+10 |
| | | | | |||||
* | | | | Fix unassigned checkmark | Clement Ho | 2017-05-17 | 1 | -2/+1 |
| | | | | |||||
* | | | | Convert fa-history to svg; tweak alignment | Annabel Dunstone Gray | 2017-05-17 | 2 | -1/+2 |
| | | | | |||||
* | | | | Merge branch 'dm-contributing-viewer' into 'master' | Rémy Coutable | 2017-05-17 | 1 | -0/+9 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Add auxiliary blob viewer for CONTRIBUTING See merge request !11364 | ||||
| * | | | | Add auxiliary viewer for CONTRIBUTINGdm-contributing-viewer | Douwe Maan | 2017-05-16 | 1 | -0/+9 |
| |/ / / | |||||
* | | | | Merge branch 'acet-mr-widget-nothing-to-commit-state' into 'master' | Filipa Lacerda | 2017-05-17 | 1 | -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 Acet | 2017-05-16 | 1 | -0/+1 |
| | | | | | |||||
* | | | | | Merge branch 'update-admin-health-page' into 'master' | Filipa Lacerda | 2017-05-17 | 1 | -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-page | Jose Ivan Vargas | 2017-05-16 | 1 | -17/+2 |
| | | | | | |||||
| * | | | | update admin health page with the application readiness endpoints | Jose Ivan Vargas | 2017-05-16 | 1 | -0/+6 |
| | | | | | |||||
* | | | | | Merge branch '32172-improve-responsive-styling-of-pipeline-schedules-form' ↵ | Tim Zallmann | 2017-05-17 | 1 | -7/+7 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Polish UI on pipeline schedules form Closes #32172 See merge request !11332 | ||||
| * | | | | | Clean up UI and styles. | Bryce Johnson | 2017-05-15 | 1 | -7/+7 |
| | | | | | | |||||
* | | | | | | Merge branch 'ability_to_cancel_attaching_file' into 'master' | Douwe Maan | 2017-05-16 | 1 | -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 UI | blackst0ne | 2017-05-16 | 1 | -3/+24 |
| | | | | | | |||||
* | | | | | | Merge branch 'dm-blob-viewer-concerns' into 'master' | Robert Speicher | 2017-05-16 | 1 | -3/+3 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move some blob viewer stuff around without changing behavior See merge request !11358 | ||||
| * | | | | | | Specify explicitly whether a blob viewer should be loaded asynchronously | Douwe Maan | 2017-05-13 | 1 | -3/+3 |
| | | | | | | | |||||
* | | | | | | | Merge branch 'use-common-vue-for-merge-request-widget' into 'master' | Fatih Acet | 2017-05-16 | 1 | -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-widget | Mike Greiling | 2017-05-15 | 1 | -1/+2 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Make `gfm_auto_complete` into a module and fix up tech debt | Eric Eastwood | 2017-05-16 | 2 | -3/+2 |
| |_|_|/ / / |/| | | | | | |||||
* | | | | | | Merge branch 'disable-css-and-jquery-animations-for-capybara' into 'master' | Douwe Maan | 2017-05-16 | 1 | -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-capybara | Luke "Jared" Bennett | 2017-05-15 | 1 | -0/+2 |
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | these in _head when testing | ||||
* | | | | | | Merge branch 'cherry-pick-0663458c' into 'master' | Douwe Maan | 2017-05-16 | 3 | -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-0663458c | Douwe Maan | 2017-05-16 | 3 | -5/+5 |
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename `build_events` to `job_events` Closes #31620 See merge request !11287 | ||||
* | | | | | | Merge branch '31386-profile-fix-externallinks' into 'master' | Douwe Maan | 2017-05-16 | 1 | -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 parsing | Tim Zallmann | 2017-05-08 | 1 | -2/+2 |
| | | | | | | |