summaryrefslogtreecommitdiff
path: root/app/helpers
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dm-outdated-diff-link' into 'master' Sean McGivern2017-04-112-4/+17
|\
| * Fix specsDouwe Maan2017-04-091-0/+2
| * Some code tweaksDouwe Maan2017-04-081-1/+1
| * Fix views after rebaseDouwe Maan2017-04-081-2/+4
| * Fix specs and make tweaksDouwe Maan2017-04-081-0/+2
| * Add link to diff header tooDouwe Maan2017-04-081-3/+10
* | Merge branch 'dz-fix-project-view' into 'master' Annabel Dunstone Gray2017-04-111-1/+5
|\ \
| * | Change project view default for existing users and anonymous visitors to file...dz-fix-project-viewDmitriy Zaporozhets2017-04-101-1/+5
* | | Don't show 'Copy content' button on text files that are not rendered as textDouwe Maan2017-04-101-0/+4
|/ /
* | Remove the User#is_admin? methodblackst0ne2017-04-091-1/+1
|/
* Merge branch 'master' into new-resolvable-discussionDouwe Maan2017-04-071-1/+1
|\
| * Update MR title change iconAnnabel Dunstone Gray2017-04-071-1/+1
* | Merge branch 'master' into new-resolvable-discussionLuke "Jared" Bennett2017-04-072-1/+9
|\ \ | |/
| * Merge branch '18471-restrict-tag-pushes-protected-tags' into 'master' Douwe Maan2017-04-072-1/+9
| |\
| | * Merge branch 'master' into '18471-restrict-tag-pushes-protected-tags'Kushal Pandya2017-04-064-36/+48
| | |\
| | * \ Merge branch 'last-green-master' into 18471-restrict-tag-pushes-protected-tagsJames Edwards-Jones2017-04-061-2/+18
| | |\ \
| | * | | Protected Tags backend review changesJames Edwards-Jones2017-04-061-0/+4
| | * | | Merge branch 'master' into '18471-restrict-tag-pushes-protected-tags'Kushal Pandya2017-04-0611-17/+87
| | |\ \ \
| | * | | | Moved Project#protected_branch? to ProtectedBranch, similar for tagsJames Edwards-Jones2017-04-032-2/+2
| | * | | | Added ‘protected’ label and disabled delete button for tags index/showJames Edwards-Jones2017-03-311-0/+4
* | | | | | Merge branch 'update-droplab-to-webpack-version' into new-resolvable-discussionLuke "Jared" Bennett2017-04-073-6/+51
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 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
| |/ / / /
* | | | | Merge branch 'master' into new-resolvable-discussionDouwe Maan2017-04-063-31/+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 'update-droplab-to-webpack-version' into new-resolvable-discussionLuke "Jared" Bennett2017-04-062-3/+22
|\ \ \ \ \ | |/ / / /
| * | | | 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
| |/ /
* | | Address review commentsDouwe Maan2017-04-051-1/+0
* | | Address review commentsDouwe Maan2017-04-051-17/+0
* | | Correctly display multiple separate discussions on the same diff lineDouwe Maan2017-04-052-20/+5
* | | Don't use original_discussion_idDouwe Maan2017-04-051-8/+4
* | | Fix some specsDouwe Maan2017-04-051-3/+1
* | | Add option to start a new discussion on an MRDouwe Maan2017-04-051-26/+23
|/ /
* | Merge branch '25556-prevent-users-from-disconnecting-gitlab-account-from-cas'...Douwe Maan2017-03-311-0/+4
|\ \