summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* remove unnecessary nonce idMike Greiling2016-12-101-3/+2
* fix broken string interpolationMike Greiling2016-12-101-1/+1
* Merge branch '25324-change-housekeeping-btn-to-default' into 'master' Alfredo Sumaran2016-12-091-1/+1
|\
| * Use default btn styling for Housekeeping button on projects settings pageRyan Harris2016-12-061-1/+1
* | Merge branch 'issue_24020' into 'master' Alfredo Sumaran2016-12-091-1/+1
|\ \
| * | fix display hook error messagebasyura2016-12-051-1/+1
* | | Merge branch 'remove-your_email-gsub-in-help-page' into 'master' Sean McGivern2016-12-091-1/+1
|\ \ \
| * | | Stop replacing `$your_email` with the user's emailremove-your_email-gsub-in-help-pageRémy Coutable2016-12-091-1/+1
* | | | Merge branch '23305-leave-project-and-leave-group-should-be-buttons' into 'ma...Jacob Schatz2016-12-093-33/+22
|\ \ \ \
| * | | | Removed leave buttons from settings dropdowns23305-leave-project-and-leave-group-should-be-buttonsLuke "Jared" Bennett2016-11-263-33/+22
* | | | | Merge branch 'update-button-font-weight' into 'master' Fatih Acet2016-12-091-1/+1
|\ \ \ \ \
| * | | | | Updates the font weight of button styles because of the change to system fontsupdate-button-font-weightDimitrie Hoekstra2016-12-091-1/+1
* | | | | | Merge branch 'members-dropdowns' into 'master' Fatih Acet2016-12-099-15/+108
|\ \ \ \ \ \
| * | | | | | Updated JS based on reviewPhil Hughes2016-12-093-16/+28
| * | | | | | Updated members dropdownsPhil Hughes2016-12-077-13/+94
| |/ / / / /
* | | | | | Merge branch 'followup-7899' into 'master' Sean McGivern2016-12-091-6/+5
|\ \ \ \ \ \
| * | | | | | Use a single query in Projects::ProjectMembersController to fetch membersfollowup-7899Rémy Coutable2016-12-081-6/+5
* | | | | | | Merge branch '25374-svg-as-prop' into 'master' Fatih Acet2016-12-098-75/+65
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Changes after review25374-svg-as-propFilipa Lacerda2016-12-092-4/+4
| * | | | | | Adds testsFilipa Lacerda2016-12-092-4/+6
| * | | | | | Uniformize props name formatFilipa Lacerda2016-12-095-25/+26
| * | | | | | Replace commit icon svg logicFilipa Lacerda2016-12-092-20/+8
| * | | | | | Replace play icon svg logicFilipa Lacerda2016-12-094-29/+28
* | | | | | | Merge branch 'fix/milestone-summary' into 'master' Sean McGivern2016-12-091-2/+4
|\ \ \ \ \ \ \
| * | | | | | | Displays milestone remaining days only when it's presentDouglas Barbosa Alexandre2016-12-081-2/+4
* | | | | | | | Merge branch 'do-not-refresh-main-when-fork-target-branch-updated' into 'mast...Sean McGivern2016-12-092-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-updatedAdam Niedzielski2016-12-092-5/+9
* | | | | | | | | Merge branch '25272_fix_comments_tab_disappearing' into 'master' Sean McGivern2016-12-092-1/+7
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | remove unnecessary issues event filter on comments tabRydkin Maxim2016-12-082-1/+7
* | | | | | | | | | Merge branch 'render-svg-in-diffs-and-notes' into 'master' Sean McGivern2016-12-091-1/+1
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Render SVG as images in notesAndre Guedes2016-12-081-1/+1
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'fix-active-nav-badges' into 'master' Fatih Acet2016-12-091-0/+4
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | Fix active nav badges not inheriting the link color.fix-active-nav-badgesPedro Moreira da Silva2016-12-061-0/+4
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge branch '15081-wrong-login-tab-ldap-frontend' into 'master' Fatih Acet2016-12-093-0/+51
|\ \ \ \ \ \ \ \
| * | | | | | | | Fixed Wrong Tab Selected When Loggin Fails And Multiple Login Tabs ExistsJacopo2016-12-023-0/+51
* | | | | | | | | Merge branch 'dz-nested-groups' into 'master' Douwe Maan2016-12-099-89/+134
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add nested groups support on data leveldz-nested-groupsDmitriy Zaporozhets2016-12-089-89/+134
* | | | | | | | | | Merge branch 'jej-23867-use-mr-finder-instead-of-access-check' into 'security'Douwe Maan2016-12-0816-45/+56
* | | | | | | | | | Merge branch 'html-safe-diff-line-content' into 'security' Robert Speicher2016-12-081-1/+3
* | | | | | | | | | Merge branch 'destroy-session' into 'security' Robert Speicher2016-12-081-1/+4
| |_|_|_|/ / / / / |/| | | | | | | |
* | | | | | | | | Merge branch 'fix-reset-template' into 'master' Fatih Acet2016-12-081-0/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Do nothing if file is undefinedfix-reset-templateAlfredo Sumaran2016-12-071-0/+2
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'system-notes-fade' into 'master' Fatih Acet2016-12-081-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fade out should be white instead of graysystem-notes-fadeAnnabel Dunstone Gray2016-12-071-1/+1
| |/ / / / / / / /
* | | | | | | | | Merge branch 'small-emoji-adjustments' into 'master' Fatih Acet2016-12-083-3/+4
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | Various small emoji positioning adjustmentssmall-emoji-adjustmentsDimitrie Hoekstra2016-12-083-3/+4
| |/ / / / / / /
* | | | | | | | Merge branch 'timeago-perf-fix' into 'master' Fatih Acet2016-12-081-1/+3
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | Fixed timeago re-rendering every elementtimeago-perf-fixPhil Hughes2016-12-071-1/+3
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'pipeline-stage' into 'master' Rémy Coutable2016-12-0820-113/+130
|\ \ \ \ \ \ \
| * | | | | | | Don't check if stage name doesn't existKamil Trzcinski2016-12-082-5/+3
View Lorry Controller Status