Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Run the schedule worker once an hour by defaultzj-increase-accuracy-ps | Z.J. van de Weg | 2017-05-18 | 1 | -1/+1 |
| | | | | [ci skip] | ||||
* | Merge branch 'fix-issue-assignee-trigger' into 'master' | Stan Hu | 2017-05-17 | 1 | -1/+1 |
|\ | | | | | | | | | | | | | Check if OLD is set when migrating issue assignees Closes #32439 See merge request !11461 | ||||
| * | Check if OLD is set when migrating issue assignees | Yorick Peterse | 2017-05-17 | 1 | -1/+1 |
| | | | | | | | | | | | | The procedure for migrating issue assignees is invoked on both an INSERT and UPDATE. This means it will fail for INSERTs because OLD is set to NULL in this case. | ||||
* | | Merge branch 'issue_32428' into 'master' | Robert Speicher | 2017-05-17 | 1 | -3/+0 |
|\ \ | | | | | | | | | | | | | | | | | | | Remove 'no changes' entries from changelog Closes #32428 See merge request !11462 | ||||
| * | | Remove 'no changes' entries from changelogissue_32428 | Felipe Artur | 2017-05-17 | 1 | -3/+0 |
| | | | |||||
* | | | Merge branch 'zj-fix-migration' into 'master' | Robert Speicher | 2017-05-17 | 1 | -0/+7 |
|\ \ \ | | | | | | | | | | | | | | | | | Fix data migration from trigger schedules See merge request !11460 | ||||
| * | | | Fix data migration from trigger schedules | Z.J. van de Weg | 2017-05-17 | 1 | -0/+7 |
| | | | | |||||
* | | | | Merge branch 'rs-fix-ee-compat' into 'master' | Douwe Maan | 2017-05-17 | 1 | -1/+1 |
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | Fix invalid object reference in ee_compat_check script See merge request !11455 | ||||
| * | | | Fix invalid object reference in ee_compat_check scriptrs-fix-ee-compat | Robert Speicher | 2017-05-17 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge branch 'docs-update-ha' into 'master' | Stan Hu | 2017-05-17 | 3 | -10/+49 |
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | Docs update ha See merge request !11446 | ||||
| * | | | Replace EFS section in AWS guide | Drew Blessing | 2017-05-17 | 2 | -13/+17 |
| | | | | |||||
| * | | | Add warning about AWS EFS and performance | Drew Blessing | 2017-05-17 | 1 | -0/+17 |
| | | | | |||||
| * | | | Consolidate opening text from about.gitlab.com and add active/passive note | Drew Blessing | 2017-05-17 | 1 | -0/+18 |
| | | | | | | | | | | | | | | | | | | | | Add opening text that was previously on https://about.gitlab.com/high-availability and add a note that active/passive is compatible but not supported. | ||||
* | | | | Merge branch 'dm-tree-last-commit' into 'master' | Dmitriy Zaporozhets | 2017-05-17 | 7 | -6/+25 |
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | Show last commit for current tree on tree page See merge request !11442 | ||||
| * | | | Add spec for last commit info when browsing repository filesdm-tree-last-commit | Dmitriy Zaporozhets | 2017-05-17 | 1 | -0/+12 |
| | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | | Show last commit for current tree on tree page | Douwe Maan | 2017-05-17 | 6 | -6/+13 |
| | | | | |||||
* | | | | Merge branch '31483-ordered-task-list' into 'master' | Clement Ho | 2017-05-17 | 2 | -2/+6 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Ordered Task List Items Closes #31483 See merge request !11445 | ||||
| * | | | | Fix Ordered Task List Items | Jared Deckard | 2017-05-17 | 2 | -2/+6 |
|/ / / / | |||||
* | | | | Merge branch 'update-fe_guide-testing' into 'master' | Clement Ho | 2017-05-17 | 2 | -9/+30 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Update fe_guide testing.md See merge request !11385 | ||||
| * | | | | Update fe_guide testing.md | Luke "Jared" Bennett | 2017-05-17 | 2 | -9/+30 |
|/ / / / | |||||
* | | | | Merge branch 'dm-changelog-viewer' into 'master' | Rémy Coutable | 2017-05-17 | 6 | -2/+52 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Add auxiliary blob viewer for CHANGELOG See merge request !11365 | ||||
| * | | | | Add auxiliary blob viewer for CHANGELOG | Douwe Maan | 2017-05-17 | 6 | -2/+52 |
|/ / / / | |||||
* | | | | Merge branch '32085-improve-ee-compat-check' into 'master' | Robert Speicher | 2017-05-17 | 1 | -3/+5 |
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | Fetch CE/branch before running `git apply --check --3way patch` Closes #32085 See merge request !11412 | ||||
| * | | | Fetch CE/branch before running `git apply --check --3way patch`32085-improve-ee-compat-check | Rémy Coutable | 2017-05-16 | 1 | -3/+5 |
| | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
* | | | | Merge branch 'dm-consistent-commit-widget' into 'master' | Dmitriy Zaporozhets | 2017-05-17 | 8 | -83/+13 |
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | 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 | 8 | -83/+13 |
| | | | | |||||
* | | | | Merge branch 'get_rid_of_pluck' into 'master' | Yorick Peterse | 2017-05-17 | 2 | -3/+11 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 2 | -3/+11 |
| | |_|/ | |/| | | |||||
* | | | | Merge branch 'fix-unassigned-checkmark' into 'master' | Phil Hughes | 2017-05-17 | 4 | -7/+34 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix unassigned checkmark Closes #31843 See merge request !11391 | ||||
| * | | | | Fix unassigned checkmark | Clement Ho | 2017-05-17 | 4 | -7/+34 |
|/ / / / | |||||
* | | | | Merge branch 'add-changelog-ipython' into 'master' | Phil Hughes | 2017-05-17 | 1 | -0/+1 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add missing changelog for iPython notebook rendering feature Closes #32361 See merge request !11419 | ||||
| * | | | | Add missing changelog for iPython notebook rendering feature | Clement Ho | 2017-05-17 | 1 | -0/+1 |
|/ / / / | |||||
* | | | | 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 | ||||
* | | | | Merge branch 'fix-alignment-recent-search' into 'master' | Clement Ho | 2017-05-17 | 4 | -15/+15 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Convert fa-history to svg; tweak alignment See merge request !11397 | ||||
| * | | | | 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 | 4 | -2/+49 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | 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 | 4 | -2/+49 |
| | | | | | |||||
* | | | | | 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 | 8 | -13/+94 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 2 | -2/+1 |
| | | | | | | |||||
| * | | | | | MRWidget: Fix specs and address WIP comments. | Fatih Acet | 2017-05-16 | 3 | -9/+20 |
| | | | | | | |||||
| * | | | | | Add new_blob_path to MR json schema | Oswaldo Ferreira | 2017-05-16 | 1 | -0/+1 |
| | | | | | | |||||
| * | | | | | Returns new_blob_path only when user can push_code to project | Oswaldo Ferreira | 2017-05-16 | 2 | -3/+22 |
| | | | | | | |||||
| * | | | | | 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 | 2 | -14/+10 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 |
| | | | | | | |