summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Run the schedule worker once an hour by defaultzj-increase-accuracy-psZ.J. van de Weg2017-05-181-1/+1
| | | | [ci skip]
* Merge branch 'fix-issue-assignee-trigger' into 'master'Stan Hu2017-05-171-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 assigneesYorick Peterse2017-05-171-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 Speicher2017-05-171-3/+0
|\ \ | | | | | | | | | | | | | | | | | | Remove 'no changes' entries from changelog Closes #32428 See merge request !11462
| * | Remove 'no changes' entries from changelogissue_32428Felipe Artur2017-05-171-3/+0
| | |
* | | Merge branch 'zj-fix-migration' into 'master'Robert Speicher2017-05-171-0/+7
|\ \ \ | | | | | | | | | | | | | | | | Fix data migration from trigger schedules See merge request !11460
| * | | Fix data migration from trigger schedulesZ.J. van de Weg2017-05-171-0/+7
| | | |
* | | | Merge branch 'rs-fix-ee-compat' into 'master'Douwe Maan2017-05-171-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-compatRobert Speicher2017-05-171-1/+1
| | | |
* | | | Merge branch 'docs-update-ha' into 'master'Stan Hu2017-05-173-10/+49
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | Docs update ha See merge request !11446
| * | | Replace EFS section in AWS guideDrew Blessing2017-05-172-13/+17
| | | |
| * | | Add warning about AWS EFS and performanceDrew Blessing2017-05-171-0/+17
| | | |
| * | | Consolidate opening text from about.gitlab.com and add active/passive noteDrew Blessing2017-05-171-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 Zaporozhets2017-05-177-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-commitDmitriy Zaporozhets2017-05-171-0/+12
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Show last commit for current tree on tree pageDouwe Maan2017-05-176-6/+13
| | | |
* | | | Merge branch '31483-ordered-task-list' into 'master' Clement Ho2017-05-172-2/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Ordered Task List Items Closes #31483 See merge request !11445
| * | | | Fix Ordered Task List ItemsJared Deckard2017-05-172-2/+6
|/ / / /
* | | | Merge branch 'update-fe_guide-testing' into 'master' Clement Ho2017-05-172-9/+30
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Update fe_guide testing.md See merge request !11385
| * | | | Update fe_guide testing.mdLuke "Jared" Bennett2017-05-172-9/+30
|/ / / /
* | | | Merge branch 'dm-changelog-viewer' into 'master' Rémy Coutable2017-05-176-2/+52
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Add auxiliary blob viewer for CHANGELOG See merge request !11365
| * | | | Add auxiliary blob viewer for CHANGELOGDouwe Maan2017-05-176-2/+52
|/ / / /
* | | | Merge branch '32085-improve-ee-compat-check' into 'master' Robert Speicher2017-05-171-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-checkRémy Coutable2017-05-161-3/+5
| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | Merge branch 'dm-consistent-commit-widget' into 'master' Dmitriy Zaporozhets2017-05-178-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-widgetDouwe Maan2017-05-178-83/+13
| | | |
* | | | Merge branch 'get_rid_of_pluck' into 'master' Yorick Peterse2017-05-172-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_pluckValery Sizov2017-05-172-3/+11
| | |_|/ | |/| |
* | | | Merge branch 'fix-unassigned-checkmark' into 'master' Phil Hughes2017-05-174-7/+34
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix unassigned checkmark Closes #31843 See merge request !11391
| * | | | Fix unassigned checkmarkClement Ho2017-05-174-7/+34
|/ / / /
* | | | Merge branch 'add-changelog-ipython' into 'master' Phil Hughes2017-05-171-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add missing changelog for iPython notebook rendering feature Closes #32361 See merge request !11419
| * | | | Add missing changelog for iPython notebook rendering featureClement Ho2017-05-171-0/+1
|/ / / /
* | | | Merge branch 'sidebar-spacing-fixes' into 'master' Annabel Dunstone Gray2017-05-171-3/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed spacing issues in issue sidebar Closes #32357 See merge request !11430
| * | | | Fixed spacing issues in issue sidebarsidebar-spacing-fixesPhil Hughes2017-05-171-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 Ho2017-05-174-15/+15
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Convert fa-history to svg; tweak alignment See merge request !11397
| * | | | Convert fa-history to svg; tweak alignmentAnnabel Dunstone Gray2017-05-174-15/+15
|/ / / /
* | | | Merge branch 'counters_cache_invalidation' into 'master' Rémy Coutable2017-05-174-2/+49
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Invalidate cache for issue and MR counters separately See merge request !11394
| * | | | Invalidate cache for issue and MR counters more granularlycounters_cache_invalidationValery Sizov2017-05-154-2/+49
| | | | |
* | | | | Merge branch 'dm-contributing-viewer' into 'master' Rémy Coutable2017-05-174-1/+37
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add auxiliary blob viewer for CONTRIBUTING See merge request !11364
| * | | | | Add auxiliary viewer for CONTRIBUTINGdm-contributing-viewerDouwe Maan2017-05-164-1/+37
| | |_|/ / | |/| | |
* | | | | Merge branch 'acet-mr-widget-nothing-to-commit-state' into 'master' Filipa Lacerda2017-05-178-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-stateFatih Acet2017-05-162-2/+1
| | | | | |
| * | | | | MRWidget: Fix specs and address WIP comments.Fatih Acet2017-05-163-9/+20
| | | | | |
| * | | | | Add new_blob_path to MR json schemaOswaldo Ferreira2017-05-161-0/+1
| | | | | |
| * | | | | Returns new_blob_path only when user can push_code to projectOswaldo Ferreira2017-05-162-3/+22
| | | | | |
| * | | | | MRWidget: Implement new design for nothing to commit state.Fatih Acet2017-05-165-11/+62
| | | | | |
* | | | | | Merge branch 'dm-scroll-to-blob-user-content' into 'master' Douwe Maan2017-05-171-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-contentDouwe Maan2017-05-161-0/+1
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'update-admin-health-page' into 'master' Filipa Lacerda2017-05-172-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-pageJose Ivan Vargas2017-05-161-17/+2
| | | | | | |