Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix linking to unresolved/expanded diff note32424-fix-linking-to-unresolved-expanded-diff-note | Eric Eastwood | 2017-05-17 | 2 | -8/+21 |
| | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/32424 Bug introduced in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/11327 | ||||
* | Fix Ordered Task List Items | Jared Deckard | 2017-05-17 | 1 | -2/+2 |
| | |||||
* | Add auxiliary blob viewer for CHANGELOG | Douwe Maan | 2017-05-17 | 5 | -2/+25 |
| | |||||
* | Merge branch 'dm-consistent-commit-widget' into 'master' | Dmitriy Zaporozhets | 2017-05-17 | 6 | -59/+11 |
|\ | | | | | | | | | | | | | 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 | 6 | -59/+11 |
| | | |||||
* | | Merge branch 'get_rid_of_pluck' into 'master' | Yorick Peterse | 2017-05-17 | 1 | -3/+7 |
|\ \ | | | | | | | | | | | | | | | | | | | Get rid of pluck in app/services/members/authorized_destroy_service.rb Closes #32372 See merge request !11433 | ||||
| * | | Get rid of pluck in app/services/members/authorized_destroy_service.rbget_rid_of_pluck | Valery Sizov | 2017-05-17 | 1 | -3/+7 |
| | | | |||||
* | | | Fix unassigned checkmark | Clement Ho | 2017-05-17 | 3 | -7/+23 |
| | | | |||||
* | | | Merge branch 'sidebar-spacing-fixes' into 'master' | Annabel Dunstone Gray | 2017-05-17 | 1 | -3/+6 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Fixed spacing issues in issue sidebar Closes #32357 See merge request !11430 | ||||
| * | | | Fixed spacing issues in issue sidebarsidebar-spacing-fixes | Phil Hughes | 2017-05-17 | 1 | -3/+6 |
| |/ / | | | | | | | | | | | | | | | | When we removed the nicescroll plugin from issues it causes some spacing issues that were added to make nicescroll play nice. This fixes that by fixing some of the padding that was causing the scroll area to be incorrect & the collapsed sidebar to have overflow issues Closes #32357 | ||||
* | | | Convert fa-history to svg; tweak alignment | Annabel Dunstone Gray | 2017-05-17 | 4 | -15/+15 |
| | | | |||||
* | | | Merge branch 'counters_cache_invalidation' into 'master' | Rémy Coutable | 2017-05-17 | 2 | -2/+17 |
|\ \ \ | | | | | | | | | | | | | | | | | Invalidate cache for issue and MR counters separately See merge request !11394 | ||||
| * | | | Invalidate cache for issue and MR counters more granularlycounters_cache_invalidation | Valery Sizov | 2017-05-15 | 2 | -2/+17 |
| | | | | |||||
* | | | | Merge branch 'dm-contributing-viewer' into 'master' | Rémy Coutable | 2017-05-17 | 4 | -1/+37 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Add auxiliary blob viewer for CONTRIBUTING See merge request !11364 | ||||
| * | | | | Add auxiliary viewer for CONTRIBUTINGdm-contributing-viewer | Douwe Maan | 2017-05-16 | 4 | -1/+37 |
| | |_|/ | |/| | | |||||
* | | | | Merge branch 'acet-mr-widget-nothing-to-commit-state' into 'master' | Filipa Lacerda | 2017-05-17 | 5 | -11/+62 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MRWidget: Implement new design for nothing to commit state. Closes #29320 See merge request !11266 | ||||
| * | | | | Address MR comments.acet-mr-widget-nothing-to-commit-state | Fatih Acet | 2017-05-16 | 1 | -1/+0 |
| | | | | | |||||
| * | | | | MRWidget: Fix specs and address WIP comments. | Fatih Acet | 2017-05-16 | 2 | -7/+6 |
| | | | | | |||||
| * | | | | Returns new_blob_path only when user can push_code to project | Oswaldo Ferreira | 2017-05-16 | 1 | -3/+5 |
| | | | | | |||||
| * | | | | MRWidget: Implement new design for nothing to commit state. | Fatih Acet | 2017-05-16 | 5 | -11/+62 |
| | | | | | |||||
* | | | | | Merge branch 'dm-scroll-to-blob-user-content' into 'master' | Douwe Maan | 2017-05-17 | 1 | -0/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Scroll to anchor when blob content is loaded See merge request !11427 | ||||
| * | | | | | Scroll to anchor when blob content is loadeddm-scroll-to-blob-user-content | Douwe Maan | 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 | 5 | -80/+107 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Polish UI on pipeline schedules form Closes #32172 See merge request !11332 | ||||
| * | | | | | Clean up UI and styles. | Bryce Johnson | 2017-05-15 | 5 | -80/+107 |
| | | | | | | |||||
* | | | | | | Fix deletion of issue assignees for MySQLsh-fix-delete-assignees-mysql | Stan Hu | 2017-05-16 | 1 | -4/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MySQL builds on EE were failing due to MySQL not liking the complex subqueries. Simplify the deletion to use a subquery that works. | ||||
* | | | | | | Merge branch 'ability_to_cancel_attaching_file' into 'master' | Douwe Maan | 2017-05-16 | 4 | -99/+228 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 4 | -99/+228 |
| | | | | | | | |||||
* | | | | | | | Merge branch 'fix_assignee_yourick_approach' into 'master' | Douwe Maan | 2017-05-16 | 1 | -2/+2 |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | Improve migration for Multipple issue assignee feature See merge request !11417 | ||||
| * | | | | | | Improve migration for Multipple issue assignee feature | Valery Sizov | 2017-05-16 | 1 | -2/+2 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge branch 'dm-blob-viewer-concerns' into 'master' | Robert Speicher | 2017-05-16 | 13 | -66/+74 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move some blob viewer stuff around without changing behavior See merge request !11358 | ||||
| * | | | | | | Rename BlobViewer max_size to overridable_max_size and absolute_max_size to ↵dm-blob-viewer-concerns | Douwe Maan | 2017-05-15 | 6 | -18/+26 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | max_size | ||||
| * | | | | | | Specify explicitly whether a blob viewer should be loaded asynchronously | Douwe Maan | 2017-05-13 | 8 | -46/+46 |
| | | | | | | | |||||
| * | | | | | | Allow blob viewer to support multiple filetypes | Douwe Maan | 2017-05-13 | 4 | -7/+7 |
| | | | | | | | |||||
* | | | | | | | 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 |
| | |_|_|/ / / | |/| | | | | | |||||
* | | | | | | | Merge branch '32326-scrollable-tabs-overflow' into 'master' | Annabel Dunstone Gray | 2017-05-16 | 2 | -2/+6 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | prevent dropdowns from being cut-off by scrollable tab container Closes #32328 and #32326 See merge request !11399 | ||||
| * | | | | | | | prevent dropdowns from being cut-off by scrollable tab container32326-scrollable-tabs-overflow | Simon Knox | 2017-05-16 | 2 | -2/+6 |
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | rerender scrollable-tab area after Resolve Discussions button is rendered | ||||
* | | | | | | | Make `gfm_auto_complete` into a module and fix up tech debt | Eric Eastwood | 2017-05-16 | 8 | -241/+258 |
|/ / / / / / | |||||
* | | | | | | Merge branch 'disable-css-and-jquery-animations-for-capybara' into 'master' | Douwe Maan | 2017-05-16 | 3 | -0/+20 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 3 | -0/+20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | these in _head when testing | ||||
* | | | | | | | Removes nicescroll from issuable sidebar | Phil Hughes | 2017-05-16 | 3 | -13/+9 |
| | | | | | | | |||||
* | | | | | | | Only renders empty state for pipelines table if no pipelines are received ↵ | Filipa Lacerda | 2017-05-16 | 2 | -16/+36 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | when request is made | ||||
* | | | | | | | Merge branch 'environments-button-open-same-tab' into 'master' | Annabel Dunstone Gray | 2017-05-16 | 1 | -1/+0 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed the target=_blank from the monitoring component Closes #32243 See merge request !11386 | ||||
| * | | | | | | | Removed the target=_blank from the monitoring componentenvironments-button-open-same-tab | Jose Ivan Vargas | 2017-05-15 | 1 | -1/+0 |
| | | | | | | | | |||||
* | | | | | | | | Merge branch 'cherry-pick-0663458c' into 'master' | Douwe Maan | 2017-05-16 | 7 | -11/+11 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 7 | -11/+11 |
| | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 2 | -2/+20 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Make Twitter Link on Profile page useable by fixing wrong target URL's" Closes #31386 See merge request !10931 |