summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '18019-fix-wiki-linking' into 'master' Rémy Coutable2016-06-093-4/+4
|\
| * Hook up the updated `WikiLinkFilter` to the wiki controllers.Timothy Andrew2016-06-093-4/+4
* | Merge branch 'fix-award-emoji-hidden' into 'master' Jacob Schatz2016-06-091-1/+2
|\ \
| * | Shows award emoji for comments to all users who are logged in.Connor Shea2016-06-081-1/+2
* | | Merge branch 'mention-loading-indicator' into 'master' Jacob Schatz2016-06-081-5/+73
|\ \ \
| * | | Show loading indicator for autocompletemention-loading-indicatorPhil Hughes2016-05-251-5/+73
* | | | Merge branch '17284-Edit-form-does-not-cancel-correctly' into 'master' Jacob Schatz2016-06-081-5/+8
|\ \ \ \
| * | | | Added a line to find the currently saved text and replace the markdown textar...Luke Bennett2016-06-071-5/+8
* | | | | Merge branch 'nav-scroll-bug' into 'master' Jacob Schatz2016-06-081-1/+8
|\ \ \ \ \
| * | | | | Side nav scrolls if content height taller than screennav-scroll-bugAnnabel Dunstone2016-06-071-1/+8
* | | | | | Merge branch 'git-http-no-authenticity-token' into 'master' Robert Speicher2016-06-081-0/+2
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Skip authenticity token checks for Git HTTPJacob Vosmaer2016-06-081-0/+2
* | | | | | Merge branch '17240-svg' into 'master' Jacob Schatz2016-06-0819-28/+230
|\ \ \ \ \ \
| * | | | | | Fix activity SVG17240-svgAnnabel Dunstone2016-06-082-11/+7
| * | | | | | Fix merge conflicts from removing links from sidebarAnnabel Dunstone2016-06-082-22/+4
| * | | | | | Add new icons to group page layout navAnnabel Dunstone2016-06-089-23/+97
| * | | | | | Add SVG icons to side barAnnabel Dunstone2016-06-088-179/+60
| * | | | | | Start adding SVG iconsAnnabel Dunstone2016-06-0810-0/+269
* | | | | | | Merge branch '18333-layout-bug' into 'master' Jacob Schatz2016-06-083-3/+3
|\ \ \ \ \ \ \
| * | | | | | | Use container helper instead of hard coded containerAnnabel Dunstone2016-06-083-3/+3
| |/ / / / / /
* | | | | | | Merge branch 'dropdown-link-lineheight' into 'master' Jacob Schatz2016-06-081-0/+1
|\ \ \ \ \ \ \
| * | | | | | | Fixed dropdown line-heightdropdown-link-lineheightPhil Hughes2016-06-081-0/+1
* | | | | | | | Merge branch 'dz-improve-ui-consistency' into 'master' Jacob Schatz2016-06-0818-38/+37
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove unnecessary icons from buttonsdz-improve-ui-consistencyDmitriy Zaporozhets2016-06-089-13/+5
| * | | | | | | | Cleanup and imrpove issue/mr buttonsDmitriy Zaporozhets2016-06-088-20/+27
| * | | | | | | | Improve button color for issue and mr pagesDmitriy Zaporozhets2016-06-083-8/+8
| * | | | | | | | Use hex value instead of rgba for gray border colorDmitriy Zaporozhets2016-06-081-1/+1
| |/ / / / / / /
* | | | | | | | Merge branch '14098-customize-after-sign-up-path' into 'master' Robert Speicher2016-06-086-2/+26
|\ \ \ \ \ \ \ \
| * | | | | | | | Allow custom text on 'almost there' pageSean McGivern2016-06-086-2/+26
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'password-min-length-placeholder' into 'master' Robert Speicher2016-06-082-1/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Added minimum password length to password fieldpassword-min-length-placeholderPhil Hughes2016-06-032-1/+2
* | | | | | | | Merge branch 'admin-nav' into 'master' Jacob Schatz2016-06-082-27/+23
|\ \ \ \ \ \ \ \
| * | | | | | | | Update explore sidebaradmin-navAnnabel Dunstone2016-06-071-4/+4
| * | | | | | | | Update admin sidebarAnnabel Dunstone2016-06-071-23/+19
* | | | | | | | | Merge branch '17960-issues-api-endpoint-performs-poorly' into 'master' Yorick Peterse2016-06-083-5/+23
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | Fix pseudo n+1 queries with Note and Note Authors in issuables APIsAlejandro Rodríguez2016-06-081-3/+21
| * | | | | | | | Remove `projects` inclusion in `notes_with_associations` to skip some unneces...Alejandro Rodríguez2016-06-083-3/+3
* | | | | | | | | Merge branch 'remove-labels-from-filter' into 'master' Jacob Schatz2016-06-084-6/+55
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fixed issue with dropdown toggle not updatingremove-labels-from-filterPhil Hughes2016-06-082-2/+7
| * | | | | | | | | Darken the border between remove label and label namePhil Hughes2016-06-081-1/+1
| * | | | | | | | | Updated designPhil Hughes2016-06-083-9/+29
| * | | | | | | | | Removable labels from filtered issuables label barPhil Hughes2016-06-082-2/+26
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'webhooks-shared-form' into 'master' Jacob Schatz2016-06-082-91/+92
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Backported from EE shared form for web hookswebhooks-shared-formPhil Hughes2016-06-032-91/+92
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'git-http-controller' into 'master' Rémy Coutable2016-06-082-40/+147
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into git-htt...Jacob Vosmaer2016-06-08184-1342/+2758
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| * | | | | | | | Remove code duplication in JwtControllerJacob Vosmaer2016-06-061-39/+1
| * | | | | | | | Remove instances of Auth.newJacob Vosmaer2016-06-031-1/+1
| * | | | | | | | Fewer silly instance variablesJacob Vosmaer2016-06-031-11/+9
| * | | | | | | | Use #present?Jacob Vosmaer2016-06-031-1/+1