summaryrefslogtreecommitdiff
path: root/app/views
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'fix-replying-to-commit-comment-in-mr-from-fork' into 'master'Douwe Maan2017-07-281-0/+1
|\
| * Fix replying to commit comments on MRs from forksSean McGivern2017-07-281-0/+1
* | Fix 500 error when rendering avatar for deleted project creatorAthar Hameed2017-07-281-1/+1
* | Merge branch 'help-page-breadcrumb-title-fix' into 'master'Filipa Lacerda2017-07-281-0/+1
|\ \
| * | Fixed the breadcrumb title for help pageshelp-page-breadcrumb-title-fixPhil Hughes2017-07-281-0/+1
* | | Merge branch 'ph-inline-js' into 'master'Tim Zallmann2017-07-289-73/+3
|\ \ \ | |/ / |/| |
| * | Merge branch 'master' into ph-inline-jsPhil Hughes2017-07-2827-13/+204
| |\ \
| * \ \ Merge branch 'master' into ph-inline-jsPhil Hughes2017-07-2713-46/+39
| |\ \ \ | | | |/ | | |/|
| * | | moved some more inline codePhil Hughes2017-07-251-8/+1
| * | | Removed inline JS in shared HAML filesPhil Hughes2017-07-259-67/+4
* | | | Merge branch '35224-transform-user-profile-javascript-into-async-bundle' into...Tim Zallmann2017-07-282-20/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | refactor users bundle, remove inline javascript, and transform into an async ...Mike Greiling2017-07-181-10/+0
| * | | refactor async calendar dataMike Greiling2017-07-182-10/+1
* | | | Merge branch 'ch-test-removal' into 'master'Jacob Schatz2017-07-271-1/+0
|\ \ \ \
| * | | | Test remove potentially unused filech-test-removalClement Ho2017-07-261-1/+0
* | | | | Merge branch '1827-prevent-concurrent-editing-wiki' into 'master'Robert Speicher2017-07-272-0/+8
|\ \ \ \ \
| * | | | | Encapsulate the commit.sha logicHiroyuki Sato2017-07-271-1/+1
| * | | | | Use simplified routeHiroyuki Sato2017-07-271-1/+1
| * | | | | Merge branch 'master' into 1827-prevent-concurrent-editing-wikiHiroyuki Sato2017-07-23852-6132/+8939
| |\ \ \ \ \
| * | | | | | Prevent concurrent editing wikiHiroyuki Sato2017-03-082-0/+8
* | | | | | | Merge branch 'backport-ee-2456' into 'master'Robert Speicher2017-07-273-0/+16
|\ \ \ \ \ \ \
| * | | | | | | Backport gitlab-ee!2456Oswaldo Ferreira2017-07-273-0/+16
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch '35577-fix-image-blob-display-due-to-lazy-image-loading' into 'm...Sean McGivern2017-07-272-8/+8
|\ \ \ \ \ \ \
| * | | | | | | Changed Images in Blob Viewer to image_tag35577-fix-image-blob-display-due-to-lazy-image-loadingTim Zallmann2017-07-272-8/+8
| * | | | | | | Added lazy class to Blob Images + DiffsTim Zallmann2017-07-272-8/+8
| |/ / / / / /
* | | | | | | add "GPG Keys" to new navigationAlexis Reigel2017-07-271-0/+4
* | | | | | | upcase in the model instead of in the viewAlexis Reigel2017-07-272-2/+2
* | | | | | | fetch gpg signature badges by ajaxAlexis Reigel2017-07-274-3/+11
* | | | | | | use ShaAttribute for gpg table columnsAlexis Reigel2017-07-272-2/+2
* | | | | | | nicer email badges on the profile gpg pageAlexis Reigel2017-07-272-2/+9
* | | | | | | display gpg key in the popover with monospace fontAlexis Reigel2017-07-271-1/+2
* | | | | | | swap user's name and the user's usernameAlexis Reigel2017-07-271-2/+2
* | | | | | | show gpg key's user info when no profile existsAlexis Reigel2017-07-271-6/+18
* | | | | | | user may now revoke a gpg keyAlexis Reigel2017-07-271-2/+6
* | | | | | | use svg icons for gpg popoversAlexis Reigel2017-07-272-2/+4
* | | | | | | add notfound icon (question mark)Alexis Reigel2017-07-271-0/+1
* | | | | | | improve spacing / alignments in gpg popupAlexis Reigel2017-07-273-11/+12
* | | | | | | use existing status-box css class for gpg badgeAlexis Reigel2017-07-273-8/+8
* | | | | | | use the correct flex classes on the commits listAlexis Reigel2017-07-272-3/+3
* | | | | | | convert gpg badge helper methods to partialsAlexis Reigel2017-07-274-1/+47
* | | | | | | no need for html_safeAlexis Reigel2017-07-271-1/+3
* | | | | | | add help links to gpg commits / gpg settingsAlexis Reigel2017-07-271-1/+4
* | | | | | | position gpg badge first on commit lineAlexis Reigel2017-07-271-1/+1
* | | | | | | add gpg commit popover badgesAlexis Reigel2017-07-271-3/+1
* | | | | | | cache the gpg commit signatureAlexis Reigel2017-07-271-3/+3
* | | | | | | notification email on add new gpg keyAlexis Reigel2017-07-272-0/+17
* | | | | | | gpg email verificationAlexis Reigel2017-07-271-1/+1
* | | | | | | add profile gpg key page to manage gpg keysAlexis Reigel2017-07-275-0/+56
* | | | | | | Prototype key verificationKevin O'Connor2017-07-273-0/+6
|/ / / / / /
* | | | | | Merge branch '35191-prioritized-labels-for-non-member' into 'master'Rémy Coutable2017-07-271-5/+8
|\ \ \ \ \ \