summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* remove vendor from gitignoreendless_scrollValery Sizov2015-05-192-1/+128
|
* Pager: method renameValery Sizov2015-05-192-5/+4
|
* update changelogValery Sizov2015-05-191-0/+3
|
* search fixValery Sizov2015-05-193-3/+7
|
* fix Sync now btnValery Sizov2015-05-192-1/+4
|
* basic implementation of endless scroll on dashboardValery Sizov2015-05-1910-70/+129
|
* Merge branch 'improve-admin-runner-page' into 'master'Valery Sizov2015-05-151-2/+4
|\ | | | | | | | | | | | | | | Specific runner can not be marked as shared again https://dev.gitlab.org/gitlab/gitlab-ci/issues/195 See merge request !105
| * specific runner can not be marked as shared againValery Sizov2015-05-151-2/+4
|/
* Merge branch 'public_builds' into 'master'Dmitriy Zaporozhets2015-05-1511-34/+79
|\ | | | | | | | | | | | | | | Public accessible build and commit pages https://dev.gitlab.org/gitlab/gitlab-ci/issues/94 See merge request !102
| * update changelogpublic_buildsValery Sizov2015-05-151-0/+1
| |
| * public accessible build and commitValery Sizov2015-05-1510-34/+78
| |
* | 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
View Lorry Controller Status