Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Updated gitlab-markup forked gem to download from rubygemsbug/rst-forked-gem | Gabriel Mazetto | 2016-10-13 | 3 | -9/+7 |
* | Use forked github-markup gem to enable python3 support with omnibus | Gabriel Mazetto | 2016-10-13 | 2 | -3/+9 |
* | Merge branch 'project-edit-branch-dropdown-fix' into 'master' | Fatih Acet | 2016-10-13 | 1 | -1/+3 |
|\ | |||||
| * | Fixed default branch dropdown not converting to select2project-edit-branch-dropdown-fix | Phil Hughes | 2016-10-11 | 1 | -1/+3 |
* | | Merge branch 'grouped-builds-arrow' into 'master' | Fatih Acet | 2016-10-13 | 2 | -7/+11 |
|\ \ | |||||
| * | | Allow scrolling within grouped pipelinesgrouped-builds-arrow | Annabel Dunstone Gray | 2016-10-11 | 2 | -6/+11 |
| * | | Fix overflow to show grouped builds arrow | Annabel Dunstone Gray | 2016-10-11 | 1 | -1/+0 |
* | | | Merge branch 'feature/improve-mrwbs-and-todos-for-pipelines' into 'master' | Kamil Trzciński | 2016-10-13 | 15 | -118/+170 |
|\ \ \ | |||||
| * \ \ | Merge branch 'master' into feature/improve-mrwbs-and-todos-for-pipelinesfeature/improve-mrwbs-and-todos-for-pipelines | Grzegorz Bizon | 2016-10-12 | 43 | -914/+1994 |
| |\ \ \ | |||||
| * | | | | Do not return from proc-closure in pipeline transition | Grzegorz Bizon | 2016-10-12 | 1 | -1/+1 |
| * | | | | Improve desc for pipeline integration spec in MWBS | Grzegorz Bizon | 2016-10-12 | 1 | -17/+19 |
| * | | | | Schedule async pipeline success worker after commit | Grzegorz Bizon | 2016-10-12 | 1 | -1/+2 |
| * | | | | Merge branch 'master' into feature/improve-mrwbs-and-todos-for-pipelines | Grzegorz Bizon | 2016-10-12 | 488 | -3677/+8015 |
| |\ \ \ \ | |||||
| * | | | | | Add Changelog entry for MWBS trigger improvements | Grzegorz Bizon | 2016-10-07 | 1 | -0/+1 |
| * | | | | | Update documentation according to changes in MWBS | Grzegorz Bizon | 2016-10-07 | 1 | -10/+10 |
| * | | | | | Add test that checks actual merge for MWBS feature | Grzegorz Bizon | 2016-10-07 | 1 | -2/+13 |
| * | | | | | Improve merge when builds succeeds specs readability | Grzegorz Bizon | 2016-10-07 | 1 | -16/+28 |
| * | | | | | Process MWBS in successful pipeline asynchronously | Grzegorz Bizon | 2016-10-07 | 3 | -1/+37 |
| * | | | | | Rename pipeline workers to match current convention | Grzegorz Bizon | 2016-10-06 | 5 | -6/+6 |
| * | | | | | Remove support for branch-less builds in MWBS | Grzegorz Bizon | 2016-10-06 | 2 | -22/+11 |
| * | | | | | Fix tests and code for MWBS event move to pipeline | Grzegorz Bizon | 2016-10-06 | 2 | -23/+31 |
| * | | | | | Move MWBS trigger from build to pipeline event | Grzegorz Bizon | 2016-10-06 | 5 | -28/+26 |
* | | | | | | Merge branch 'trim-new-user' into 'master' | Fatih Acet | 2016-10-13 | 2 | -2/+4 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Ensure that whitespace doesn't case adding members to fail | Mitchell Hentges | 2016-10-10 | 2 | -2/+4 |
* | | | | | | | Merge branch '22635-clipboard-icon' into 'master' | Fatih Acet | 2016-10-13 | 2 | -2/+3 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Adds btn-transparent class in correct place due to changes in master22635-clipboard-icon | Filipa Lacerda | 2016-10-11 | 1 | -1/+1 |
| * | | | | | | | Adds entry to CHANGELOG | Filipa Lacerda | 2016-10-11 | 1 | -0/+1 |
| * | | | | | | | Fixes padding in all clipboard icons that have .btn class | Filipa Lacerda | 2016-10-11 | 1 | -1/+1 |
* | | | | | | | | Merge branch 'fix-some-specs' into 'master' | Rémy Coutable | 2016-10-13 | 2 | -4/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Use build instead create record in appearance_spec | Semyon Pupkov | 2016-10-12 | 1 | -1/+1 |
| * | | | | | | | | Remove unused lets from deploy_key spec | Semyon Pupkov | 2016-10-12 | 1 | -3/+0 |
* | | | | | | | | | Merge branch 'refactor-event-spec' into 'master' | Rémy Coutable | 2016-10-13 | 1 | -49/+61 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Union examples in event spec fo speed up | Semyon Pupkov | 2016-10-13 | 1 | -49/+61 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge branch 'update-gitlab-shell' into 'master' | Yorick Peterse | 2016-10-13 | 2 | -2/+2 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Update to gitlab-shell 3.6.6 | Yorick Peterse | 2016-10-12 | 2 | -2/+2 |
* | | | | | | | | | | Merge branch 'es6-es5-poltergeist' into 'master' | Fatih Acet | 2016-10-12 | 1 | -0/+11 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Document Capybara errors from es6 in es5 file.es6-es5-poltergeist | Bryce Johnson | 2016-10-12 | 1 | -0/+11 |
* | | | | | | | | | | | Merge branch 'mrchrisw/fix-debug-token' into 'master' | Stan Hu | 2016-10-12 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Fix step number and token param in URL example. Fix gitlab-rails command code...mrchrisw/fix-debug-token | Chris Wilson | 2016-10-11 | 1 | -2/+2 |
| | |_|_|_|/ / / / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'dz-improve-mr-compar' into 'master' | Douwe Maan | 2016-10-12 | 11 | -32/+101 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | Improve mr compare message when base is differentdz-improve-mr-compar | Dmitriy Zaporozhets | 2016-10-12 | 3 | -4/+10 |
| * | | | | | | | | | | Fix CHANGELOG | Dmitriy Zaporozhets | 2016-10-12 | 1 | -2/+0 |
| * | | | | | | | | | | Inform user when comparing 2 version with different base | Dmitriy Zaporozhets | 2016-10-12 | 2 | -5/+13 |
| * | | | | | | | | | | Refactor straight compare diff code | Dmitriy Zaporozhets | 2016-10-12 | 4 | -12/+22 |
| * | | | | | | | | | | Better tests for MergeRequestDiff#compare_with method | Dmitriy Zaporozhets | 2016-10-12 | 1 | -2/+8 |
| * | | | | | | | | | | Improve tests for merge request diff model | Dmitriy Zaporozhets | 2016-10-12 | 2 | -16/+26 |
| * | | | | | | | | | | Add mr version improvement to changelog | Dmitriy Zaporozhets | 2016-10-12 | 1 | -0/+3 |
| * | | | | | | | | | | Add spec for compare service | Dmitriy Zaporozhets | 2016-10-12 | 1 | -0/+21 |
| * | | | | | | | | | | Use straight diff approach when compare merge request versions | Dmitriy Zaporozhets | 2016-10-12 | 3 | -6/+13 |
| * | | | | | | | | | | Bump gitlab_git to 10.6.8 | Dmitriy Zaporozhets | 2016-10-12 | 2 | -3/+3 |