summaryrefslogtreecommitdiff
path: root/app/helpers
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '24784-mr-system-notes' into 'master' Annabel Dunstone Gray2017-04-071-0/+26
|\
| * Fix icon name error24784-mr-system-notesAnnabel Dunstone Gray2017-04-061-1/+1
| * Rewrite system note helperAnnabel Dunstone Gray2017-04-061-39/+21
| * Change edit iconAnnabel Dunstone Gray2017-04-061-1/+1
| * Leave icon area blank if legacy note; remove diamond iconAnnabel Dunstone Gray2017-04-061-3/+1
| * Fix positioning of note iconsAnnabel Dunstone Gray2017-04-061-1/+1
| * Fix newline errorsAnnabel Dunstone Gray2017-04-061-0/+2
| * Add remaining system note iconsAnnabel Dunstone Gray2017-04-061-3/+19
| * Add system notes icon helper; add iconsAnnabel Dunstone Gray2017-04-061-0/+28
* | Merge branch 'button-capitalization' into 'master' Clement Ho2017-04-061-1/+1
|\ \ | |/ |/|
| * Fixed button capitalisation for Projects in viewsJose Ivan Vargas Lopez2017-04-061-1/+1
* | Copy diff file path as GFMDouwe Maan2017-04-062-5/+24
|/
* Linking to edit file directlyEric Eastwood2017-04-061-17/+22
* Merge branch '27262-issue-recent-searches' into 'master' Jacob Schatz2017-04-061-2/+2
|\
| * Recent search history for issuesEric Eastwood2017-04-061-2/+2
* | Merge branch 'feature/enforce-2fa-per-group' into 'master' Douwe Maan2017-04-061-12/+0
|\ \
| * | Move AuthHelper#two_factor_skippable? into ApplicationControllerMarkus Koller2017-04-061-12/+0
* | | Merge branch '28810-projectfinder-should-handle-more-options' into 'master' Rémy Coutable2017-04-061-2/+18
|\ \ \ | |/ / |/| |
| * | ProjectsFinder should handle more optionsJacopo2017-04-061-2/+18
| |/
* | Merge branch 'path-disclosure-proj-import-export' into 'security' DJ Mountney2017-04-051-1/+4
|/
* Merge branch '25556-prevent-users-from-disconnecting-gitlab-account-from-cas'...Douwe Maan2017-03-311-0/+4
|\
| * Prevent users from disconnecting gitlab account from CASTiago Botelho2017-03-311-0/+4
* | Handle parsing OpenBSD ps output properly to display sidekiqSebastian Reitenbach2017-03-311-3/+3
* | Merge branch '26595-fix-issue-preselected-template' into 'master' Rémy Coutable2017-03-301-1/+1
|\ \
| * | Fix linking to new issue with selected templateEric Eastwood2017-03-291-1/+1
| |/
* | Merge branch '23674-simplify-milestone-summary' into 'master' Jacob Schatz2017-03-292-3/+4
|\ \
| * | move links to browse issuables into sidebarMike Greiling2017-03-241-2/+2
| * | prevent formatted milestone date string from having html escapedMike Greiling2017-03-241-0/+2
| * | add basic sidebar functionality to milestones pageMike Greiling2017-03-241-1/+2
* | | Merge branch 'create-collapsed-todo-button' into 'master' Filipa Lacerda2017-03-291-0/+15
|\ \ \
| * | | Updated todos sidebar iconPhil Hughes2017-03-241-0/+15
* | | | Merge branch 'user-callout-refactor' into 'master' Filipa Lacerda2017-03-281-0/+4
|\ \ \ \ | |_|_|/ |/| | |
| * | | Refactored the user callout classPhil Hughes2017-03-241-0/+4
* | | | Merge branch '30035-milestone-with-due-date-shows-escaped-html' into 'master' Alfredo Sumaran2017-03-241-0/+2
|\ \ \ \ | |_|_|/ |/| | |
| * | | prevent formatted milestone date string from having html escapedMike Greiling2017-03-241-0/+2
* | | | Resolve "Gitlab administrator cannot create projects in every group"George Andrinopoulos2017-03-241-1/+7
|/ / /
* | | Merge branch '29880-refactor-sidebar-hacks' into 'master' Annabel Dunstone Gray2017-03-241-1/+5
|\ \ \ | |_|/ |/| |
| * | genericise sidebar vertical offset css as it relates to the subnavMike Greiling2017-03-221-1/+5
* | | Merge branch 'tc-pipeline-show-trigger-date' into 'master' Kamil Trzciński2017-03-241-0/+7
|\ \ \ | |_|/ |/| |
| * | Move user_link to generic UsersHelperToon Claes2017-03-232-11/+7
| * | Add helpers for pipeline user link & user avatarToon Claes2017-03-221-0/+11
| |/
* | Add dropdown sort to project milestonesGeorge Andrinopoulos2017-03-241-0/+28
|/
* Revert "Merge branch '29534-todos-performance' into 'master'"Sean McGivern2017-03-211-7/+3
* Merge remote-tracking branch 'dev/master'DJ Mountney2017-03-203-3/+3
|\
| * Merge branch 'fix-links-target-blank' into 'security'Jacob Schatz2017-03-203-3/+3
* | Fix Project Wiki updateDongqing Hu2017-03-201-0/+1
* | Todos performance: Include associations in FinderJarka Kadlecova2017-03-201-3/+7
|/
* Merge branch 'add-blob-copy-button' into 'master' Robert Speicher2017-03-161-0/+14
|\
| * Use code icon for RawDouwe Maan2017-03-161-1/+1
| * Fix specDouwe Maan2017-03-161-0/+14