summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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 '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
| * | Update gitlab_emoji to ~> 0.3.0Robert Speicher2016-02-122-5/+5
| * | Remove unused emoji_autocomplete_source helperRobert Speicher2016-02-121-6/+0
* | | Merge branch 'fix/project-forks-page' into 'master' Douwe Maan2016-02-193-1/+14
|\ \ \
| * | | update based on feedbackJames Lopez2016-02-192-2/+2
| * | | updated fix based on MR feedbackJames Lopez2016-02-175-11/+4
| * | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/project-for...James Lopez2016-02-1751-261/+743
| |\ \ \
| * | | | workaround for forks with an invalid repo - avoid showing them in the listJames Lopez2016-02-163-1/+21
* | | | | Merge branch 'rs-show-owner-label' into 'master' Douwe Maan2016-02-192-9/+19
|\ \ \ \ \
| * | | | | Allow `ProjectTeam#human_max_access` to return "Owner"rs-show-owner-labelRobert Speicher2016-02-182-9/+19
* | | | | | Merge branch 'patch-1' into 'master' Robert Speicher2016-02-191-2/+2
|\ \ \ \ \ \
| * | | | | | number_with_delimiter() addedheiko2016-02-191-2/+2
|/ / / / / /
* | | | | | Merge branch 'patch-1' into 'master' Robert Speicher2016-02-181-1/+1
|\ \ \ \ \ \
| * | | | | | bug found by Charles Sibbald at Sky . Calls with patricio and Jacob confirmed...Richard Pidgeon2016-02-181-1/+1
* | | | | | | Merge branch 'patch-1' into 'master' Robert Speicher2016-02-181-21/+0
|\ \ \ \ \ \ \
| * | | | | | | No changes to nginx config in this update. Removed unnecessary instructions.Brandon Patton2016-02-181-21/+0
* | | | | | | | Merge branch 'revert-2782' into 'master' Douwe Maan2016-02-188-378/+27
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Revert "Merge branch 'saml-decoupling' into 'master' "Douwe Maan2016-02-188-378/+27
|/ / / / / / /
* | | | | | | Merge branch 'rs-sentry-release-tracking' into 'master' Douwe Maan2016-02-182-2/+3
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Add release tracking for Sentryrs-sentry-release-trackingRobert Speicher2016-02-172-2/+3
* | | | | | | Merge branch 'saml-decoupling' into 'master' Robert Speicher2016-02-188-27/+378
|\ \ \ \ \ \ \
| * | | | | | | Decouple SAML authentication from the default Omniauth logicPatricio Cano2016-02-188-27/+378
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'cache-clear' into 'master' Robert Speicher2016-02-182-5/+18
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into cache-c...Jacob Vosmaer2016-02-1864-208/+777
| |\ \ \ \ \ \ \ | | |/ / / / / /
View Lorry Controller Status