summaryrefslogtreecommitdiff
path: root/app/helpers
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into 25426-group-dashboard-uiAlfredo Sumaran2017-06-0710-21/+79
|\
| * Added more actions and report as abuse to all notesLuke "Jared" Bennett2017-06-071-2/+6
| * Sync email address from specified omniauth providerRobin Bobbitt2017-06-071-0/+7
| * Merge branch '12910-snippets-description' into 'master'Phil Hughes2017-06-071-1/+1
| |\
| | * Support descriptions for snippetsJarka Kadlecova2017-05-311-1/+1
| * | Resolve "When changing project visibility setting, change other dropdowns aut...Mike Greiling2017-06-062-5/+9
| * | Merge branch 'dz-fix-submodule-subgroup' into 'master'Douwe Maan2017-06-051-0/+11
| |\ \
| | * | Fix submodule link to then project under subgroupDmitriy Zaporozhets2017-06-051-0/+11
| * | | Merge branch 'fix-realtime-edited-text-for-issues-9-3' into 'master'Phil Hughes2017-06-052-3/+19
| |\ \ \
| | * | | Fix up merge issuesfix-realtime-edited-text-for-issues-9-3Luke "Jared" Bennett2017-06-021-1/+3
| | * | | Merge remote-tracking branch 'origin/master' into fix-realtime-edited-text-fo...Luke "Jared" Bennett2017-06-028-41/+60
| | |\ \ \
| | * | | | Removed unneeded newline in issuables_helper_spec and removed unneeded update...Luke "Jared" Bennett2017-06-021-2/+1
| | * | | | Fixed issuables_helper_spec and added a test for issuable_app_dataLuke "Jared" Bennett2017-05-311-23/+23
| | * | | | Remove EditableHelper and move method to IssuablesHelperLuke "Jared" Bennett2017-05-312-14/+12
| | * | | | Correct editable_helper spec and format issuable_app_data updated_at to iso8061Luke "Jared" Bennett2017-05-311-1/+1
| | * | | | Fix helper methods returning wrong data types for vueLuke "Jared" Bennett2017-05-312-3/+7
| | * | | | Move issuable_app_data to helperLuke "Jared" Bennett2017-05-311-0/+8
| | * | | | Port fix-realtime-edited-text-for-issues 9-2-stable fix to master.Luke "Jared" Bennett2017-05-312-1/+14
| | | |_|/ | | |/| |
| * | | | Merge branch '30469-convdev-index' into 'master'Sean McGivern2017-06-052-2/+18
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Add Conversational Development Index page to admin panelTaurie Davis, Simon Knox and Adam Niedzielski2017-06-012-2/+18
| * | | | Enable the Style/PreferredHashMethods coprc/enable-PreferredHashMethods-copRémy Coutable2017-06-021-8/+8
| | |_|/ | |/| |
* | | | Expose avatar URL for groupsAlfredo Sumaran2017-06-061-1/+1
|/ / /
* | | Show current user immediately in issuable filtersWinnie Hellmann2017-06-021-5/+15
* | | Fix replying to a commit discussion displayed in the context of an MRDouwe Maan2017-06-011-1/+1
|/ /
* | Merge branch 'fix_diff_line_comments' into 'master'Sean McGivern2017-06-011-2/+2
|\ \
| * | Fix: A diff comment on a change at last line of a file shows as two comments ...Valery Sizov2017-05-311-2/+2
* | | Merge branch 'dm-collapsed-blob' into 'master'Sean McGivern2017-06-012-13/+9
|\ \ \
| * | | Consistent diff and blob size limit namesDouwe Maan2017-05-292-13/+9
* | | | Merge branch 'rename-builds-controller' into 'master'Kamil Trzciński2017-05-313-13/+13
|\ \ \ \
| * \ \ \ Merge remote-tracking branch 'upstream/master' into rename-builds-controllerLin Jen-Shin2017-05-314-10/+37
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Merge remote-tracking branch 'upstream/master' into rename-builds-controllerLin Jen-Shin2017-05-267-25/+18
| |\ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'upstream/master' into rename-builds-controllerLin Jen-Shin2017-05-182-1/+16
| |\ \ \ \ \
| * | | | | | Rename BuildsController to JobsControllerLin Jen-Shin2017-05-173-13/+13
* | | | | | | Merge branch 'issue-edit-inline' into 'master'Filipa Lacerda2017-05-311-0/+21
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into issue-edit-inlinePhil Hughes2017-05-305-30/+38
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | |
| * | | | | | | fixed issuable templates dropdown not showingPhil Hughes2017-05-251-1/+1
| * | | | | | | Merge branch 'master' into issue-edit-inlinePhil Hughes2017-05-258-10/+50
| |\ \ \ \ \ \ \
| * | | | | | | | fixed bug with can? check when user is not logged inPhil Hughes2017-05-241-1/+1
| * | | | | | | | Changed all data to come through the JSON script elementPhil Hughes2017-05-241-2/+15
| * | | | | | | | Fixed up the template dropdown to correctly workPhil Hughes2017-05-161-1/+3
| * | | | | | | | Merge branch 'issue-edit-inline' into issue-edit-inline-description-templatePhil Hughes2017-05-161-0/+4
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Added description template selectorPhil Hughes2017-05-151-0/+6
* | | | | | | | | | Merge branch 'user-callout-dismissed-method-rename' into 'master'Douwe Maan2017-05-311-1/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | |
| * | | | | | | | | Fixed the show_user_callout methoduser-callout-dismissed-method-renamePhil Hughes2017-05-301-1/+1
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge branch '30410-revert-9347-and-10079' into 'master'Douwe Maan2017-05-302-2/+2
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | |
| * | | | | | | | Revert "Merge branch '1937-https-clone-url-username' into 'master' "Rémy Coutable2017-05-302-2/+2
| |/ / / / / / /
* | | | | | | | Merge branch '19107-404-when-creating-new-milestone-or-issue-for-project-that...Douwe Maan2017-05-301-0/+8
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | 'New issue'/'New merge request' dropdowns should show only projects with issu...19107-404-when-creating-new-milestone-or-issue-for-project-that-has-issues-disabledblackst0ne2017-05-301-0/+8
* | | | | | | | Merge branch '30917-wiki-is-not-searchable-with-guest-permissions' into 'master'Douwe Maan2017-05-291-8/+25
|\ \ \ \ \ \ \ \
| * | | | | | | | Create a separate helper to check if we show particular tab on a search page30917-wiki-is-not-searchable-with-guest-permissionsValery Sizov2017-05-292-14/+25