summaryrefslogtreecommitdiff
path: root/app/helpers
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into go-go-gadget-webpackMike Greiling2017-02-031-1/+1
|\
| * Merge branch 'docs/integrations' into 'master' Achilleas Pipinellis2017-02-031-1/+1
| |\
| | * Move webhooks to new a location under IntegrationsAchilleas Pipinellis2017-02-031-1/+1
* | | Merge branch 'master' into go-go-gadget-webpackMike Greiling2017-02-034-4/+18
|\ \ \ | |/ /
| * | Merge branch '25624-anticipate-obstacles-to-removing-turbolinks' into 'master' Jacob Schatz2017-02-031-1/+1
| |\ \
| | * | Remove turbolinks.Bryce Johnson2017-02-021-1/+1
| * | | Removes labels instead of closing issue when clicking remove buttonPhil Hughes2017-02-031-0/+1
| * | | Fixed bug with empty state showing after searchPhil Hughes2017-02-031-1/+2
| * | | Merge branch 'squash' into 'master' Sean McGivern2017-02-031-0/+12
| |\ \ \ | | |_|/ | |/| |
| | * | Backport changes from EE squashSean McGivern2017-02-031-0/+12
| | |/
| * | Merge branch 'fwn-to-find-by-full-path' into 'master' Dmitriy Zaporozhets2017-02-031-1/+1
| |\ \ | | |/ | |/|
| | * replace `find_with_namespace` with `find_by_full_path`Adam Pahlevi2017-02-031-1/+1
* | | Merge branch 'master' into webpackMike Greiling2017-02-023-7/+3
|\ \ \ | |/ /
| * | Merge branch '27291-unify-mr-diff-file-buttons' into 'master' Annabel Dunstone Gray2017-02-022-3/+3
| |\ \
| | * | removes old css class from everywhere27291-unify-mr-diff-file-buttonsNur Rony2017-02-021-2/+2
| | * | unifies mr diff file button styleNur Rony2017-01-301-1/+1
| | |/
| * | Keep snippet visibility on errorSean McGivern2017-02-021-4/+0
* | | Merge branch 'master' into go-go-gadget-webpackMike Greiling2017-01-312-1/+5
|\ \ \ | |/ /
| * | Use full group name/path in UI dropdownsDmitriy Zaporozhets2017-01-301-1/+1
| * | Move issuable reference display to a helper methodOswaldo Ferreira2017-01-271-0/+4
| |/
* | Merge branch 'master' into go-go-gadget-webpackMike Greiling2017-01-277-13/+32
|\ \ | |/
| * 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
| * | | 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 '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 'master' into go-go-gadget-webpackMike Greiling2017-01-183-0/+23
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 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 'master' into go-go-gadget-webpackPhil Hughes2017-01-133-1/+8
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Add username to page_filter_pathClement Ho2017-01-091-0/+2
| | |/ / / | |/| | |
| * | | | 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
| | * | | | Moved the members (project_members)option to a single controller called membersJose Ivan Vargas2017-01-032-1/+6