summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | Update the example of CE build script.Marin Jankovski2015-03-051-4/+6
|/ / /
* | | Merge branch 'api_correction' into 'master'Valery Sizov2015-03-051-2/+2
|\ \ \ | |/ / |/| | | | | | | | | | | API correction (runner removing) See merge request !130
| * | api correction (runner removing)Valery Sizov2015-03-051-2/+2
|/ /
* | Update db/schemaDmitriy Zaporozhets2015-03-041-1/+1
| |
* | Update poltergeistDmitriy Zaporozhets2015-03-042-7/+7
| |
* | Fix 500 on runners pageDmitriy Zaporozhets2015-03-041-2/+2
| |
* | Write test for 500 error on runners pageDmitriy Zaporozhets2015-03-041-0/+3
| |
* | Merge branch 'scroll-btns' into 'master'Dmitriy Zaporozhets2015-03-043-1/+21
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Add up/down scroll buttons For easier navigation from mobile devices cc @valery See merge request !127
| * | Update CHANGELOGDmitriy Zaporozhets2015-03-041-0/+1
| | |
| * | Add up/down scroll buttonsDmitriy Zaporozhets2015-03-042-1/+20
| | | | | | | | | | | | For easier navigation from mobile devices
* | | Merge branch 'service_creator' into 'master'Valery Sizov2015-03-043-2/+12
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | Initialize services Fixes https://gitlab.com/gitlab-org/gitlab-ci/issues/106 See merge request !125
| * | Initialize servicesValery Sizov2015-03-043-2/+12
|/ /
* | fix random failing specValery Sizov2015-03-041-1/+1
| |
* | Merge branch 'jobs_tabs' into 'master'Dmitriy Zaporozhets2015-03-0415-44/+195
|\ \ | |/ |/| | | | | | | | | | | | | | | Deploy jobs Implements #153 ![joxi_screenshot_1425465268516](https://dev.gitlab.org/gitlab/gitlab-ci/uploads/23960cfff46ac6c7d1d0ded528917306/joxi_screenshot_1425465268516.png) See merge request !124
| * remove bindingValery Sizov2015-03-041-2/+0
| |
| * update changelogValery Sizov2015-03-021-1/+2
| |
| * Deploy jobsValery Sizov2015-03-0214-44/+196
| |
* | Merge branch 'token_instruction_page' into 'master'Dmitriy Zaporozhets2015-03-031-1/+3
|\ \ | | | | | | | | | | | | | | | | | | | | | Token instruction page: improve with url Fixes #156 See merge request !119
| * | token instruction page: improve with urlValery Sizov2015-03-031-1/+3
| |/
* | Fix changelogValeriy Sizov2015-03-031-3/+3
| |
* | Merge pull request #553 from jvanbaarsen/fix-295Valeriy Sizov2015-03-032-1/+8
|\ \ | | | | | | Only update trace when trace is given
| * | Only update trace when trace is givenJeroen van Baarsen2015-02-282-1/+8
| | | | | | | | | | | | | | | | | | Fixes #295 Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
* | | Merge pull request #558 from qqshfox/patch-1Valeriy Sizov2015-03-031-2/+2
|\ \ \ | | | | | | | | Fix coverage for a commit having more than one build
| * | | Fix coverage for a commit having more than one buildHanfei Shen2015-03-021-2/+2
| | | |
* | | | Merge branch 'master' of github.com:gitlabhq/gitlab-ciValery Sizov2015-03-0315-70/+100
|\ \ \ \
| * \ \ \ Merge pull request #556 from jvanbaarsen/rails-upgradeDmitriy Zaporozhets2015-03-0215-70/+100
| |\ \ \ \ | | |/ / / | |/| | | Upgrade to rails 4.1.9
| | * | | Upgrade to rails 4.1.9Jeroen van Baarsen2015-02-2815-70/+100
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
* | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ciValery Sizov2015-03-0318-23/+349
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Merge branch 'feature_project_jobs_rest_api-1' into 'master'Valery Sizov2015-03-035-15/+265
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implemented api for project jobs with working tests and updated doc The rest API allows you to manipulate a project on gitlab-ci but there is no way to manipulate build jobs through the api. I tested it, implemented truly working tests & updated documentation http://feedback.gitlab.com/forums/176466-general/suggestions/7068630-expose-the-job-api-to-the-rest-api See merge request !39
| | * | | Fixed test for the projects jobs apiMichel Courtine2015-02-241-4/+12
| | | | |
| | * | | project jobs api: exposed active, build_branches, build_tags, tags. ↵Michel Courtine2015-02-124-4/+30
| | | | | | | | | | | | | | | | | | | | Implemented tests and updated documentation
| | * | | Implemented api for project jobs with working tests and updated docMichel Courtine2015-02-115-16/+231
| | | | |
| * | | | Merge pull request #550 from jvanbaarsen/redirect-to-root-when-valid-configJeroen van Baarsen2015-02-283-3/+17
| |\ \ \ \ | | |_|/ / | |/| | | Redirect to root path when application.yml config is valid
| | * | | Redirect to root path when application.yml config is validJeroen van Baarsen2015-02-283-3/+17
| | | |/ | | |/|
| * | | Merge pull request #555 from jvanbaarsen/rails-4-binstubsJeroen van Baarsen2015-02-287-0/+53
| |\ \ \ | | |/ / | |/| | Added the rails 4 binstubs and injected spring
| | * | Added the rails 4 binstubs and injected springJeroen van Baarsen2015-02-287-0/+53
| |/ / | | | | | | | | | | | | | | | | | | | | | * Added rails 4 binstubs with `rake rails:update:bin` * Injected spring all of them with `spring binstub --all` * Added Byebug for easier debugging Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
| * | Merge pull request #554 from jvanbaarsen/fix-testsJeroen van Baarsen2015-02-283-5/+14
| |\ \ | | | | | | | | Semaphore does not like real git fetching, stub out the call
| | * | Semaphore does not like real git fetching, stub out the callJeroen van Baarsen2015-02-283-5/+14
| |/ / | | | | | | | | | Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
* | | Merge branch 'update_changelog1' into 'master'Valery Sizov2015-02-271-1/+2
|\ \ \ | |/ / |/| | | | | | | | | | | Update changelog See merge request !123
| * | update changelogValery Sizov2015-02-271-1/+2
|/ /
* | Merge branch 'fix_show_button' into 'master'Dmitriy Zaporozhets2015-02-261-4/+5
|\ \ | | | | | | | | | | | | | | | | | | | | | Hide edit btn if use does not have permissions Fixes #159 See merge request !121
| * | Hide edit btn if use does not have permissionsValery Sizov2015-02-261-4/+5
| | |
* | | Merge branch 'delete_runner_endpoint' into 'master'Dmitriy Zaporozhets2015-02-264-1/+47
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | Delete runner endpoint Fixes #152 See merge request !122
| * | delete runner endpointValery Sizov2015-02-264-1/+47
|/ /
* | Merge branch 'ui_improvements' into 'master'Dmitriy Zaporozhets2015-02-251-2/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | Fix buttons color Fixes #158 See merge request !117
| * | Fix buttons colorValery Sizov2015-02-251-2/+2
| | |
* | | Merge branch 'ui_improvements_btn_name' into 'master'Dmitriy Zaporozhets2015-02-252-4/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Button edit job instead of edit project Fixes #157 See merge request !118
| * | | button edit job instead of edit projectValery Sizov2015-02-252-4/+4
| |/ /
* | | Merge branch 'rubocop' into 'master'Dmitriy Zaporozhets2015-02-2520-73/+1091
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | Rubocop install Fixes #154 See merge request !120
| * | rubocop installValery Sizov2015-02-2520-73/+1091
|/ /