Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Handle case where deployment ref no longer exists22655-deployments-don-t-always-have-keep-around-refs | Sean McGivern | 2016-10-13 | 2 | -1/+17 |
* | 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 |
* | | | | | | | Merge branch 'api-version' into 'master' | Robert Speicher | 2016-10-12 | 6 | -0/+65 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | API: Version informationapi-version | Robert Schilling | 2016-10-12 | 6 | -0/+65 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'rs-update-health_check' into 'master' | Rémy Coutable | 2016-10-12 | 2 | -3/+3 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Update health_check gem to `~> 2.2.0` | Robert Speicher | 2016-10-12 | 2 | -3/+3 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'sh-add-bundle-check' into 'master' 21153-selecting-no-one-in-branch-permissions-is-confusing | Rémy Coutable | 2016-10-12 | 1 | -0/+6 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | Add a separate stage for bundle checksh-add-bundle-check | Stan Hu | 2016-10-12 | 1 | -1/+6 |
| * | | | | | | Add a bundle check step to ensure dependencies are correct | Stan Hu | 2016-10-12 | 1 | -0/+1 |
| |/ / / / / | |||||
* | | | | | | Merge branch '17541-move-licenses-api-endpoint-to-templates-licenses' into 'm... | Rémy Coutable | 2016-10-12 | 11 | -256/+986 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Create a new /templates API namespace | Thomas Balthazar | 2016-10-12 | 11 | -256/+986 |
* | | | | | | | Revert "Merge branch 'tests-use-tmpfs' into 'master'" | Yorick Peterse | 2016-10-12 | 2 | -7/+0 |
| |_|_|/ / / |/| | | | | | |||||
* | | | | | | Merge branch 'git-attributes-documentation' into 'master' | Achilleas Pipinellis | 2016-10-12 | 3 | -0/+24 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Added documentation chapter for Git attributes | Yorick Peterse | 2016-10-12 | 3 | -0/+24 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge branch 'use-activerecord_sane_schema_dumper' into 'master' | Robert Speicher | 2016-10-12 | 3 | -587/+592 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Use activerecord_sane_schema_dumper | Rémy Coutable | 2016-10-12 | 3 | -587/+592 |
|/ / / / / | |||||
* | | | | | Merge branch 'user-events-api' into 'master' | Robert Speicher | 2016-10-12 | 5 | -1/+222 |
|\ \ \ \ \ | |||||
| * | | | | | Make spec deterministicuser-events-api | Rémy Coutable | 2016-10-11 | 1 | -11/+9 |
| * | | | | | Addresses Robert's feedback | Rémy Coutable | 2016-10-11 | 3 | -4/+5 |
| * | | | | | API: New /users/:id/events endpoint | Rémy Coutable | 2016-10-10 | 4 | -0/+222 |
* | | | | | | Merge branch 'add-disabled-delete-button' into 'master' | Robert Speicher | 2016-10-12 | 2 | -2/+3 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Add disabled delete button to protected branches | Clement Ho | 2016-10-11 | 2 | -2/+3 |
* | | | | | | | Merge branch 'speed-up-api-projects-spec' into 'master' | Robert Speicher | 2016-10-12 | 1 | -13/+15 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Speed up specs for GET /projects/:id/eventsspeed-up-api-projects-spec | Rémy Coutable | 2016-10-10 | 1 | -13/+15 |
* | | | | | | | | Merge branch '20708-new-branch-is-immediatelly-tagged-as-merged' into 'master' | Douwe Maan | 2016-10-12 | 17 | -45/+78 |
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | |