summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'zj-mr-diff-memoization-bug' into 'master'10-3-stable-prepare-rc3Sean McGivern2017-12-191-1/+1
* Merge branch 'zj-memoization-mr-commits' into 'master'Sean McGivern2017-12-197-13/+57
* Merge branch 'commit-diff-discussion-in-mr-context-fix-links' into 'master'⛄️ Sean McGivern ⛄️2017-12-192-7/+22
* Merge branch 'osw-isolate-mr-widget-exposed-attributes' into 'master'Sean McGivern2017-12-1915-99/+68
* Merge branch 'skip-sast-on-ce' into 'master'Kamil Trzciński2017-12-191-1/+12
* Merge branch 'qa/rs-filter-by-name-subgroup' into 'master'Grzegorz Bizon2017-12-191-0/+6
* Merge branch 'ignore-markdown-cache-when-stubbing-application-settings' into ...Nick Thomas2017-12-192-4/+7
* Merge branch 'docs/sast' into 'master'Dmitriy Zaporozhets2017-12-191-0/+14
* Merge branch 'dm-ldap-email-readonly' into 'master'Sean McGivern2017-12-1911-45/+108
* Merge branch 'docs-add-auto-pipeline' into 'master'Achilleas Pipinellis2017-12-191-0/+4
* Merge branch 'docs-update-documentation-guidelines' into 'master'🚄 Job van der Voort 🚀2017-12-192-83/+91
* Merge branch 'docs/commit-diff-discussions-in-mr-context' into 'master'Achilleas Pipinellis2017-12-194-0/+47
* Merge branch 'zj-mr-diff-memoization-bug' into 'master'Sean McGivern2017-12-192-13/+24
* Merge branch 'docs-jprovazn-create-from-email' into 'master'Marcia Ramos2017-12-193-5/+12
* Merge branch 'dm-batchloader-project' into 'master'Sean McGivern2017-12-192-3/+14
* Merge branch 'update-doc-for-user-group-project-transfers' into 'master'Douwe Maan2017-12-193-10/+15
* Merge branch 'pawel/cache_feature_check_for_5_minutes_for_method_call' into '...Robert Speicher2017-12-192-1/+48
* Merge branch 'fix-throttled-update-for-10-3' into '10-3-stable'Oswaldo Ferreira2017-12-1910-3/+85
|\
| * Return the noteable in Note#touch_noteablefix-throttled-update-for-10-3Yorick Peterse2017-12-141-0/+3
| * Restore throttling of touchYorick Peterse2017-12-1410-3/+82
* | Update VERSION to 10.3.0-rc2v10.3.0-rc2James Lopez2017-12-191-1/+1
* | Merge branch 'sh-fix-milestone-id-migration' into 'master'Oswaldo Ferreira2017-12-181-0/+1
* | Update VERSION to 10.3.0-rc1v10.3.0-rc110-3-stable-prepare-rc2Tiago Botelho2017-12-141-1/+1
|/
* Merge branch '41110-dependencies-validator-fails-when-depended-job-is-manual'...Kamil Trzciński2017-12-143-10/+7
* Merge branch '10-3-stable-prepare-rc1' into '10-3-stable'James Lopez2017-12-14173-1795/+2807
|\
| * Merge branch 'issue_41021' into 'master'10-3-stable-prepare-rc1Sean McGivern2017-12-138-8/+62
| * Revert "Merge branch 'zj-memoization-mr-commits' into 'master'"Oswaldo Ferreira2017-12-137-57/+13
| * Fix merge_request.rb conflict resolutionLUKE BENNETT2017-12-131-1/+0
| * Fix wrong conflict resolution on !15858Oswaldo Ferreira2017-12-131-2/+1
| * Merge branch '10-3-stable-prepare-rc1' of https://gitlab.com/gitlab-org/gitla...Luke Bennett2017-12-1325-1162/+610
| |\
| | * Merge branch 'tm/docs/docker-extended-entrypoint-fix' into 'master'Achilleas Pipinellis2017-12-131-22/+39
| | * Merge branch 'winh-merge-dev-docs' into 'master'Winnie Hellmann2017-12-131-2/+24
| | * Merge branch 'update-dependencies-license-list' into 'master'LUKE BENNETT2017-12-131-1070/+27
| | * Merge branch '10-3-gitignore' into 'master'Tiago2017-12-1318-63/+150
| | * Merge branch '10-3-update-guide' into 'master'Tiago2017-12-131-0/+360
| | * Merge branch '10-3-installation-from-source' into 'master'Tiago2017-12-131-2/+2
| | * Merge branch '40285-prometheus-loading-screen-no-longer-seems-to-appear' into...Tim Zallmann2017-12-132-3/+8
| * | Merge branch 'zj-memoization-mr-commits' into 'master'Sean McGivern2017-12-137-13/+58
| |/
| * Merge branch 'fix-remove-branch-name-migration' into 'master'Sean McGivern2017-12-132-0/+4
| * Merge branch 'mk-fix-leaky-spec' into 'master'Stan Hu2017-12-131-4/+13
| * Merge branch 'gitaly-mirroring-prep' into 'master'Robert Speicher2017-12-134-55/+46
| * Merge branch 'optimize-projects-for-imported-projects' into 'master'Yorick Peterse2017-12-132-1/+8
| * Merge branch 'jprovazn-description' into 'master'Sean McGivern2017-12-135-2/+37
| * Merge branch 'dm-image-blob-diff-full-url' into 'master'Sean McGivern2017-12-136-21/+39
| * Merge branch 'diff-file-navigation-doc-screenshot-docs' into 'master'Filipa Lacerda2017-12-131-0/+0
| * Merge branch '41041-undefined-method-new_project_guidelines_html-unable-to-lo...Douwe Maan2017-12-131-0/+6
| * Merge branch '41023-activerecord-staleobjecterror--attempted-to-update-a-stal...Kamil Trzciński2017-12-132-8/+22
| * Merge branch 'fix-image-view-mode' into 'master'Filipa Lacerda2017-12-132-2/+14
| * Merge branch 'mk-fix-schema-dump-of-untracked-files-for-uploads' into 'master'Stan Hu2017-12-132-0/+7
| * Merge branch 'backport-epic-in-issue' into 'master'Jacob Schatz2017-12-1311-82/+151