summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '18855-wrap-code-in-activities-and-todos' into 'master' Dmitriy Zaporozhets2016-06-222-0/+8
|\
| * wrap code blocks on Activies and Todos pagewinniehell2016-06-202-0/+8
* | Merge branch 'fix/error-typo' into 'master' Rémy Coutable2016-06-223-7/+7
|\ \
| * | refactor to use haml insteadfix/error-typoJames Lopez2016-06-222-6/+6
| * | fix typoJames Lopez2016-06-221-1/+1
* | | Merge branch 'fix-network-links' into 'master' Douwe Maan2016-06-221-1/+1
|\ \ \
| * | | Remove unnecessary string interpolation.fix-network-linksConnor Shea2016-06-211-1/+1
| * | | Fix Network graph links.Connor Shea2016-06-211-1/+1
* | | | Merge branch 'fix-auto-mr-close' into 'master' Douwe Maan2016-06-221-1/+1
|\ \ \ \
| * | | | Fix auto-MR-close text from branch namefix-auto-mr-closeSean McGivern2016-06-211-1/+1
* | | | | Merge branch '18871-check-improve-how-we-display-access-requesters-in-admin-a...Douwe Maan2016-06-228-65/+35
|\ \ \ \ \
| * | | | | Display group/project access requesters separately in adminRémy Coutable2016-06-208-65/+35
* | | | | | Merge branch '18755-fix-destroy-project-causes-post_decline_request-to-be-exe...Douwe Maan2016-06-2212-102/+71
|\ \ \ \ \ \
| * | | | | | Add 'Leave Group' linkRémy Coutable2016-06-181-15/+21
| * | | | | | Show 'Leave project' only if member can actually leave the projectRémy Coutable2016-06-182-6/+7
| * | | | | | Raise a new Gitlab::Access::AccessDeniedError when permission is not enough t...Rémy Coutable2016-06-185-58/+18
| * | | | | | Don't send the "access declined" email on access request withdrawalRémy Coutable2016-06-181-1/+3
| * | | | | | Redirect to the member's source on request withdrawalRémy Coutable2016-06-181-1/+2
| * | | | | | Use the new Members::DestroyService in group/project member controllersRémy Coutable2016-06-182-2/+2
| * | | | | | New Members::DestroyServiceRémy Coutable2016-06-186-46/+45
* | | | | | | Merge branch 'master' into 18533-graphs-wiki-subnavDmitriy Zaporozhets2016-06-2217-80/+79
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'rename-code-to-repo' into 'master' Dmitriy Zaporozhets2016-06-211-2/+2
| |\ \ \ \ \ \ \
| | * | | | | | | Rename Repo -> Repositoryrename-code-to-repoStan Hu2016-06-211-2/+2
| | * | | | | | | Rename Code tab to RepoStan Hu2016-06-201-2/+2
| * | | | | | | | Merge branch 'contributors-graph-mobile' into 'master' Jacob Schatz2016-06-212-1/+11
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Apply responsive design for Contributors graphs.contributors-graph-mobileConnor Shea2016-06-202-1/+11
| * | | | | | | | | Merge branch '18934-compare-gray-block' into 'master' Jacob Schatz2016-06-213-19/+35
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Update gray block under subnav to match other pages18934-compare-gray-blockAnnabel Dunstone2016-06-213-19/+35
| * | | | | | | | | | Merge branch '17671-private-forks-list-ui-issues' into 'master' Robert Speicher2016-06-212-6/+6
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Moved private forks notice to projects-list so its above the pagination and i...Luke "Jared" Bennett2016-06-102-6/+6
| * | | | | | | | | | | Merge branch 'remove-banzai-pre-process' into 'master' Robert Speicher2016-06-211-2/+0
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Move pre_process into render_resultremove-banzai-pre-processYorick Peterse2016-06-211-2/+0
| | | |_|_|_|_|_|_|_|/ / | | |/| | | | | | | | |
| * | | | | | | | | | | Merge branch 'selector-refactor' into 'master' Jacob Schatz2016-06-211-14/+19
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | jQuery selector refactor in application.js.selector-refactorFatih Acet2016-06-211-14/+19
| * | | | | | | | | | | Merge branch 'nav-count-alignment-ff' into 'master' Jacob Schatz2016-06-211-1/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | |
| | * | | | | | | | | | Fixed issue with navbar counts being misalignednav-count-alignment-ffPhil Hughes2016-06-211-1/+0
| | |/ / / / / / / / /
| * | | | | | | | | | Merge branch 'fix-button-title' into 'master' Jacob Schatz2016-06-211-1/+1
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Capitalize button textfix-button-titleAlfredo Sumaran2016-06-211-1/+1
| | | |_|_|_|_|_|_|/ / | | |/| | | | | | | |
| * | | | | | | | | | Merge branch 'dz-fix-appearance-preview' into 'master' Jacob Schatz2016-06-213-28/+9
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Fix admin appearance settings previewdz-fix-appearance-previewDmitriy Zaporozhets2016-06-203-28/+9
| * | | | | | | | | | | Merge branch 'date-picker-hover' into 'master' Jacob Schatz2016-06-211-4/+6
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Fixed hover of date picker calendardate-picker-hoverPhil Hughes2016-06-201-4/+6
| | | |_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | |
| * | | | | | | | | | | Merge branch '18854-prio-labels-on-mobile' into 'master' Jacob Schatz2016-06-211-2/+2
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Fixes labels view on mobile18854-prio-labels-on-mobileAlfredo Sumaran2016-06-201-2/+2
* | | | | | | | | | | | | Put wiki page history content into containerDmitriy Zaporozhets2016-06-211-33/+33
* | | | | | | | | | | | | Add new page button to wiki home18533-graphs-wiki-subnavAnnabel Dunstone2016-06-211-0/+3
* | | | | | | | | | | | | Move new page link out of sub navAnnabel Dunstone2016-06-213-7/+5
* | | | | | | | | | | | | Add new style for sub header block infoAnnabel Dunstone2016-06-218-11/+18
* | | | | | | | | | | | | Fix graph columnsAnnabel Dunstone2016-06-212-5/+14
* | | | | | | | | | | | | Style wiki sub nav linksAnnabel Dunstone2016-06-217-84/+95