summaryrefslogtreecommitdiff
path: root/app/helpers
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'ce/master' into rc/ce-upstreamRémy Coutable2017-01-253-3/+4
|\
| * Merge branch 'dz-nested-groups-access-improvements' into 'master' Dmitriy Zaporozhets2017-01-251-1/+1
| |\
| | * Refactor Namespace code related to nested groupsDmitriy Zaporozhets2017-01-131-1/+1
| * | Merge branch 'tc-only-mr-button-if-allowed' into 'master' Sean McGivern2017-01-251-1/+1
| |\ \
| | * | `can?` already includes the `feature_available?` checktc-only-mr-button-if-allowedToon Claes2017-01-251-1/+0
| | * | Only show Merge Request button when user can create a MRToon Claes2017-01-201-0/+1
| * | | hide the version check image if internet connection is brokenKen Ding2017-01-251-1/+2
* | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ce-upstreamValery Sizov2017-01-241-9/+11
|\ \ \ \ | |/ / /
| * | | adds test suite22974-trigger-service-events-through-apiTiago Botelho2017-01-221-0/+2
| * | | adds events to services api deserializationTiago Botelho2017-01-221-9/+9
| * | | Merge branch '26138-combine-webhooks-and-services-settings-pages' into 'master' Rémy Coutable2017-01-201-0/+4
| |\ \ \
| | * | | Corrected code style and titlesJose Ivan Vargas2017-01-181-0/+1
| | * | | Moved the webhooks and services gear options to a single one called integrationsJose Ivan Vargas2017-01-181-0/+3
* | | | | Merge branch 'ce-to-ee' into 'master' Rémy Coutable2017-01-204-1/+27
|\ \ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'ce/master' into ce-to-ee-2Nick Thomas2017-01-204-1/+27
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge branch '24032-changed-visibility-level-to-public-but-project-is-not-pub...Fatih Acet2017-01-191-0/+11
| | |\ \ \ \
| | | * | | | Fixed tests24032-changed-visibility-level-to-public-but-project-is-not-publicLuke "Jared" Bennett2016-12-101-0/+11
| | * | | | | Merge branch '23524-notify-automerge-user-of-failed-build' into 'master' Sean McGivern2017-01-191-1/+2
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | | * | | | Notify the user who set auto-merge when merge conflict occurstwonegatives2017-01-141-0/+1
| | | * | | | Notify the user who set auto-merge when a build failstwonegatives2016-12-161-1/+1
| | * | | | | Merge branch 'backport-time-tracking-ce' into 'master' Douwe Maan2017-01-181-0/+9
| | |\ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | | * | | | Backport backend work for time tracking.Ruben Davila2017-01-151-0/+9
| | | | |_|/ | | | |/| |
| | * | | | Merge branch '24915_merge_slash_command' into 'master' Sean McGivern2017-01-171-0/+8
| | |\ \ \ \
| | | * | | | Address MR commentsJarka Kadlecova2017-01-131-0/+8
| | * | | | | Merge branch 'issue_25017' into 'master' Sean McGivern2017-01-171-0/+6
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | | * | | | Show 'too many changes' message for merge requestissue_25017Felipe Artur2017-01-121-0/+6
* | | | | | | Merge branch '26138-combine-webhooks-and-services-settings-pages-ee' into 'ma...Rémy Coutable2017-01-201-0/+4
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Port of 26138-combine-webhooks-and-services-settings-pages to EEJose Ivan Vargas2017-01-191-0/+4
* | | | | | | Rename shared_runners_minutes to be shared_runners_seconds when calculating dataKamil Trzcinski2017-01-191-2/+2
* | | | | | | Merge branch 'introduce-build-minutes' into 'master' Douwe Maan2017-01-191-0/+47
* | | | | | | Revert "Merge branch 'introduce-build-minutes' into 'master'"Kamil Trzciński2017-01-191-47/+0
* | | | | | | Merge branch 'introduce-build-minutes' into 'master' Douwe Maan2017-01-191-0/+47
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Merge remote-tracking branch 'origin-ee/master' into introduce-build-minutesKamil Trzcinski2017-01-1816-145/+133
| |\ \ \ \ \ \
| * | | | | | | remove redundant integer typecastingMike Greiling2017-01-041-2/+2
| * | | | | | | move ee-specific helpers to their own fileMike Greiling2017-01-042-44/+47
| * | | | | | | Update testsKamil Trzcinski2016-12-201-1/+1
| * | | | | | | Introduce actual_shared_runners_minutes_limitKamil Trzcinski2016-12-201-3/+3
| * | | | | | | Move _used to helperKamil Trzcinski2016-12-201-0/+6
| * | | | | | | Merge remote-tracking branch 'origin-ee/master' into introduce-build-minutesKamil Trzcinski2016-12-2013-45/+145
| |\ \ \ \ \ \ \
| * | | | | | | | add group shared runner usage overview pageMike Greiling2016-12-201-0/+22
| * | | | | | | | add helper to display current shared runner quota usageMike Greiling2016-12-181-0/+16
* | | | | | | | | Merge branch 'master' into approval-integrationSean McGivern2017-01-161-1/+4
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | Add weight filterClement Ho2017-01-131-1/+2
| * | | | | | | | Merge remote-tracking branch 'gitlab-ce/master' into ce-to-eeJames Lopez2017-01-131-0/+2
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | |
| | * | | | | | | Add username to page_filter_pathClement Ho2017-01-091-0/+2
| | | |_|_|/ / / | | |/| | | | |
* | | | | | | | Merge branch 'master' into approval-integrationBryce Johnson2017-01-1125-189/+274
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge remote-tracking branch 'gitlab-ce/master' into ce-to-eeJames Lopez2017-01-095-66/+52
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge branch '25985-combine-members-and-groups-settings-pages' into 'master' Alfredo Sumaran2017-01-062-1/+6
| | |\ \ \ \ \ \
| | | * | | | | | Fixed es6 lint errors, and reverted a change to a helperJose Ivan Vargas2017-01-031-1/+1
| | | * | | | | | Updated the "users" to "members" matches in the viewJose Ivan Vargas2017-01-031-1/+1