summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dz-improve-mr-compar' into 'master' Douwe Maan2016-10-1211-32/+101
|\
| * Improve mr compare message when base is differentdz-improve-mr-comparDmitriy Zaporozhets2016-10-123-4/+10
| * Fix CHANGELOGDmitriy Zaporozhets2016-10-121-2/+0
| * Inform user when comparing 2 version with different baseDmitriy Zaporozhets2016-10-122-5/+13
| * Refactor straight compare diff codeDmitriy Zaporozhets2016-10-124-12/+22
| * Better tests for MergeRequestDiff#compare_with methodDmitriy Zaporozhets2016-10-121-2/+8
| * Improve tests for merge request diff modelDmitriy Zaporozhets2016-10-122-16/+26
| * Add mr version improvement to changelogDmitriy Zaporozhets2016-10-121-0/+3
| * Add spec for compare serviceDmitriy Zaporozhets2016-10-121-0/+21
| * Use straight diff approach when compare merge request versionsDmitriy Zaporozhets2016-10-123-6/+13
| * Bump gitlab_git to 10.6.8Dmitriy Zaporozhets2016-10-122-3/+3
* | Merge branch 'api-version' into 'master' Robert Speicher2016-10-126-0/+65
|\ \
| * | API: Version informationapi-versionRobert Schilling2016-10-126-0/+65
| |/
* | Merge branch 'rs-update-health_check' into 'master' Rémy Coutable2016-10-122-3/+3
|\ \
| * | Update health_check gem to `~> 2.2.0`Robert Speicher2016-10-122-3/+3
* | | Merge branch 'sh-add-bundle-check' into 'master' 21153-selecting-no-one-in-branch-permissions-is-confusingRémy Coutable2016-10-121-0/+6
|\ \ \ | |/ / |/| |
| * | Add a separate stage for bundle checksh-add-bundle-checkStan Hu2016-10-121-1/+6
| * | Add a bundle check step to ensure dependencies are correctStan Hu2016-10-121-0/+1
| |/
* | Merge branch '17541-move-licenses-api-endpoint-to-templates-licenses' into 'm...Rémy Coutable2016-10-1211-256/+986
|\ \
| * | Create a new /templates API namespaceThomas Balthazar2016-10-1211-256/+986
* | | Revert "Merge branch 'tests-use-tmpfs' into 'master'"Yorick Peterse2016-10-122-7/+0
* | | Merge branch 'git-attributes-documentation' into 'master' Achilleas Pipinellis2016-10-123-0/+24
|\ \ \
| * | | Added documentation chapter for Git attributesYorick Peterse2016-10-123-0/+24
| | |/ | |/|
* | | Merge branch 'use-activerecord_sane_schema_dumper' into 'master' Robert Speicher2016-10-123-587/+592
|\ \ \ | |/ / |/| |
| * | Use activerecord_sane_schema_dumperRémy Coutable2016-10-123-587/+592
|/ /
* | Merge branch 'user-events-api' into 'master' Robert Speicher2016-10-125-1/+222
|\ \
| * | Make spec deterministicuser-events-apiRémy Coutable2016-10-111-11/+9
| * | Addresses Robert's feedbackRémy Coutable2016-10-113-4/+5
| * | API: New /users/:id/events endpointRémy Coutable2016-10-104-0/+222
* | | Merge branch 'add-disabled-delete-button' into 'master' Robert Speicher2016-10-122-2/+3
|\ \ \
| * | | Add disabled delete button to protected branchesClement Ho2016-10-112-2/+3
* | | | Merge branch 'speed-up-api-projects-spec' into 'master' Robert Speicher2016-10-121-13/+15
|\ \ \ \
| * | | | Speed up specs for GET /projects/:id/eventsspeed-up-api-projects-specRémy Coutable2016-10-101-13/+15
* | | | | Merge branch '20708-new-branch-is-immediatelly-tagged-as-merged' into 'master' Douwe Maan2016-10-1217-45/+78
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | refactors tests because of gitlab-test repository changes20708-new-branch-is-immediatelly-tagged-as-mergedtiagonbotelho2016-10-1116-46/+65
| * | | | writes tests to verify the issue is solved and fixes breaking issues.tiagonbotelho2016-10-092-6/+14
| * | | | removes inconsistency regarding tagging immediately as merged once you create...tiagonbotelho2016-10-092-1/+7
* | | | | Merge branch 'download_snippets' into 'master' Sean McGivern2016-10-124-3/+14
|\ \ \ \ \
| * | | | | Added 'Download' button to snippet viewJustin DiPierro2016-10-114-3/+14
* | | | | | Merge branch 'sh-update-changelog' into 'master' Stan Hu2016-10-111-0/+3
|\ \ \ \ \ \
| * | | | | | Add CHANGELOG entry for 8.12.6sh-update-changelogStan Hu2016-10-111-0/+3
|/ / / / / /
* | | | | | Merge branch 'select2-fix-for-project-lfs-enabled' into 'master' Rémy Coutable2016-10-111-1/+1
|\ \ \ \ \ \
| * | | | | | FIx JS bug with select2 because of missing `data-field` attribute in select box.Patricio Cano2016-10-111-1/+1
* | | | | | | Merge branch 'api-fix-project-group-sharing' into 'security'Rémy Coutable2016-10-114-2/+22
* | | | | | | Add 8.12.5, 8.11.9, and 8.10.12 CHANGELOG entriesRémy Coutable2016-10-111-4/+15
* | | | | | | Merge branch 'allow_multiple_labels_commands' into 'master' Rémy Coutable2016-10-113-3/+62
|\ \ \ \ \ \ \
| * | | | | | | allow multiple labels commandsbarthc2016-10-113-3/+62
* | | | | | | | Merge branch '22211-500-instead-of-404' into 'master' Sean McGivern2016-10-113-0/+17
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Merge branch 'master' into 22211-500-instead-of-404Linus G Thiel2016-10-11391-1934/+6133
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch '22211-500-instead-of-404' of https://gitlab.com/yesbabyyes/gitl...Linus G Thiel2016-10-050-0/+0
| |\ \ \ \ \ \ \ \