summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix missing ignored? for GenericCommitStatuscommit-status-fixKamil Trzcinski2016-02-193-29/+33
* Merge branch 'ci/api-runners' into 'master' Kamil TrzciƄski2016-02-1914-26/+1008
|\
| * Rename Entities::ForkedFromProject to Entities::BasicProjectDetailsTomasz Maczukin2016-02-191-3/+3
| * Add CHANGELOG entryTomasz Maczukin2016-02-191-0/+1
| * Fix old usages of `ci_runner` factoryTomasz Maczukin2016-02-194-17/+17
| * Refactorize `ci_runner` factory and `let` definitions in runners API specTomasz Maczukin2016-02-192-22/+18
| * Change `last_contact` to `contacted_at`Tomasz Maczukin2016-02-192-3/+3
| * Replace Entities::RunnerProjectDetails with Entities::ForkedFromProjectTomasz Maczukin2016-02-192-7/+5
| * Remove unnecessary parametersTomasz Maczukin2016-02-191-5/+5
| * Modify expectations for update runner featureTomasz Maczukin2016-02-191-4/+4
| * Change `.map{...}.inject{...}` to `any?{...}` for searching shared runnersTomasz Maczukin2016-02-191-5/+5
| * Reorganize `let` statements in spec/requests/api/runners_spec.rbTomasz Maczukin2016-02-191-12/+29
| * Change interpolation to named placeholder in owned_or_shared scopeTomasz Maczukin2016-02-191-1/+1
| * iChange `name` and `path` to `name_with_namespace` and `path_with_namespace` ...Tomasz Maczukin2016-02-192-6/+6
| * Update docummentation - specific runner enablingTomasz Maczukin2016-02-191-2/+2
| * Move :runner_id param to POST body when enabling specific runner in projectTomasz Maczukin2016-02-192-9/+17
| * Add some modifications to spec/requests/api/runners_spec.rbTomasz Maczukin2016-02-191-88/+112
| * Modify and fix output of delete and update of a runnerTomasz Maczukin2016-02-192-8/+10
| * Modify runner projects selecting method in runners APITomasz Maczukin2016-02-192-8/+4
| * Fix runners filteringTomasz Maczukin2016-02-192-4/+8
| * GET /runners is for specific runners onlyAchilleas Pipinellis2016-02-191-3/+3
| * Limit projects to user available projects if user is not an adminTomasz Maczukin2016-02-192-2/+12
| * Modify authentication check methods in runners APITomasz Maczukin2016-02-191-24/+22
| * Add token to runner details output in APITomasz Maczukin2016-02-193-1/+3
| * More fixes in runners docAchilleas Pipinellis2016-02-191-8/+13
| * Correct PRIVATE-TOKEN to use dash instead of underscoreAchilleas Pipinellis2016-02-191-8/+8
| * Note that `ci/api/runners.rb` is still usedAchilleas Pipinellis2016-02-191-2/+3
| * Add associated project info to runner details outputTomasz Maczukin2016-02-192-0/+14
| * Fix runners API specTomasz Maczukin2016-02-191-11/+11
| * Split `/runners` entrypoint to `/runners` and `/runners/all`Tomasz Maczukin2016-02-193-22/+108
| * Add some fixes in runners API documentationTomasz Maczukin2016-02-192-6/+6
| * Add `Example response` above each json outputAchilleas Pipinellis2016-02-191-7/+21
| * Add note of deprecation in old Runners CI APIAchilleas Pipinellis2016-02-191-1/+4
| * Add runners API documentation [ci-skip]Tomasz Maczukin2016-02-192-0/+235
| * Fix runners filtering in APITomasz Maczukin2016-02-192-20/+27
| * Add missing methods documentation; fix rubocop reported violationTomasz Maczukin2016-02-191-1/+36
| * Add feature to enable/disable runner in projectTomasz Maczukin2016-02-192-0/+128
| * Add basic runners management APITomasz Maczukin2016-02-195-0/+398
* | Merge branch 'issue_11872' into 'master' Jacob Schatz2016-02-192-17/+13
|\ \ | |/ |/|
| * Move visibility icon next to project titleissue_11872Alfredo Sumaran2016-02-182-17/+13
* | Merge branch 'web_editor' into 'master' Achilleas Pipinellis2016-02-1917-16/+110
|\ \
| * | Update web editor documentationweb_editorAchilleas Pipinellis2016-02-1017-16/+110
* | | Merge branch '12791-hide-project-limit-reached-warning' into 'master' Douwe Maan2016-02-192-1/+2
|\ \ \
| * | | Project limit is reached warning is hidden when the projects_limit is zeroZeger-Jan van de Weg2016-02-192-1/+2
|/ / /
* | | Merge branch 'rs-emoji' into 'master' Douwe Maan2016-02-1913-3113/+20165
|\ \ \
| * | | Update Emoji sprite and its SCSS for new stylesrs-emojiRobert Speicher2016-02-172-1269/+1723
| * | | Update fixtures/emojis/aliases.jsonRobert Speicher2016-02-152-3/+153
| * | | Update fixtures/emojis/index.jsonRobert Speicher2016-02-151-1823/+18276
| * | | Fix specs expecting `emoji/` in image pathRobert Speicher2016-02-132-3/+3
| * | | Update Emoji asset pathRobert Speicher2016-02-123-4/+5