summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Delete merge_request_widget.jsdelete-old-mr-widgetLuke "Jared" Bennett2017-05-171-303/+0
|
* 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
| | | | | | |
| * | | | | | update admin health page with the application readiness endpointsJose Ivan Vargas2017-05-162-0/+11
| | | | | | |
* | | | | | | Merge branch ↵Rémy Coutable2017-05-172-1/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '32395-duplicate-string-in-https-docs-gitlab-com-ce-administration-environment_variables-html' into 'master' Removes duplicate environment variable in documentation Closes #32395 See merge request !11438
| * | | | | | | Removes duplicate environment variable in documentationMark Fletcher2017-05-172-1/+4
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | [skip ci]
* | | | | | | Merge branch 'bvl-docs-dynamic-path-validator' into 'master' Achilleas Pipinellis2017-05-171-3/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update documentation on reserved words for groups and projects See merge request !11432
| * | | | | | | Update documentation on reserved words for groups and projectsBob Van Landuyt2017-05-171-3/+5
|/ / / / / / /
* | | | | | | Merge branch '32172-improve-responsive-styling-of-pipeline-schedules-form' ↵Tim Zallmann2017-05-177-124/+114
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Polish UI on pipeline schedules form Closes #32172 See merge request !11332
| * | | | | | Use classes to select dropdown buttons.32172-improve-responsive-styling-of-pipeline-schedules-formBryce Johnson2017-05-151-2/+2
| | | | | | |
| * | | | | | Clean up UI and styles.Bryce Johnson2017-05-157-122/+112
| | | | | | |
* | | | | | | Merge branch 'sh-fix-delete-assignees-mysql' into 'master' Stan Hu2017-05-171-4/+9
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix deletion of issue assignees for MySQL See merge request !11426
| * | | | | | | Fix deletion of issue assignees for MySQLsh-fix-delete-assignees-mysqlStan Hu2017-05-161-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 'fe_guide-index-ascii-tree' into 'master' 22306-can-t-disable-project-services-trigger-or-unset-defined-channel-name-via-apiClement Ho2017-05-161-9/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update fe_guide/index.md to use readable ascii tree Closes #31330 See merge request !11423
| * | | | | | | Update fe_guide/index.md to use readable ascii treefe_guide-index-ascii-treeLuke "Jared" Bennett2017-05-161-9/+5
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'ability_to_cancel_attaching_file' into 'master' Douwe Maan2017-05-167-117/+330
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-167-117/+330
| | | | | | | |
* | | | | | | | Merge branch 'sh-disable-merge-worker-in-spec' into 'master' Robert Speicher2017-05-161-3/+5
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disable Sidekiq in merge immediately spec to prevent transient build failures See merge request !11422
| * | | | | | | | Wait for all Vue resources to finish in merge immediately specsh-disable-merge-worker-in-specStan Hu2017-05-161-1/+1
| | | | | | | | |
| * | | | | | | | Disable Sidekiq in spec to prevent transient build failuresStan Hu2017-05-161-3/+5
| | |/ / / / / / | |/| | | | | |