summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* release 5.1v5.1.05-1-stableValery Sizov2014-10-235-5/+47
|
* Merge branch 'admin-builds-page'Dmitriy Zaporozhets2014-10-227-0/+85
|\ | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: CHANGELOG
| * New feature: All builds page for admin userDmitriy Zaporozhets2014-10-227-0/+85
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'cron_comment' into 'master'Dmitriy Zaporozhets2014-10-221-0/+3
|\ \ | | | | | | | | | | | | | | | Add a comment about Whenever and omnibus packages See merge request !75
| * | Add a comment about Whenever and omnibus packagesJacob Vosmaer2014-10-211-0/+3
| |/
* | Also add Sameer his docker image.Sytse Sijbrandij2014-10-221-1/+2
| |
* | Merge branch 'master' of github.com:gitlabhq/gitlab-ciSytse Sijbrandij2014-10-221-0/+1
|\ \
| * \ Merge pull request #483 from anapsix/patch-1Sytse Sijbrandij2014-10-171-0/+1
| |\ \ | | |/ | |/| Docker Image mention
| | * Docker Image mentionAnastas Dancha2014-10-171-0/+1
| |/ | | | | | | | | As per conversation with @dosire, I'l like to add the mention of the GitLab-CI Docker image I've build. I'm not exactly sure how you'd like to word it or section to place it within, so feel free to throw this away and use your own wording... Thanks GitLabHQ
* | Merge branch 'revision_file' into 'master'Dmitriy Zaporozhets2014-10-212-1/+11
|\ \ | |/ |/| | | | | | | Look for a REVISION file before running `git log` See merge request !76
| * Look for a REVISION file before running `git log`Jacob Vosmaer2014-10-212-1/+11
|/
* rc1Dmitriy Zaporozhets2014-10-091-1/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Mention rails update in changelogDmitriy Zaporozhets2014-10-091-0/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch 'update-gems' into 'master'Dmitriy Zaporozhets2014-10-092-44/+31
|\ | | | | | | | | | | Update gems See merge request !74
| * Remove unused gemsDmitriy Zaporozhets2014-10-092-8/+0
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Update rails to 4.0.10Dmitriy Zaporozhets2014-10-092-36/+31
|/ | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Return build coverage in jsonDmitriy Zaporozhets2014-10-021-1/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Fix testsDmitriy Zaporozhets2014-10-011-2/+2
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Smaller label for coverage columnDmitriy Zaporozhets2014-10-011-1/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch 'coverage-parser' into 'master'Dmitriy Zaporozhets2014-10-0111-3/+102
|\ | | | | | | | | | | | | | | Coverage parser feature Fixes #112 See merge request !73
| * Add coverage feature to changelogDmitriy Zaporozhets2014-10-011-0/+1
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Show test coverage on build page and builds pageDmitriy Zaporozhets2014-10-013-0/+13
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Implement parsing and set coverage after build finishedDmitriy Zaporozhets2014-10-014-2/+75
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * Prepare db for build coverage featureDmitriy Zaporozhets2014-10-013-1/+13
|/ | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Fix build triggerDmitriy Zaporozhets2014-10-012-3/+7
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Fix GitLab CI for ruby 2.1.3Dmitriy Zaporozhets2014-10-012-9/+10
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch 'better-githost-script' into 'master'Dmitriy Zaporozhets2014-10-011-26/+8
|\ | | | | | | | | | | Better githost script See merge request !72
| * Cleanup githost example scriptDmitriy Zaporozhets2014-10-011-26/+8
|/ | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Use coveralls envDmitriy Zaporozhets2014-09-301-1/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Update the url to the builds.Sytse Sijbrandij2014-09-291-1/+1
|
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ciSytse Sijbrandij2014-09-290-0/+0
|\ | | | | | | | | Conflicts: doc/examples/build_script_gitlab_ce.md
| * Merge branch 'fix_githost_docs' into 'master'Sytse Sijbrandij2014-09-191-2/+0
| |\ | | | | | | | | | | | | | | | | | | | | | Fix githost docs Removing extra rake call that doesn't need to be there. Rake test handles gitlab shell install. See merge request !9
| | * Remove duplicate rake taskJosh Frye2014-09-191-2/+0
| |/
* | After creating the database no migration is needed.Sytse Sijbrandij2014-09-291-1/+1
|/
* Merge branch 'githost-io-build-script' into 'master'Dmitriy Zaporozhets2014-09-191-1/+50
|\ | | | | | | | | | | Githost io build script See merge request !71
| * Add GitHost.io build script.Sytse Sijbrandij2014-09-191-1/+50
|/
* Merge pull request #475 from williamherry/feature/skip_build_for_branchDmitriy Zaporozhets2014-09-107-3/+20
|\ | | | | make gitlab_ci able to skip refs from build
| * make gitlab_ci able to skip refs from buildWilliam Herry2014-09-107-3/+20
|/
* Merge pull request #473 from qwazerty/project_api_paginationDmitriy Zaporozhets2014-09-071-2/+6
|\ | | | | Add pagination to project API
| * Add pagination to project APIKevin Houdebert2014-09-071-2/+6
|/
* It's GitLab CI and not GitLabRobert Schilling2014-09-011-9/+5
|
* Merge pull request #424 from thomwiggers/patch-2Jeroen van Baarsen2014-08-151-3/+3
|\ | | | | Remove -y on dependencies
| * Remove -y on dependenciesThom Wiggers2014-04-251-3/+3
| | | | | | Otherwise blindly pasting them might have unintended side-effects, like uninstalling alternatives to postfix.
* | Merge branch 'master' of github.com:gitlabhq/gitlab-ciDmitriy Zaporozhets2014-08-111-0/+54
|\ \
| * \ Merge pull request #443 from Aigeruth/coverage/models_networkDmitriy Zaporozhets2014-07-261-0/+54
| |\ \ | | | | | | | | Add tests for Network model.
| | * | Add tests for Network model.Gabor Nagy2014-07-091-0/+54
| |/ /
* | | Dont show archived projectsDmitriy Zaporozhets2014-08-113-2/+5
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Show spinner when paginate GitLab projectsDmitriy Zaporozhets2014-08-111-7/+14
|/ / | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Mention changed resque.yml file in update docsDmitriy Zaporozhets2014-07-091-1/+5
| |
* | Fix testsDmitriy Zaporozhets2014-07-091-1/+4
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>