summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* update changelogrunners_ui_fixValery Sizov2015-05-191-1/+4
|
* fix runners page UIValery Sizov2015-05-153-4/+1
|
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ciDmitriy Zaporozhets2015-05-1416-9/+150
|\
| * Merge branch 'pagination_bug' into 'master'Dmitriy Zaporozhets2015-05-142-1/+2
| |\ | | | | | | | | | | | | | | | | | | | | | Add order option to projects API call https://dev.gitlab.org/gitlab/gitlab-ci/issues/222 See merge request !101
| | * update changelogpagination_bugValery Sizov2015-05-141-0/+1
| | |
| | * Add order option to projects API callValery Sizov2015-05-141-1/+1
| |/
| * Merge branch 'doc_migration_to_omnibus' into 'master'Sytse Sijbrandij2015-05-142-0/+30
| |\ | | | | | | | | | | | | | | | | | | | | | Doc: Migrating to packaged CI https://dev.gitlab.org/gitlab/gitlab-ci/issues/116 See merge request !100
| | * Doc: Migrating to packaged CIdoc_migration_to_omnibusValery Sizov2015-05-132-0/+30
| | |
| * | fix TYPOValery Sizov2015-05-131-1/+1
| | |
| * | Merge branch 'save_info_from_runner' into 'master'Dmitriy Zaporozhets2015-05-1313-8/+118
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | Storing runner info https://dev.gitlab.org/gitlab/gitlab-ci/issues/223 ![Screenshot_2015-05-12_19.42.52](https://gitlab.com/gitlab-org/gitlab-ci/uploads/32fa390a8b2abf1f1103f4fd7b3475c0/Screenshot_2015-05-12_19.42.52.png) See merge request !98
| | * storing runner infosave_info_from_runnerValery Sizov2015-05-1213-8/+118
| | |
* | | Merge branch 'master' of github.com:gitlabhq/gitlab-ciDmitriy Zaporozhets2015-05-141-1/+1
|\ \ \ | |/ / |/| |
| * | Merge pull request #592 from maqnouch/patch-1Jeroen van Baarsen2015-05-071-1/+1
| |\ \ | | | | | | | | Updated copyright to 2015
| | * | Updated copyright to 2015AQNOUCH Mohammed2015-05-071-1/+1
| |/ /
* | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlab-ciValery Sizov2015-05-1311-1/+547
|\ \ \
| * \ \ Merge branch 'backup' into 'master'Sytse Sijbrandij2015-05-0811-1/+547
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backup/Restore && Documentation https://dev.gitlab.org/gitlab/gitlab-ci/issues/116 I created MR here because it looks like Gitlab.com sidekiq does not work there. See merge request !154
| | * | improve documentation for backupValery Sizov2015-05-081-2/+2
| | | |
| | * | added scheduling backup to doc[ci skip]Valery Sizov2015-05-081-27/+57
| | | |
| | * | move backup document to raketasksValery Sizov2015-05-083-2/+5
| | | |
| | * | fix grammarValery Sizov2015-05-071-1/+1
| | | |
| | * | backup cross-linkingValery Sizov2015-05-071-3/+5
| | | |
| | * | using gzip for backupValery Sizov2015-05-071-8/+8
| | | |
| | * | documentation for backup/restore rake taskValery Sizov2015-05-063-0/+203
| | | |
| | * | backup/restore rake taskValery Sizov2015-05-067-0/+308
| |/ /
* | | Merge branch 'fix_dashboard' into 'master'Valery Sizov2015-05-121-1/+0
|\ \ \ | |_|/ |/| | | | | | | | | | | Remove project ID from dashboard for public projects See merge request !99
| * | remove dashboard project IDValery Sizov2015-05-121-1/+0
|/ /
* | 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
View Lorry Controller Status