summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'precompile-emoji-urls' into 'master' Dmitriy Zaporozhets2016-03-301-12/+1
|\
| * Pre-calculate Emoji digestsprecompile-emoji-urlsYorick Peterse2016-03-301-12/+1
* | Merge branch 'patch/fix-mergerequest-diff' into 'master' Robert Speicher2016-03-301-2/+2
|\ \
| * | Use `diff_base_commit` instead of `target_branch` to generate diffsGabriel Mazetto2016-03-291-2/+2
* | | Merge branch 'refactor/project-badges-interface' into 'master' Robert Speicher2016-03-301-2/+3
|\ \ \ | |_|/ |/| |
| * | Refactor builds badge, encapsulate inside a classGrzegorz Bizon2016-03-291-2/+3
* | | Add json response for user avatar in merge requestJacob Schatz2016-03-301-1/+1
* | | Standardised the output of the JSON to always include the namePhil Hughes2016-03-291-1/+1
| |/ |/|
* | Merge branch 'fix/nomethod-error-on-ci' into 'master' Rémy Coutable2016-03-291-1/+9
|\ \
| * | Redirect to root path when visiting `/ci`fix/nomethod-error-on-ciGrzegorz Bizon2016-03-291-0/+4
| * | Add definition of before action that has been movedGrzegorz Bizon2016-03-251-1/+5
| |/
* | Merge branch 'fix-14607' into 'master' Douwe Maan2016-03-291-1/+5
|\ \
| * | Ensure project snippets have their own access levelRémy Coutable2016-03-251-1/+1
| * | Ensure private project snippets are not viewable by unauthorized peopleRémy Coutable2016-03-251-1/+5
| |/
* | Merge branch 'functional-sidebar' into 'master' Dmitriy Zaporozhets2016-03-283-10/+9
|\ \
| * | Edit button leaves modal openJacob Schatz2016-03-251-1/+1
| * | Remove unnecessary sentenceAlfredo Sumaran2016-03-251-1/+0
| * | New dropdowns work on merge requests too!Jacob Schatz2016-03-251-4/+1
| * | Adds new dropdown ajax to user selectionJacob Schatz2016-03-251-1/+1
| * | Add labels as proper POST arrays using new dropdownJacob Schatz2016-03-251-1/+7
| * | Add milestone sidebar update via JSONJacob Schatz2016-03-251-1/+1
| * | Ajax call to milestones via new dropdownsJacob Schatz2016-03-251-1/+1
| * | Sidebar milestone updatable via JSONJacob Schatz2016-03-252-5/+1
| * | Updates sidebar milestone to use new dropdownsJacob Schatz2016-03-251-0/+1
| |/
* | Implementing 'Groups View' and 'TODOs View' as options for dashboard preferen...Elias Werberich2016-03-241-0/+4
|/
* Merge branch 'issue_7959' into 'master' Jacob Schatz2016-03-231-8/+9
|\
| * Merge branch 'master' into issue_7959Alfredo Sumaran2016-03-2241-176/+244
| |\
| * | Respond to json requestsAlfredo Sumaran2016-03-171-8/+9
* | | Add missing Dashboard::LabelsControllerRémy Coutable2016-03-231-0/+9
* | | Use respond_to instead of a conditional to paginate milestonesRémy Coutable2016-03-233-8/+9
* | | Fix an issue causing the Dashboard/Milestones page to be blankRémy Coutable2016-03-234-35/+17
| |/ |/|
* | Address feedbackDouwe Maan2016-03-222-2/+3
* | Merge branch 'master' into issue_12658Douwe Maan2016-03-2129-37/+67
|\ \
| * \ Merge branch 'master' into 2489-soft-delete-issuesZeger-Jan van de Weg2016-03-2128-37/+40
| |\ \
| | * \ Merge branch 'feature/issue-move' into 'master' Kamil Trzciński2016-03-211-0/+6
| | |\ \
| | | * \ Merge branch 'master' into feature/issue-moveGrzegorz Bizon2016-03-202-2/+10
| | | |\ \
| | | * | | Do not pass params that are not used in issue move serviceGrzegorz Bizon2016-03-201-1/+1
| | | * | | Merge branch 'master' into feature/issue-moveGrzegorz Bizon2016-03-199-25/+81
| | | |\ \ \
| | | * | | | Improvements in issue move feaure (refactoring)Grzegorz Bizon2016-03-191-4/+4
| | | * | | | Do not pass unsanitized params to issue move serviceGrzegorz Bizon2016-03-171-1/+2
| | | * | | | Add issue move implementation to controllerGrzegorz Bizon2016-03-171-0/+5
| | * | | | | Use the configured Kaminari "per page" defaultrs-use-kaminari-defaultRobert Speicher2016-03-1928-37/+34
| | | |_|/ / | | |/| | |
| * | | | | Minor improvements on IssuableActionsZeger-Jan van de Weg2016-03-214-25/+29
| * | | | | Satisfy rubocopZeger-Jan van de Weg2016-03-192-4/+1
| * | | | | Dry destroy action on issuablesZeger-Jan van de Weg2016-03-193-13/+28
| * | | | | Soft delete issuablesZeger-Jan van de Weg2016-03-191-0/+11
| |/ / / /
* | | | | Add specs and add visibility level to admin groupsFelipe Artur2016-03-211-1/+1
* | | | | Fix some specsDouwe Maan2016-03-202-2/+1
* | | | | Fix "Shared projects" tabDouwe Maan2016-03-201-2/+2
* | | | | Tweaks, refactoring, and specsDouwe Maan2016-03-2010-110/+101