summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Validate presence of essential params for diff renderingissue_19096Ruben Davila2016-06-241-0/+7
* Merge branch 'optimize-award-emoji' into 'master' Yorick Peterse2016-06-234-12/+24
|\
| * Preload notes/discussions associations (award_emoji: :user)optimize-award-emojiPaco Guzman2016-06-235-14/+26
| * Eager load award emoji on notesZ.J. van de Weg2016-06-232-2/+2
* | Merge branch '18569-fix-diff-note-position' into 'master' Robert Speicher2016-06-231-1/+1
|\ \ | |/ |/|
| * Restore old behavior around diff notes to outdated discussionsDouwe Maan2016-06-221-1/+1
* | Merge branch 'issue_14563' into 'master' Rémy Coutable2016-06-231-1/+1
|\ \
| * | Fix user creation with stronger minimum password requirements:qNathan Bush2016-06-231-1/+1
* | | Merge branch 'merge-settings-help-link' into 'master' Stan Hu2016-06-231-1/+1
|\ \ \
| * | | Fix merge requests project settings help link anchor.Steve Norman2016-06-231-1/+1
| |/ /
* | | Improve performance of searching tags by name by using a memorized tag array18924-gitlab-ce-tags-page-is-not-working-502-read-timeoutAlejandro Rodríguez2016-06-231-1/+1
* | | Merge branch 'fix-404-for-pipelines' into 'master' Rémy Coutable2016-06-231-1/+2
|\ \ \ | |/ / |/| |
| * | Fix 404 for pipelinesKamil Trzcinski2016-06-231-1/+2
* | | Merge branch '18915-pagination-with-priority-sort-repeats-results' into 'mast...Rémy Coutable2016-06-231-9/+12
|\ \ \
| * | | Fix pagination on sorts with lots of tiesSean McGivern2016-06-231-9/+12
* | | | Merge branch 'fix-clickable-code-search-results' into 'master' Robert Speicher2016-06-232-3/+5
|\ \ \ \ | |_|/ / |/| | |
| * | | renamed path to linkbarthc2016-06-232-5/+5
| * | | Merge branch 'master' into fix-clickable-code-search-resultsbarthc2016-06-23322-2367/+4631
| |\ \ \ | | |/ /
| * | | fix clickable code search resultsbarthc2016-06-142-3/+5
* | | | fixed pipeline notes issueJames Lopez2016-06-231-0/+13
| |/ / |/| |
* | | Merge branch '18857-new-label-page-needs-work-on-mobile' into 'master' Jacob Schatz2016-06-231-0/+1
|\ \ \
| * | | Added bottom padding to label color suggestion link18857-new-label-page-needs-work-on-mobileLuke "Jared" Bennett2016-06-221-0/+1
* | | | Merge branch 'fix-header-logo' into 'master' Jacob Schatz2016-06-231-0/+4
|\ \ \ \
| * | | | Fix header logo width/height issuesJacob Schatz2016-06-231-1/+0
| * | | | Restrict header logo to 36px so it doesn't overflow.fix-header-logoConnor Shea2016-06-221-0/+5
* | | | | Add clarifying comment and a Changelog entry.Connor Shea2016-06-221-0/+3
* | | | | Add Subresource Integrity attribute to CSS and JS assets.Connor Shea2016-06-221-3/+3
|/ / / /
* | | | Merge branch 'arrow-nav-bug' into 'master' Jacob Schatz2016-06-223-17/+10
|\ \ \ \ | |_|_|/ |/| | |
| * | | Hide nav arrows by default; remove settings dropdown btn at larger breakpoint...arrow-nav-bugAnnabel Dunstone2016-06-213-17/+10
* | | | 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
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | |