summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Handle case where deployment ref no longer exists22655-deployments-don-t-always-have-keep-around-refsSean McGivern2016-10-132-1/+17
* Merge branch '22635-clipboard-icon' into 'master' Fatih Acet2016-10-132-2/+3
|\
| * Adds btn-transparent class in correct place due to changes in master22635-clipboard-iconFilipa Lacerda2016-10-111-1/+1
| * Adds entry to CHANGELOGFilipa Lacerda2016-10-111-0/+1
| * Fixes padding in all clipboard icons that have .btn classFilipa Lacerda2016-10-111-1/+1
* | Merge branch 'fix-some-specs' into 'master' Rémy Coutable2016-10-132-4/+1
|\ \
| * | Use build instead create record in appearance_specSemyon Pupkov2016-10-121-1/+1
| * | Remove unused lets from deploy_key specSemyon Pupkov2016-10-121-3/+0
* | | Merge branch 'refactor-event-spec' into 'master' Rémy Coutable2016-10-131-49/+61
|\ \ \
| * | | Union examples in event spec fo speed upSemyon Pupkov2016-10-131-49/+61
| |/ /
* | | Merge branch 'update-gitlab-shell' into 'master' Yorick Peterse2016-10-132-2/+2
|\ \ \
| * | | Update to gitlab-shell 3.6.6Yorick Peterse2016-10-122-2/+2
* | | | Merge branch 'es6-es5-poltergeist' into 'master' Fatih Acet2016-10-121-0/+11
|\ \ \ \
| * | | | Document Capybara errors from es6 in es5 file.es6-es5-poltergeistBryce Johnson2016-10-121-0/+11
* | | | | Merge branch 'mrchrisw/fix-debug-token' into 'master' Stan Hu2016-10-121-2/+2
|\ \ \ \ \
| * | | | | Fix step number and token param in URL example. Fix gitlab-rails command code...mrchrisw/fix-debug-tokenChris Wilson2016-10-111-2/+2
* | | | | | 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
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |