Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'fix-replying-to-commit-comment-in-mr-from-fork' into 'master' | Douwe Maan | 2017-07-28 | 1 | -0/+1 |
|\ | |||||
| * | Fix replying to commit comments on MRs from forks | Sean McGivern | 2017-07-28 | 1 | -0/+1 |
* | | Fix 500 error when rendering avatar for deleted project creator | Athar Hameed | 2017-07-28 | 1 | -1/+1 |
* | | Merge branch 'help-page-breadcrumb-title-fix' into 'master' | Filipa Lacerda | 2017-07-28 | 1 | -0/+1 |
|\ \ | |||||
| * | | Fixed the breadcrumb title for help pageshelp-page-breadcrumb-title-fix | Phil Hughes | 2017-07-28 | 1 | -0/+1 |
* | | | Merge branch 'ph-inline-js' into 'master' | Tim Zallmann | 2017-07-28 | 9 | -73/+3 |
|\ \ \ | |/ / |/| | | |||||
| * | | Merge branch 'master' into ph-inline-js | Phil Hughes | 2017-07-28 | 27 | -13/+204 |
| |\ \ | |||||
| * \ \ | Merge branch 'master' into ph-inline-js | Phil Hughes | 2017-07-27 | 13 | -46/+39 |
| |\ \ \ | | | |/ | | |/| | |||||
| * | | | moved some more inline code | Phil Hughes | 2017-07-25 | 1 | -8/+1 |
| * | | | Removed inline JS in shared HAML files | Phil Hughes | 2017-07-25 | 9 | -67/+4 |
* | | | | Merge branch '35224-transform-user-profile-javascript-into-async-bundle' into... | Tim Zallmann | 2017-07-28 | 2 | -20/+1 |
|\ \ \ \ | |_|_|/ |/| | | | |||||
| * | | | refactor users bundle, remove inline javascript, and transform into an async ... | Mike Greiling | 2017-07-18 | 1 | -10/+0 |
| * | | | refactor async calendar data | Mike Greiling | 2017-07-18 | 2 | -10/+1 |
* | | | | Merge branch 'ch-test-removal' into 'master' | Jacob Schatz | 2017-07-27 | 1 | -1/+0 |
|\ \ \ \ | |||||
| * | | | | Test remove potentially unused filech-test-removal | Clement Ho | 2017-07-26 | 1 | -1/+0 |
* | | | | | Merge branch '1827-prevent-concurrent-editing-wiki' into 'master' | Robert Speicher | 2017-07-27 | 2 | -0/+8 |
|\ \ \ \ \ | |||||
| * | | | | | Encapsulate the commit.sha logic | Hiroyuki Sato | 2017-07-27 | 1 | -1/+1 |
| * | | | | | Use simplified route | Hiroyuki Sato | 2017-07-27 | 1 | -1/+1 |
| * | | | | | Merge branch 'master' into 1827-prevent-concurrent-editing-wiki | Hiroyuki Sato | 2017-07-23 | 852 | -6132/+8939 |
| |\ \ \ \ \ | |||||
| * | | | | | | Prevent concurrent editing wiki | Hiroyuki Sato | 2017-03-08 | 2 | -0/+8 |
* | | | | | | | Merge branch 'backport-ee-2456' into 'master' | Robert Speicher | 2017-07-27 | 3 | -0/+16 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Backport gitlab-ee!2456 | Oswaldo Ferreira | 2017-07-27 | 3 | -0/+16 |
| | |_|_|_|_|/ | |/| | | | | | |||||
* | | | | | | | Merge branch '35577-fix-image-blob-display-due-to-lazy-image-loading' into 'm... | Sean McGivern | 2017-07-27 | 2 | -8/+8 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Changed Images in Blob Viewer to image_tag35577-fix-image-blob-display-due-to-lazy-image-loading | Tim Zallmann | 2017-07-27 | 2 | -8/+8 |
| * | | | | | | | Added lazy class to Blob Images + Diffs | Tim Zallmann | 2017-07-27 | 2 | -8/+8 |
| |/ / / / / / | |||||
* | | | | | | | add "GPG Keys" to new navigation | Alexis Reigel | 2017-07-27 | 1 | -0/+4 |
* | | | | | | | upcase in the model instead of in the view | Alexis Reigel | 2017-07-27 | 2 | -2/+2 |
* | | | | | | | fetch gpg signature badges by ajax | Alexis Reigel | 2017-07-27 | 4 | -3/+11 |
* | | | | | | | use ShaAttribute for gpg table columns | Alexis Reigel | 2017-07-27 | 2 | -2/+2 |
* | | | | | | | nicer email badges on the profile gpg page | Alexis Reigel | 2017-07-27 | 2 | -2/+9 |
* | | | | | | | display gpg key in the popover with monospace font | Alexis Reigel | 2017-07-27 | 1 | -1/+2 |
* | | | | | | | swap user's name and the user's username | Alexis Reigel | 2017-07-27 | 1 | -2/+2 |
* | | | | | | | show gpg key's user info when no profile exists | Alexis Reigel | 2017-07-27 | 1 | -6/+18 |
* | | | | | | | user may now revoke a gpg key | Alexis Reigel | 2017-07-27 | 1 | -2/+6 |
* | | | | | | | use svg icons for gpg popovers | Alexis Reigel | 2017-07-27 | 2 | -2/+4 |
* | | | | | | | add notfound icon (question mark) | Alexis Reigel | 2017-07-27 | 1 | -0/+1 |
* | | | | | | | improve spacing / alignments in gpg popup | Alexis Reigel | 2017-07-27 | 3 | -11/+12 |
* | | | | | | | use existing status-box css class for gpg badge | Alexis Reigel | 2017-07-27 | 3 | -8/+8 |
* | | | | | | | use the correct flex classes on the commits list | Alexis Reigel | 2017-07-27 | 2 | -3/+3 |
* | | | | | | | convert gpg badge helper methods to partials | Alexis Reigel | 2017-07-27 | 4 | -1/+47 |
* | | | | | | | no need for html_safe | Alexis Reigel | 2017-07-27 | 1 | -1/+3 |
* | | | | | | | add help links to gpg commits / gpg settings | Alexis Reigel | 2017-07-27 | 1 | -1/+4 |
* | | | | | | | position gpg badge first on commit line | Alexis Reigel | 2017-07-27 | 1 | -1/+1 |
* | | | | | | | add gpg commit popover badges | Alexis Reigel | 2017-07-27 | 1 | -3/+1 |
* | | | | | | | cache the gpg commit signature | Alexis Reigel | 2017-07-27 | 1 | -3/+3 |
* | | | | | | | notification email on add new gpg key | Alexis Reigel | 2017-07-27 | 2 | -0/+17 |
* | | | | | | | gpg email verification | Alexis Reigel | 2017-07-27 | 1 | -1/+1 |
* | | | | | | | add profile gpg key page to manage gpg keys | Alexis Reigel | 2017-07-27 | 5 | -0/+56 |
* | | | | | | | Prototype key verification | Kevin O'Connor | 2017-07-27 | 3 | -0/+6 |
|/ / / / / / | |||||
* | | | | | | Merge branch '35191-prioritized-labels-for-non-member' into 'master' | Rémy Coutable | 2017-07-27 | 1 | -5/+8 |
|\ \ \ \ \ \ |