summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Remove stray conflict markerdm-changelog-viewerDouwe Maan2017-05-171-1/+0
* Merge branch 'master' into 'dm-changelog-viewer'Douwe Maan2017-05-1746-343/+867
|\
| * Merge branch 'counters_cache_invalidation' into 'master' Rémy Coutable2017-05-174-2/+49
| |\
| | * 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 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
| |\ \ \
| | * | | 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 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
| |\ \ \ \
| | * | | | 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 '32395-duplicate-string-in-https-docs-gitlab-com-ce-administrati...Rémy Coutable2017-05-172-1/+4
| |\ \ \ \ \
| | * | | | | Removes duplicate environment variable in documentationMark Fletcher2017-05-172-1/+4
| |/ / / / /
| * | | | | Merge branch 'bvl-docs-dynamic-path-validator' into 'master' Achilleas Pipinellis2017-05-171-3/+5
| |\ \ \ \ \
| | * | | | | 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' in...Tim Zallmann2017-05-177-124/+114
| |\ \ \ \ \
| | * | | | | 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 MySQLsh-fix-delete-assignees-mysqlStan Hu2017-05-161-4/+9
| |/ / / / / /
| * | | | | | 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 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 UIblackst0ne2017-05-167-117/+330
| * | | | | | | Merge branch 'sh-disable-merge-worker-in-spec' into 'master' Robert Speicher2017-05-161-3/+5
| |\ \ \ \ \ \ \
| | * | | | | | | 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
| | | |/ / / / / | | |/| | | | |
| * | | | | | | Merge branch 'fix_assignee_yourick_approach' into 'master' Douwe Maan2017-05-168-54/+206
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Improve migration for Multipple issue assignee featureValery Sizov2017-05-168-54/+206
| | | |_|/ / / | | |/| | | |
* | | | | | | Add auxiliary viewer for CHANGELOGDouwe Maan2017-05-166-2/+53
|/ / / / / /
* | | | | | Merge branch 'dm-blob-viewer-concerns' into 'master' Robert Speicher2017-05-1617-113/+125
|\ \ \ \ \ \
| * | | | | | Rename BlobViewer max_size to overridable_max_size and absolute_max_size to m...dm-blob-viewer-concernsDouwe Maan2017-05-159-42/+50
| * | | | | | Specify explicitly whether a blob viewer should be loaded asynchronouslyDouwe Maan2017-05-1312-69/+73
| * | | | | | Allow blob viewer to support multiple filetypesDouwe Maan2017-05-134-7/+7
* | | | | | | Merge branch 'reenable-gitaly-ref-name' into 'master' Robert Speicher2017-05-164-33/+53
|\ \ \ \ \ \ \
| * | | | | | | Re-enable gitaly migration for ref_name_for_sha after bugfixesreenable-gitaly-ref-nameAlejandro Rodríguez2017-05-164-33/+53
* | | | | | | | Merge branch 'use-common-vue-for-merge-request-widget' into 'master' Fatih Acet2017-05-162-1/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | ensure merge-request-widget utilizes common_vue bundleuse-common-vue-for-merge-request-widgetMike Greiling2017-05-152-1/+3
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch '32326-scrollable-tabs-overflow' into 'master' Annabel Dunstone Gray2017-05-162-2/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | prevent dropdowns from being cut-off by scrollable tab container32326-scrollable-tabs-overflowSimon Knox2017-05-162-2/+6
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch 'modulify-and-tech-debt-gfm-auto-complete' into 'master' Clement Ho2017-05-1610-251/+270
|\ \ \ \ \ \ \ \
| * | | | | | | | Make `gfm_auto_complete` into a module and fix up tech debtEric Eastwood2017-05-1610-251/+270
|/ / / / / / / /
* | | | | | | | Merge branch 'i18n-docs' into 'master' Achilleas Pipinellis2017-05-162-0/+243
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Add guide to collaborate with i18n.Rubén Dávila Santos2017-05-162-0/+243
|/ / / / / / /
View Lorry Controller Status