summaryrefslogtreecommitdiff
path: root/app/helpers
Commit message (Expand)AuthorAgeFilesLines
* Move issuable reference display to a helper methodOswaldo Ferreira2017-01-271-0/+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
* | | 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 '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
* | | | | 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
* | | | | 26352 Change Profile settings to User / Settings26352-user-dropdown-settingstauriedavis2017-01-041-1/+1
| |/ / / |/| | |
* | | | Merge branch '26168-emoji-reactions-missing-tooltip-when-not-logged-in' into ...Fatih Acet2017-01-031-2/+4
|\ \ \ \ | |/ / / |/| | |
| * | | Disable award emoji button but display tooltip26168-emoji-reactions-missing-tooltip-when-not-logged-inSam Rose2016-12-311-2/+4
* | | | Merge branch 'fix/cross-project-ref-path' into 'master' Sean McGivern2017-01-031-22/+22
|\ \ \ \
| * | | | Fix cross-project references copy to include the project referencefix/cross-project-ref-pathJames Lopez2017-01-031-22/+22
| |/ / /
* | | | rewrite the item.respond_to?(:x?) && item.x? to item.try(:x?)dimitrieh2017-01-031-3/+3
|/ / /
* | | Merge branch 'issue_25682' into 'master' Sean McGivern2016-12-291-37/+16
|\ \ \
| * | | Parse JIRA issue references even if Issue Tracker is disabledFelipe Artur2016-12-291-37/+16
* | | | Merge branch '18786-go-to-a-project-order' into 'master' Alfredo Sumaran2016-12-271-1/+1
|\ \ \ \
| * | | | Go to a project orderJacopo2016-12-151-1/+1
* | | | | Merge branch 'feature/1376-allow-write-access-deploy-keys' into 'master' Douwe Maan2016-12-271-2/+4
|\ \ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'upstream/master' into feature/1376-allow-write-...Lin Jen-Shin2016-12-2014-47/+128
| |\ \ \ \ \
| * \ \ \ \ \ Merge CSSFilipa Lacerda2016-12-126-5/+41
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into feature/1376-allow-write-...Lin Jen-Shin2016-12-0614-138/+63
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into feature/1376-allow-write-...Lin Jen-Shin2016-11-2210-25/+77
| |\ \ \ \ \ \ \ \
| * | | | | | | | | We removed User#has_access_to?Lin Jen-Shin2016-11-181-1/+3
| * | | | | | | | | Merge remote-tracking branch 'upstream/master' into feature/1376-allow-write-...Lin Jen-Shin2016-11-179-43/+35
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Introduce has_access_to? so that we could reuse itLin Jen-Shin2016-11-161-2/+2
* | | | | | | | | | | Merge branch 'feature/more-storage-statistics' into 'master' Sean McGivern2016-12-263-20/+17
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Add more storage statisticsMarkus Koller2016-12-213-6/+17
| * | | | | | | | | | | Remove unused ProjectsHelper#round_commit_countMarkus Koller2016-12-211-14/+0
* | | | | | | | | | | | Change earlier to task_status_short to avoid titlebar line wraps25941-odd-overflow-behavior-for-long-issue-headersdimitrieh2016-12-221-2/+2