summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* storing runner infosave_info_from_runnerValery Sizov2015-05-1213-8/+118
|
* Merge branch 'sidekiq_worker_fix' into 'master'Valery Sizov2015-05-083-1/+7
|\ | | | | | | | | | | | | | | Added Sidekiq config... I added a config file for Sidekiq for regulating the amount of threads. See merge request !70
| * filled fileValentin Boettcher2015-04-281-0/+2
| |
| * renameValentin Boettcher2015-04-281-0/+0
| |
| * renameValentin Boettcher2015-04-281-2/+0
| |
| * add sidekiq conficvale9812015-04-183-1/+7
| | | | | | | | changelog
* | Merge branch 'fix_permission_check' into 'master'Valery Sizov2015-05-062-1/+17
|\ \ | | | | | | | | | | | | | | | | | | | | | More explicit permission error for developers https://dev.gitlab.org/gitlab/gitlab-ci/issues/226 See merge request !97
| * | More explicit permission error for developersValery Sizov2015-05-062-1/+17
|/ /
* | Update document about example CE build script to only use bundle path when ↵Marin Jankovski2015-05-051-1/+2
| | | | | | | | necessary.
* | Merge branch 'email_templates' into 'master'Valery Sizov2015-05-055-12/+10
|\ \ | | | | | | | | | | | | | | | | | | | | | Improved email templates Fixes https://dev.gitlab.org/gitlab/gitlab-ci/issues/215 See merge request !95
| * | Improved email templatesValery Sizov2015-05-055-12/+10
|/ /
* | Merge branch 'users_permissions' into 'master'Valery Sizov2015-05-052-1/+26
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add user permissions matrix https://dev.gitlab.org/gitlab/gitlab-ci/issues/127 # Users Permissions GitLab CI relies on user's role on the GitLab. There are three permissions levels on GitLab CI: admin, master, developer, other. Admin user can perform any actions on GitLab CI in scope of instance and project. Also user with admin permission can use admin interface. | Action | Guest, Reporter | Developer | Master | Admin | |---------------------------------------|-----------------|-------------|----------|--------| | See commits and builds | ✓ | ✓ | ✓ | ✓ | | Retry or cancel build | | ✓ | ✓ | ✓ | | Remove project | | | ✓ | ✓ | | Create project | | | ✓ | ✓ | | Change project configuration | | | ✓ | ✓ | | Add specific runners | | | ✓ | ✓ | | Add shared runners | | | | ✓ | | See events in the system | | | | ✓ | | Admin interface | | | | ✓ | See merge request !93
| * | add user permission matrixValery Sizov2015-05-052-1/+26
| | |
* | | Merge branch 'ui_fix' into 'master'Valery Sizov2015-05-057-31/+6
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove redundant header https://dev.gitlab.org/gitlab/gitlab-ci/issues/193 See merge request !94
| * | | Remove redundant headerValery Sizov2015-05-057-31/+6
|/ / /
* | | Merge branch 'update_build_script' into 'master'Valery Sizov2015-05-051-9/+29
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the build script example used by GitLab B.V. to support both docker and shell executors. Updated build examples for GitLab CE to be able to used with either Docker or regular shell executors. See merge request !92
| * | | Update the build script example used by GitLab B.V. to support both docker ↵Marin Jankovski2015-05-051-9/+29
| | | | | | | | | | | | | | | | and shell executors.
* | | | Merge branch 'project_ids' into 'master'Valery Sizov2015-05-043-5/+1
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | Remove project IDs from dashboard https://dev.gitlab.org/gitlab/gitlab-ci/issues/225 See merge request !91
| * | | remove project IDs from dashboardValery Sizov2015-05-043-5/+1
|/ / /
* | | Merge branch 'clean_up_settings' into 'master'Dmitriy Zaporozhets2015-05-0420-90/+65
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clean up project advanced settings. Migrate from gitlab_url to path https://dev.gitlab.org/gitlab/gitlab-ci/issues/218 See merge request !90
| * | | Refactoring. Clean up advanced settings. Migrate from gotlab_url to pathValery Sizov2015-05-0420-90/+65
|/ / /
* | | Merge branch 'update_guide' into 'master'Valery Sizov2015-05-041-0/+49
|\ \ \ | | | | | | | | | | | | | | | | | | | | Update guide from 7.9 -> 7.10 See merge request !89
| * | | update guide from 7.9 -> 7.10Valery Sizov2015-05-041-0/+49
|/ / /
* | | rubocop satisfyValery Sizov2015-05-041-2/+0
| | |
* | | Merge branch 'hipchat_service' into 'master'Valery Sizov2015-05-0412-2/+313
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add HipChat Notification Service My company is looking for a secure, private, stable and hopefully less-expensive alternative to our existing GitHub & Jenkins setup, and is currently focused on GitLab and GitLab CI after trying a number of other solutions. The biggest hurdle is integrations. I saw that GitLab CI was lacking a service to notify HipChat of builds, and in my search to see if there was a workaround I saw [someone ask about it](http://feedback.gitlab.com/forums/176466-general/suggestions/5350117-gitlab-ci-should-push-notifications-to-configured), and figured it just hadn't been done yet. So, I did it. * Move existing Slack service spec into a subdir, mirroring /app * Wire up HipChat service to the project and services controller. * Split the message building into own class. * 'namespace' room and token variables. * Enforce v2 client (bug in HipChat gem v1.5.0. fixed in 1.5.1). Note that I'm using the same version string as GitLab-CE, for shared installations. This does prevent 'old' room tokens from being reused. 'v1' is more compatible, but there is rumblings about finally deprecating it and moving to v2 only on their GitHub issue tracker for this gem. * Defer execution to a notifier worker, like the Slack service. * Ensure passing specs (basically a Slack service spec copy, fwiw) * Added change to the CHANGELOG I'm not sure exactly how your feedback's "Accepting Merge Requests" tag is supposed to work, but I'm happy to learn and change my contribution procedure if anything is wrong here. Thanks! ![Screen_Shot_2015-04-26_at_8.48.19_AM](https://gitlab.com/uxp/gitlab-ci/uploads/296e9d86e369dd33ba99e44acbc8ea78/Screen_Shot_2015-04-26_at_8.48.19_AM.png) See merge request !83
| * | | Fix notification issues on HipChatService, add HipChatMessage specsHoward P. Logsdon2015-04-305-25/+139
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | adding specs for HipChatMessage exposed some issues with the way I was building the matrix-commit style notification message, so it ended up being quite a bit more changes than I expected. The save call from the service configure form submits an empty string as the server URL if left blank, which I've indicated to do in order to use the default server, but Hash#merge will happily overwrite a full string with a blank string if asked, so we need to break that out, along with the worker options which get mutated into string hash keys, of which the HipChat client seems to not understand. Additionally, add another spec to make sure we call the Sidekiq worker with expected arguments.
| * | | HipChat Notification ServiceHoward P. Logsdon2015-04-3011-2/+199
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Move existing Slack service spec into a subdir, mirroring /app * Wire up HipChat service to the project and services controller. * Split the message building into own class. * 'namespace' room and token variables. * Enforce v2 client (bug in HipChat gem v1.5.0. fixed in 1.5.1). Note that I'm using the same version string as GitLab-CE, for shared installations. * Defer execution to a notifier worker, like the Slack service. * Ensure passing specs (basically a Slack service spec copy, fwiw) * Added change to the CHANGELOG
* | | Merge branch 'ci_skip_fix' into 'master'Valery Sizov2015-04-295-18/+22
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | Fix 'ci skip' tag https://dev.gitlab.org/gitlab/gitlab-ci/issues/206 See merge request !88
| * | update changelogci_skip_fixValery Sizov2015-04-281-0/+1
| | |
| * | Fix 'ci skip' tagValery Sizov2015-04-284-18/+21
|/ /
* | Merge branch 'api_rework' into 'master'Valery Sizov2015-04-283-54/+90
|\ \ | | | | | | | | | | | | | | | API refactoring && better test coverage See merge request !87
| * | API rework && testsapi_reworkValery Sizov2015-04-283-54/+90
| | |
* | | update changelogValery Sizov2015-04-281-0/+3
|/ /
* | Merge branch 'query_string_in_nwtwork' into 'master'Valery Sizov2015-04-275-24/+5
|\ \ | | | | | | | | | | | | | | | | | | | | | Make Network class to follow HTTP RFC https://gitlab.com/gitlab-org/gitlab-ci/issues/144 See merge request !86
| * | Make Network class to follow HTTP RFCValery Sizov2015-04-275-24/+5
|/ /
* | Merge branch 'fix_migration' into 'master'Valery Sizov2015-04-271-1/+15
|\ \ | | | | | | | | | | | | | | | | | | | | | Fix migration 7.8 and older to 7.10 https://github.com/gitlabhq/gitlab-ci/issues/586 See merge request !85
| * | fix migration failingValery Sizov2015-04-271-1/+15
|/ /
* | Merge branch 'reversible_migration' into 'master'Dmitriy Zaporozhets2015-04-271-5/+5
|\ \ | | | | | | | | | | | | | | | Make migration reversible See merge request !84
| * | make migration reversibleValery Sizov2015-04-271-5/+5
|/ /
* | Merge branch 'concurent_runners' into 'master'Dmitriy Zaporozhets2015-04-241-1/+6
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve situation with concurent runners registration https://dev.gitlab.org/gitlab/gitlab-ci/issues/209 https://github.com/gitlabhq/gitlab-ci/issues/458 See merge request !82
| * | resolve situation with concurent ruuners registrationValery Sizov2015-04-241-1/+6
|/ /
* | Merge branch 'builds_tabs' into 'master'Dmitriy Zaporozhets2015-04-244-0/+66
|\ \ | | | | | | | | | | | | | | | | | | | | | Pending and Running tabs on admin builds page https://dev.gitlab.org/gitlab/gitlab-ci/issues/212 See merge request !81
| * | update changelogValery Sizov2015-04-241-0/+1
| | |
| * | Tabs Pending and Running on admin builds pageValery Sizov2015-04-243-0/+65
| | |
* | | Merge branch 'master' into 'master'Valery Sizov2015-04-241-3/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | grammar fix to readme See merge request !80
| * | | grammar fix to readmeJeff Pelton2015-04-241-3/+2
|/ / /
* | | Merge branch 'refactoring_user_url' into 'master'Dmitriy Zaporozhets2015-04-2317-60/+53
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | Refactoring network related code https://dev.gitlab.org/gitlab/gitlab-ci/issues/139 See merge request !74
| * | refactoring network related coderefactoring_user_urlValery Sizov2015-04-2217-60/+53
| | |
* | | Merge branch 'search_progressbar' into 'master'Valery Sizov2015-04-232-0/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Progressbar for projects search https://dev.gitlab.org/gitlab/gitlab-ci/issues/214 See merge request !79
| * | | progressbar for projects searchValery Sizov2015-04-232-0/+2
|/ / /
View Lorry Controller Status