summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Updated gitlab-markup forked gem to download from rubygemsbug/rst-forked-gemGabriel Mazetto2016-10-133-9/+7
* Use forked github-markup gem to enable python3 support with omnibusGabriel Mazetto2016-10-132-3/+9
* Merge branch 'project-edit-branch-dropdown-fix' into 'master' Fatih Acet2016-10-131-1/+3
|\
| * Fixed default branch dropdown not converting to select2project-edit-branch-dropdown-fixPhil Hughes2016-10-111-1/+3
* | Merge branch 'grouped-builds-arrow' into 'master' Fatih Acet2016-10-132-7/+11
|\ \
| * | Allow scrolling within grouped pipelinesgrouped-builds-arrowAnnabel Dunstone Gray2016-10-112-6/+11
| * | Fix overflow to show grouped builds arrowAnnabel Dunstone Gray2016-10-111-1/+0
* | | Merge branch 'feature/improve-mrwbs-and-todos-for-pipelines' into 'master' Kamil Trzciński2016-10-1315-118/+170
|\ \ \
| * \ \ Merge branch 'master' into feature/improve-mrwbs-and-todos-for-pipelinesfeature/improve-mrwbs-and-todos-for-pipelinesGrzegorz Bizon2016-10-1243-914/+1994
| |\ \ \
| * | | | Do not return from proc-closure in pipeline transitionGrzegorz Bizon2016-10-121-1/+1
| * | | | Improve desc for pipeline integration spec in MWBSGrzegorz Bizon2016-10-121-17/+19
| * | | | Schedule async pipeline success worker after commitGrzegorz Bizon2016-10-121-1/+2
| * | | | Merge branch 'master' into feature/improve-mrwbs-and-todos-for-pipelinesGrzegorz Bizon2016-10-12488-3677/+8015
| |\ \ \ \
| * | | | | Add Changelog entry for MWBS trigger improvementsGrzegorz Bizon2016-10-071-0/+1
| * | | | | Update documentation according to changes in MWBSGrzegorz Bizon2016-10-071-10/+10
| * | | | | Add test that checks actual merge for MWBS featureGrzegorz Bizon2016-10-071-2/+13
| * | | | | Improve merge when builds succeeds specs readabilityGrzegorz Bizon2016-10-071-16/+28
| * | | | | Process MWBS in successful pipeline asynchronouslyGrzegorz Bizon2016-10-073-1/+37
| * | | | | Rename pipeline workers to match current conventionGrzegorz Bizon2016-10-065-6/+6
| * | | | | Remove support for branch-less builds in MWBSGrzegorz Bizon2016-10-062-22/+11
| * | | | | Fix tests and code for MWBS event move to pipelineGrzegorz Bizon2016-10-062-23/+31
| * | | | | Move MWBS trigger from build to pipeline eventGrzegorz Bizon2016-10-065-28/+26
* | | | | | Merge branch 'trim-new-user' into 'master' Fatih Acet2016-10-132-2/+4
|\ \ \ \ \ \
| * | | | | | Ensure that whitespace doesn't case adding members to failMitchell Hentges2016-10-102-2/+4
* | | | | | | 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