Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '33639-whitespace' into 'master'32795-internationalise-project-activity-page | Phil Hughes | 2017-06-14 | 1 | -0/+1 |
|\ | | | | | | | | | | | | | Adds back whitespace for job's trace Closes #33639 See merge request !12142 | ||||
| * | Adds back whitespace for job's trace | Filipa Lacerda | 2017-06-14 | 1 | -0/+1 |
|/ | |||||
* | Merge branch 'backport-empty-panel-heading-styles-from-related-issues' into ↵ | Filipa Lacerda | 2017-06-14 | 1 | -0/+4 |
|\ | | | | | | | | | | | | | 'master' Backport empty panel heading from EE related issues See merge request !12153 | ||||
| * | Backport empty panel heading from EE related issuesbackport-empty-panel-heading-styles-from-related-issues | Eric Eastwood | 2017-06-13 | 1 | -0/+4 |
| | | | | | | | | | | | | | | See https://gitlab.com/gitlab-org/gitlab-ee/commit/4b5a1c9a6570d70cd3e16b3c1d3c2ec0471f46eb#777d5694836def44d2a73f1c7590aea20aed6c22_35_35 From MR: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/1797/ | ||||
* | | Merge branch 'backport-related-issues-board-issue-count-badge-styles' into ↵ | Filipa Lacerda | 2017-06-14 | 5 | -36/+45 |
|\ \ | | | | | | | | | | | | | | | | | | | 'master' Backport issue count badge style refactor for re-use from EE related issues See merge request !12152 | ||||
| * | | Backport issue count badge style refactor for re-usebackport-related-issues-board-issue-count-badge-styles | Eric Eastwood | 2017-06-13 | 5 | -36/+45 |
| |/ | | | | | | | | | | | | | Added by https://gitlab.com/gitlab-org/gitlab-ee/commit/88aea2cbc8633ba970335d935d725bd17654b424 Part of this MR: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/1797/ | ||||
* | | Merge branch 'docs/codeclimate-fix-link' into 'master' | Sean Packham | 2017-06-14 | 1 | -1/+1 |
|\ \ | | | | | | | | | | | | | Fix wrong link to codeclimate diff docs See merge request !12158 | ||||
| * | | Fix wrong link to codeclimate diff docsdocs/codeclimate-fix-link | Achilleas Pipinellis | 2017-06-14 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'docs/personal-access-tokens' into 'master' | Sean Packham | 2017-06-14 | 11 | -90/+157 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Add docs for personal access tokens Closes #31740 and #33261 See merge request !12128 | ||||
| * | | | Add docs for personal access tokensdocs/personal-access-tokens | Achilleas Pipinellis | 2017-06-14 | 11 | -90/+157 |
| |/ / | |||||
* | | | Merge branch 'feature/add-support-for-services-configuration' into 'master' | Grzegorz Bizon | 2017-06-14 | 18 | -135/+543 |
|\ \ \ | | | | | | | | | | | | | | | | | Add support for services configuration in .gitlab-ci.yml See merge request !8578 | ||||
| * | | | Remove Gitlab::Ci::Config::Entry::DockerImage | Tomasz Maczukin | 2017-06-12 | 3 | -34/+23 |
| | | | | |||||
| * | | | Improve specs for GitlabCiYamlProcessor | Tomasz Maczukin | 2017-06-12 | 1 | -50/+105 |
| | | | | |||||
| * | | | Refactor old formad handling in lib/ci/api/entities.rb | Tomasz Maczukin | 2017-06-12 | 1 | -6/+2 |
| | | | | |||||
| * | | | Rename API::Entities::JobRequest::ServiceImage to ↵ | Tomasz Maczukin | 2017-06-12 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | API::Entities::JobRequest::Service | ||||
| * | | | Add CHANGELOG entry | Tomasz Maczukin | 2017-06-12 | 1 | -0/+4 |
| | | | | |||||
| * | | | Ensure that old API v1 generates still the same output | Tomasz Maczukin | 2017-06-12 | 2 | -1/+31 |
| | | | | |||||
| * | | | Send new configuration options with job's payload | Tomasz Maczukin | 2017-06-12 | 5 | -16/+75 |
| | | | | |||||
| * | | | Add support for docker image configuration in .gitlab-ci.yml | Tomasz Maczukin | 2017-06-12 | 11 | -75/+350 |
| | | | | |||||
* | | | | Merge branch 'fix-external-ci-services' into 'master' | Grzegorz Bizon | 2017-06-14 | 24 | -43/+175 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow to access statuses for external CI services Closes #30714, #29369, and #15220 See merge request !11176 | ||||
| * | | | | Update tests and applicationfix-external-ci-services | Kamil Trzcinski | 2017-06-13 | 13 | -18/+124 |
| | | | | | |||||
| * | | | | Rename BuildEntity to JobEntity | Kamil Trzcinski | 2017-06-13 | 7 | -20/+41 |
| | | | | | |||||
| * | | | | Fix support for external_url for commit statuses | Kamil Trzcinski | 2017-06-13 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Allow to access pipelines even if they are disabled, but only present jobs ↵ | Kamil Trzcinski | 2017-06-13 | 8 | -7/+12 |
| | | | | | | | | | | | | | | | | | | | | and commit statuses without giving ability to access them | ||||
* | | | | | Merge branch 'bpj-small-pipeline-ui-changes' into 'master' | Annabel Dunstone Gray | 2017-06-13 | 3 | -3/+3 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make small pipeline schedules UI enhancements. Closes #32565 See merge request !12136 | ||||
| * | | | | | Make small pipeline schedules UI enhancements.bpj-small-pipeline-ui-changes | Bryce Johnson | 2017-06-13 | 3 | -3/+3 |
| | | | | | | |||||
* | | | | | | Merge branch '33628-pipeline-sidebar' into 'master' | Phil Hughes | 2017-06-13 | 1 | -0/+1 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds "Pipeline" to job's sidebar Closes #33628 See merge request !12131 | ||||
| * | | | | | | Adds "Pipeline" to job's sidebar33628-pipeline-sidebar | Filipa Lacerda | 2017-06-13 | 1 | -0/+1 |
| | | | | | | | |||||
* | | | | | | | Merge branch '33642-timeago-update' into 'master' | Phil Hughes | 2017-06-13 | 2 | -26/+3 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove js classes from vue component that are not needed in vue component Closes #33642 See merge request !12133 | ||||
| * | | | | | | | Remove js classes from vue component that are not needed in vue component33642-timeago-update | Filipa Lacerda | 2017-06-13 | 2 | -26/+3 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'revert-1b54982f' into 'master' | Robert Speicher | 2017-06-13 | 11 | -41/+168 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Merge branch 'karma-headless-chrome' into 'master'" See merge request !12137 | ||||
| * | | | | | | | Revert "Merge branch 'karma-headless-chrome' into 'master'" | Mike Greiling | 2017-06-13 | 11 | -41/+168 |
| | |/ / / / / | |/| | | | | | | | | | | | | This reverts merge request !12036 | ||||
* | | | | | | | Merge branch 'wiki-limited-width' into 'master' | Annabel Dunstone Gray | 2017-06-13 | 10 | -152/+149 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Limit wiki container width Closes #23734 See merge request !12089 | ||||
| * | | | | | | Limit wiki container widthwiki-limited-width | Phil Hughes | 2017-06-13 | 10 | -152/+149 |
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | Closes #23734 | ||||
* | | | | | | Merge branch '33629-scroll-color' into 'master' | Phil Hughes | 2017-06-13 | 1 | -1/+1 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change border color of job's scroll controllers to $border-color Closes #33629 See merge request !12129 | ||||
| * | | | | | Change border color of job's scroll controllers to $border-color | Filipa Lacerda | 2017-06-13 | 1 | -1/+1 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge branch 'tidy-up-issues-controller-filters' into 'master' | Douwe Maan | 2017-06-13 | 1 | -9/+6 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Always check read_issue permissions when loading issue See merge request !12095 | ||||
| * | | | | | Always check read_issue permissions when loading issuetidy-up-issues-controller-filters | Sean McGivern | 2017-06-13 | 1 | -9/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | We never want to skip the check, so that some actions did so was a mistake. | ||||
* | | | | | | Merge branch 'fix/gb/remove-invalid-build-details-exposure' into 'master' | Kamil Trzciński | 2017-06-13 | 2 | -6/+3 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not expose internal artifacts hash in build entity Closes #33605 See merge request !12124 | ||||
| * | | | | | Do not expose internal artifacts hash in build entityfix/gb/remove-invalid-build-details-exposure | Grzegorz Bizon | 2017-06-13 | 2 | -6/+3 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge branch 'fix-github-clone-wiki' into 'master' | Sean McGivern | 2017-06-13 | 2 | -1/+5 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | GitHub - Fix token interpolation when cloning wiki repository See merge request !12107 | ||||
| * | | | | | Add CHANGELOGfix-github-clone-wiki | Douglas Barbosa Alexandre | 2017-06-12 | 1 | -0/+4 |
| | | | | | | |||||
| * | | | | | Github - Fix token interpolation when cloning wiki repository | Douglas Barbosa Alexandre | 2017-06-12 | 1 | -1/+1 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge branch ↵ | Yorick Peterse | 2017-06-13 | 49 | -3/+569 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '32054-rails-should-use-timestamptz-database-type-for-postgresql' into 'master' Add database helpers 'add_timestamps_with_timezone' and 'timestamps_with_timezone' Closes #32054 See merge request !11229 | ||||
| * | | | | | Add database helpers 'add_timestamps_with_timezone' and ↵32054-rails-should-use-timestamptz-database-type-for-postgresql | blackst0ne | 2017-06-13 | 49 | -3/+569 |
| | | | | | | | | | | | | | | | | | | | | | | | | 'timestamps_with_timezone' | ||||
* | | | | | | Merge branch 'zj-commit-status-sortable-name' into 'master' | Grzegorz Bizon | 2017-06-13 | 3 | -2/+17 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Handle legacy jobs without name Closes #33403 See merge request !12118 | ||||
| * | | | | | | Handle legacy jobs without namezj-commit-status-sortable-name | Z.J. van de Weg | 2017-06-13 | 3 | -2/+17 |
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Older pipelines can contain jobs without a name, in which case 'nameless' is used right now, so we can properly still handle other actions on these jobs. Fixes gitlab-org/gitlab-ce#33403 | ||||
* | | | | | | Merge branch 'updating-k8s-page' into 'master' | Phil Hughes | 2017-06-13 | 1 | -1/+1 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added Tectonic to the page. See merge request !12126 | ||||
| * | | | | | | Added Tectonic to the page.updating-k8s-page | Eliran Mesika | 2017-06-13 | 1 | -1/+1 |
|/ / / / / / | |||||
* | | | | | | Merge branch '33564-fix-flaky-test' into 'master' | Sean McGivern | 2017-06-13 | 1 | -2/+2 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use wait_for_requests instead of sleep 0.3 Closes #33564 See merge request !12122 |