Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'ce/master' into rc/ce-upstream | Rémy Coutable | 2017-01-25 | 3 | -3/+4 |
|\ | |||||
| * | Merge branch 'dz-nested-groups-access-improvements' into 'master' | Dmitriy Zaporozhets | 2017-01-25 | 1 | -1/+1 |
| |\ | |||||
| | * | Refactor Namespace code related to nested groups | Dmitriy Zaporozhets | 2017-01-13 | 1 | -1/+1 |
| * | | Merge branch 'tc-only-mr-button-if-allowed' into 'master' | Sean McGivern | 2017-01-25 | 1 | -1/+1 |
| |\ \ | |||||
| | * | | `can?` already includes the `feature_available?` checktc-only-mr-button-if-allowed | Toon Claes | 2017-01-25 | 1 | -1/+0 |
| | * | | Only show Merge Request button when user can create a MR | Toon Claes | 2017-01-20 | 1 | -0/+1 |
| * | | | hide the version check image if internet connection is broken | Ken Ding | 2017-01-25 | 1 | -1/+2 |
* | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ce-upstream | Valery Sizov | 2017-01-24 | 1 | -9/+11 |
|\ \ \ \ | |/ / / | |||||
| * | | | adds test suite22974-trigger-service-events-through-api | Tiago Botelho | 2017-01-22 | 1 | -0/+2 |
| * | | | adds events to services api deserialization | Tiago Botelho | 2017-01-22 | 1 | -9/+9 |
| * | | | Merge branch '26138-combine-webhooks-and-services-settings-pages' into 'master' | Rémy Coutable | 2017-01-20 | 1 | -0/+4 |
| |\ \ \ | |||||
| | * | | | Corrected code style and titles | Jose Ivan Vargas | 2017-01-18 | 1 | -0/+1 |
| | * | | | Moved the webhooks and services gear options to a single one called integrations | Jose Ivan Vargas | 2017-01-18 | 1 | -0/+3 |
* | | | | | Merge branch 'ce-to-ee' into 'master' | Rémy Coutable | 2017-01-20 | 4 | -1/+27 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | Merge remote-tracking branch 'ce/master' into ce-to-ee-2 | Nick Thomas | 2017-01-20 | 4 | -1/+27 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Merge branch '24032-changed-visibility-level-to-public-but-project-is-not-pub... | Fatih Acet | 2017-01-19 | 1 | -0/+11 |
| | |\ \ \ \ | |||||
| | | * | | | | Fixed tests24032-changed-visibility-level-to-public-but-project-is-not-public | Luke "Jared" Bennett | 2016-12-10 | 1 | -0/+11 |
| | * | | | | | Merge branch '23524-notify-automerge-user-of-failed-build' into 'master' | Sean McGivern | 2017-01-19 | 1 | -1/+2 |
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | | | | |||||
| | | * | | | | Notify the user who set auto-merge when merge conflict occurs | twonegatives | 2017-01-14 | 1 | -0/+1 |
| | | * | | | | Notify the user who set auto-merge when a build fails | twonegatives | 2016-12-16 | 1 | -1/+1 |
| | * | | | | | Merge branch 'backport-time-tracking-ce' into 'master' | Douwe Maan | 2017-01-18 | 1 | -0/+9 |
| | |\ \ \ \ \ | | | |_|_|/ / | | |/| | | | | |||||
| | | * | | | | Backport backend work for time tracking. | Ruben Davila | 2017-01-15 | 1 | -0/+9 |
| | | | |_|/ | | | |/| | | |||||
| | * | | | | Merge branch '24915_merge_slash_command' into 'master' | Sean McGivern | 2017-01-17 | 1 | -0/+8 |
| | |\ \ \ \ | |||||
| | | * | | | | Address MR comments | Jarka Kadlecova | 2017-01-13 | 1 | -0/+8 |
| | * | | | | | Merge branch 'issue_25017' into 'master' | Sean McGivern | 2017-01-17 | 1 | -0/+6 |
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | | | | |||||
| | | * | | | | Show 'too many changes' message for merge requestissue_25017 | Felipe Artur | 2017-01-12 | 1 | -0/+6 |
* | | | | | | | Merge branch '26138-combine-webhooks-and-services-settings-pages-ee' into 'ma... | Rémy Coutable | 2017-01-20 | 1 | -0/+4 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | Port of 26138-combine-webhooks-and-services-settings-pages to EE | Jose Ivan Vargas | 2017-01-19 | 1 | -0/+4 |
* | | | | | | | Rename shared_runners_minutes to be shared_runners_seconds when calculating data | Kamil Trzcinski | 2017-01-19 | 1 | -2/+2 |
* | | | | | | | Merge branch 'introduce-build-minutes' into 'master' | Douwe Maan | 2017-01-19 | 1 | -0/+47 |
* | | | | | | | Revert "Merge branch 'introduce-build-minutes' into 'master'" | Kamil Trzciński | 2017-01-19 | 1 | -47/+0 |
* | | | | | | | Merge branch 'introduce-build-minutes' into 'master' | Douwe Maan | 2017-01-19 | 1 | -0/+47 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | Merge remote-tracking branch 'origin-ee/master' into introduce-build-minutes | Kamil Trzcinski | 2017-01-18 | 16 | -145/+133 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | remove redundant integer typecasting | Mike Greiling | 2017-01-04 | 1 | -2/+2 |
| * | | | | | | | move ee-specific helpers to their own file | Mike Greiling | 2017-01-04 | 2 | -44/+47 |
| * | | | | | | | Update tests | Kamil Trzcinski | 2016-12-20 | 1 | -1/+1 |
| * | | | | | | | Introduce actual_shared_runners_minutes_limit | Kamil Trzcinski | 2016-12-20 | 1 | -3/+3 |
| * | | | | | | | Move _used to helper | Kamil Trzcinski | 2016-12-20 | 1 | -0/+6 |
| * | | | | | | | Merge remote-tracking branch 'origin-ee/master' into introduce-build-minutes | Kamil Trzcinski | 2016-12-20 | 13 | -45/+145 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | add group shared runner usage overview page | Mike Greiling | 2016-12-20 | 1 | -0/+22 |
| * | | | | | | | | add helper to display current shared runner quota usage | Mike Greiling | 2016-12-18 | 1 | -0/+16 |
* | | | | | | | | | Merge branch 'master' into approval-integration | Sean McGivern | 2017-01-16 | 1 | -1/+4 |
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | |||||
| * | | | | | | | | Add weight filter | Clement Ho | 2017-01-13 | 1 | -1/+2 |
| * | | | | | | | | Merge remote-tracking branch 'gitlab-ce/master' into ce-to-ee | James Lopez | 2017-01-13 | 1 | -0/+2 |
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | | | |||||
| | * | | | | | | | Add username to page_filter_path | Clement Ho | 2017-01-09 | 1 | -0/+2 |
| | | |_|_|/ / / | | |/| | | | | | |||||
* | | | | | | | | Merge branch 'master' into approval-integration | Bryce Johnson | 2017-01-11 | 25 | -189/+274 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | Merge remote-tracking branch 'gitlab-ce/master' into ce-to-ee | James Lopez | 2017-01-09 | 5 | -66/+52 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |||||
| | * | | | | | | Merge branch '25985-combine-members-and-groups-settings-pages' into 'master' | Alfredo Sumaran | 2017-01-06 | 2 | -1/+6 |
| | |\ \ \ \ \ \ | |||||
| | | * | | | | | | Fixed es6 lint errors, and reverted a change to a helper | Jose Ivan Vargas | 2017-01-03 | 1 | -1/+1 |
| | | * | | | | | | Updated the "users" to "members" matches in the view | Jose Ivan Vargas | 2017-01-03 | 1 | -1/+1 |