Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix runners filtering in API | Tomasz Maczukin | 2016-02-19 | 2 | -20/+27 |
* | Add missing methods documentation; fix rubocop reported violation | Tomasz Maczukin | 2016-02-19 | 1 | -1/+36 |
* | Add feature to enable/disable runner in project | Tomasz Maczukin | 2016-02-19 | 2 | -0/+128 |
* | Add basic runners management API | Tomasz Maczukin | 2016-02-19 | 5 | -0/+398 |
* | Merge branch 'web_editor' into 'master' | Achilleas Pipinellis | 2016-02-19 | 17 | -16/+110 |
|\ | |||||
| * | Update web editor documentationweb_editor | Achilleas Pipinellis | 2016-02-10 | 17 | -16/+110 |
* | | Merge branch '12791-hide-project-limit-reached-warning' into 'master' | Douwe Maan | 2016-02-19 | 2 | -1/+2 |
|\ \ | |||||
| * | | Project limit is reached warning is hidden when the projects_limit is zero | Zeger-Jan van de Weg | 2016-02-19 | 2 | -1/+2 |
|/ / | |||||
* | | Merge branch 'rs-emoji' into 'master' | Douwe Maan | 2016-02-19 | 13 | -3113/+20165 |
|\ \ | |||||
| * | | Update Emoji sprite and its SCSS for new stylesrs-emoji | Robert Speicher | 2016-02-17 | 2 | -1269/+1723 |
| * | | Update fixtures/emojis/aliases.json | Robert Speicher | 2016-02-15 | 2 | -3/+153 |
| * | | Update fixtures/emojis/index.json | Robert Speicher | 2016-02-15 | 1 | -1823/+18276 |
| * | | Fix specs expecting `emoji/` in image path | Robert Speicher | 2016-02-13 | 2 | -3/+3 |
| * | | Update Emoji asset path | Robert Speicher | 2016-02-12 | 3 | -4/+5 |
| * | | Update gitlab_emoji to ~> 0.3.0 | Robert Speicher | 2016-02-12 | 2 | -5/+5 |
| * | | Remove unused emoji_autocomplete_source helper | Robert Speicher | 2016-02-12 | 1 | -6/+0 |
* | | | Merge branch 'fix/project-forks-page' into 'master' | Douwe Maan | 2016-02-19 | 3 | -1/+14 |
|\ \ \ | |||||
| * | | | update based on feedback | James Lopez | 2016-02-19 | 2 | -2/+2 |
| * | | | updated fix based on MR feedback | James Lopez | 2016-02-17 | 5 | -11/+4 |
| * | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/project-for... | James Lopez | 2016-02-17 | 51 | -261/+743 |
| |\ \ \ | |||||
| * | | | | workaround for forks with an invalid repo - avoid showing them in the list | James Lopez | 2016-02-16 | 3 | -1/+21 |
* | | | | | Merge branch 'rs-show-owner-label' into 'master' | Douwe Maan | 2016-02-19 | 2 | -9/+19 |
|\ \ \ \ \ | |||||
| * | | | | | Allow `ProjectTeam#human_max_access` to return "Owner"rs-show-owner-label | Robert Speicher | 2016-02-18 | 2 | -9/+19 |
* | | | | | | Merge branch 'patch-1' into 'master' | Robert Speicher | 2016-02-19 | 1 | -2/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | number_with_delimiter() added | heiko | 2016-02-19 | 1 | -2/+2 |
|/ / / / / / | |||||
* | | | | | | Merge branch 'patch-1' into 'master' | Robert Speicher | 2016-02-18 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | bug found by Charles Sibbald at Sky . Calls with patricio and Jacob confirmed... | Richard Pidgeon | 2016-02-18 | 1 | -1/+1 |
* | | | | | | | Merge branch 'patch-1' into 'master' | Robert Speicher | 2016-02-18 | 1 | -21/+0 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | No changes to nginx config in this update. Removed unnecessary instructions. | Brandon Patton | 2016-02-18 | 1 | -21/+0 |
* | | | | | | | | Merge branch 'revert-2782' into 'master' | Douwe Maan | 2016-02-18 | 8 | -378/+27 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||||
| * | | | | | | | Revert "Merge branch 'saml-decoupling' into 'master' " | Douwe Maan | 2016-02-18 | 8 | -378/+27 |
|/ / / / / / / | |||||
* | | | | | | | Merge branch 'rs-sentry-release-tracking' into 'master' | Douwe Maan | 2016-02-18 | 2 | -2/+3 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | |||||
| * | | | | | | Add release tracking for Sentryrs-sentry-release-tracking | Robert Speicher | 2016-02-17 | 2 | -2/+3 |
* | | | | | | | Merge branch 'saml-decoupling' into 'master' | Robert Speicher | 2016-02-18 | 8 | -27/+378 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Decouple SAML authentication from the default Omniauth logic | Patricio Cano | 2016-02-18 | 8 | -27/+378 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'cache-clear' into 'master' | Robert Speicher | 2016-02-18 | 2 | -5/+18 |
|\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into cache-c... | Jacob Vosmaer | 2016-02-18 | 64 | -208/+777 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |||||
| * | | | | | | | Use SCAN during 'rake cache:clear'cache-clear | Jacob Vosmaer | 2016-02-18 | 2 | -5/+18 |
* | | | | | | | | Merge branch 'autocrlf-lazy' into 'master' | Robert Speicher | 2016-02-18 | 2 | -11/+71 |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | |||||
| * | | | | | | | Handle raw_repository returning nil in exists?autocrlf-lazy | Yorick Peterse | 2016-02-18 | 2 | -0/+8 |
| * | | | | | | | Use Repository#exists? in Repository#commit? | Yorick Peterse | 2016-02-18 | 1 | -1/+1 |
| * | | | | | | | Added specs for Repository#exists? | Yorick Peterse | 2016-02-18 | 1 | -0/+13 |
| * | | | | | | | Fixed Repository#exists? to handle errors | Yorick Peterse | 2016-02-18 | 1 | -6/+5 |
| * | | | | | | | Only set autocrlf when creating/updating files | Yorick Peterse | 2016-02-18 | 2 | -5/+45 |
* | | | | | | | | Merge branch 'bugfix/jschatz1/sidebar-fixes/02-18-16' into 'master' | Dmitriy Zaporozhets | 2016-02-18 | 2 | -16/+2 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Uses cross browser niceScroll to do scrolling on sidebar. | Jacob Schatz | 2016-02-18 | 2 | -16/+2 |
|/ / / / / / / / | |||||
* | | | | | | | | Merge branch 'fix/ci-first-job-allow-failure' into 'master' | Kamil TrzciĆski | 2016-02-18 | 7 | -3/+117 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Add specs covering bug in build allowed to fail case | Grzegorz Bizon | 2016-02-18 | 1 | -0/+29 |
| * | | | | | | | | Add Changelog entry for builds scheduler fixfix/ci-first-job-allow-failure | Grzegorz Bizon | 2016-02-18 | 1 | -0/+1 |
| * | | | | | | | | Fix builds scheduler when first build is allowed to fail | Grzegorz Bizon | 2016-02-18 | 3 | -3/+33 |