Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '25510-fix-notifications-dropdown-alignment' into 'master' | Fatih Acet | 2016-12-12 | 5 | -5/+11 |
|\ | |||||
| * | remove left_align setting from notification setting dropdown in favor of a pu...25510-fix-notifications-dropdown-alignment | Mike Greiling | 2016-12-10 | 6 | -10/+12 |
| * | fix alignment for notification settings ajax response | Mike Greiling | 2016-12-09 | 1 | -1/+5 |
* | | Merge branch 'features/api-snippets' into 'master' | Sean McGivern | 2016-12-12 | 3 | -1/+14 |
|\ \ | |/ |/| | |||||
| * | API: Endpoint to expose personal snippets as /snippets | Guyzmo | 2016-12-01 | 3 | -1/+14 |
* | | Merge branch '25324-change-housekeeping-btn-to-default' into 'master' | Alfredo Sumaran | 2016-12-09 | 1 | -1/+1 |
|\ \ | |||||
| * | | Use default btn styling for Housekeeping button on projects settings page | Ryan Harris | 2016-12-06 | 1 | -1/+1 |
* | | | Merge branch 'issue_24020' into 'master' | Alfredo Sumaran | 2016-12-09 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | fix display hook error message | basyura | 2016-12-05 | 1 | -1/+1 |
* | | | | Merge branch 'remove-your_email-gsub-in-help-page' into 'master' | Sean McGivern | 2016-12-09 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | Stop replacing `$your_email` with the user's emailremove-your_email-gsub-in-help-page | Rémy Coutable | 2016-12-09 | 1 | -1/+1 |
* | | | | | Merge branch '23305-leave-project-and-leave-group-should-be-buttons' into 'ma... | Jacob Schatz | 2016-12-09 | 3 | -33/+22 |
|\ \ \ \ \ | |||||
| * | | | | | Removed leave buttons from settings dropdowns23305-leave-project-and-leave-group-should-be-buttons | Luke "Jared" Bennett | 2016-11-26 | 3 | -33/+22 |
* | | | | | | Merge branch 'update-button-font-weight' into 'master' | Fatih Acet | 2016-12-09 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Updates the font weight of button styles because of the change to system fontsupdate-button-font-weight | Dimitrie Hoekstra | 2016-12-09 | 1 | -1/+1 |
* | | | | | | | Merge branch 'members-dropdowns' into 'master' | Fatih Acet | 2016-12-09 | 9 | -15/+108 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Updated JS based on review | Phil Hughes | 2016-12-09 | 3 | -16/+28 |
| * | | | | | | | Updated members dropdowns | Phil Hughes | 2016-12-07 | 7 | -13/+94 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'followup-7899' into 'master' | Sean McGivern | 2016-12-09 | 1 | -6/+5 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Use a single query in Projects::ProjectMembersController to fetch membersfollowup-7899 | Rémy Coutable | 2016-12-08 | 1 | -6/+5 |
* | | | | | | | | Merge branch '25374-svg-as-prop' into 'master' | Fatih Acet | 2016-12-09 | 8 | -75/+65 |
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | |||||
| * | | | | | | | Changes after review25374-svg-as-prop | Filipa Lacerda | 2016-12-09 | 2 | -4/+4 |
| * | | | | | | | Adds tests | Filipa Lacerda | 2016-12-09 | 2 | -4/+6 |
| * | | | | | | | Uniformize props name format | Filipa Lacerda | 2016-12-09 | 5 | -25/+26 |
| * | | | | | | | Replace commit icon svg logic | Filipa Lacerda | 2016-12-09 | 2 | -20/+8 |
| * | | | | | | | Replace play icon svg logic | Filipa Lacerda | 2016-12-09 | 4 | -29/+28 |
* | | | | | | | | Merge branch 'fix/milestone-summary' into 'master' | Sean McGivern | 2016-12-09 | 1 | -2/+4 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Displays milestone remaining days only when it's present | Douglas Barbosa Alexandre | 2016-12-08 | 1 | -2/+4 |
* | | | | | | | | | Merge branch 'do-not-refresh-main-when-fork-target-branch-updated' into 'mast... | Sean McGivern | 2016-12-09 | 2 | -5/+9 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Do not reload diff for merge request made from fork when target branch in for...do-not-refresh-main-when-fork-target-branch-updated | Adam Niedzielski | 2016-12-09 | 2 | -5/+9 |
* | | | | | | | | | | Merge branch '25272_fix_comments_tab_disappearing' into 'master' | Sean McGivern | 2016-12-09 | 2 | -1/+7 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | remove unnecessary issues event filter on comments tab | Rydkin Maxim | 2016-12-08 | 2 | -1/+7 |
* | | | | | | | | | | | Merge branch 'render-svg-in-diffs-and-notes' into 'master' | Sean McGivern | 2016-12-09 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | Render SVG as images in notes | Andre Guedes | 2016-12-08 | 1 | -1/+1 |
| | |_|_|_|/ / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'fix-active-nav-badges' into 'master' | Fatih Acet | 2016-12-09 | 1 | -0/+4 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Fix active nav badges not inheriting the link color.fix-active-nav-badges | Pedro Moreira da Silva | 2016-12-06 | 1 | -0/+4 |
| | |_|_|_|_|_|/ / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch '15081-wrong-login-tab-ldap-frontend' into 'master' | Fatih Acet | 2016-12-09 | 3 | -0/+51 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Fixed Wrong Tab Selected When Loggin Fails And Multiple Login Tabs Exists | Jacopo | 2016-12-02 | 3 | -0/+51 |
* | | | | | | | | | | Merge branch 'dz-nested-groups' into 'master' | Douwe Maan | 2016-12-09 | 9 | -89/+134 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Add nested groups support on data leveldz-nested-groups | Dmitriy Zaporozhets | 2016-12-08 | 9 | -89/+134 |
* | | | | | | | | | | | Merge branch 'jej-23867-use-mr-finder-instead-of-access-check' into 'security' | Douwe Maan | 2016-12-08 | 16 | -45/+56 |
* | | | | | | | | | | | Merge branch 'html-safe-diff-line-content' into 'security' | Robert Speicher | 2016-12-08 | 1 | -1/+3 |
* | | | | | | | | | | | Merge branch 'destroy-session' into 'security' | Robert Speicher | 2016-12-08 | 1 | -1/+4 |
| |_|_|_|/ / / / / / |/| | | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'fix-reset-template' into 'master' | Fatih Acet | 2016-12-08 | 1 | -0/+2 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Do nothing if file is undefinedfix-reset-template | Alfredo Sumaran | 2016-12-07 | 1 | -0/+2 |
| | |_|_|/ / / / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'system-notes-fade' into 'master' | Fatih Acet | 2016-12-08 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Fade out should be white instead of graysystem-notes-fade | Annabel Dunstone Gray | 2016-12-07 | 1 | -1/+1 |
| |/ / / / / / / / / | |||||
* | | | | | | | | | | Merge branch 'small-emoji-adjustments' into 'master' | Fatih Acet | 2016-12-08 | 3 | -3/+4 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Various small emoji positioning adjustmentssmall-emoji-adjustments | Dimitrie Hoekstra | 2016-12-08 | 3 | -3/+4 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge branch 'timeago-perf-fix' into 'master' | Fatih Acet | 2016-12-08 | 1 | -1/+3 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | |