summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Enable SpaceBeforeBrace rule for SCSS Lintconnorshea2016-03-3013-19/+19
* Merge branch '14547_todo-click' into 'master' Jacob Schatz2016-03-303-1/+12
|\
| * Clear .todo listener14547_todo-clickAnnabel Dunstone2016-03-301-0/+1
| * Change window.location to use turbolinksAnnabel Dunstone2016-03-301-3/+2
| * Make entire todo row clickableAnnabel Dunstone2016-03-303-1/+12
* | 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 '2364-fallback-to-in-reply-to-header' into 'master' Douwe Maan2016-03-301-0/+4
|\ \
| * | Improve and finish the fallback to the In-Reply-To and References header for ...2364-fallback-to-in-reply-to-headerRémy Coutable2016-03-251-7/+5
| * | Fix #2364. Fall back to In-Reply-To header when reply key not availableDavid Padilla2016-03-251-1/+7
* | | Merge branch 'patch/fix-mergerequest-diff' into 'master' Robert Speicher2016-03-302-6/+6
|\ \ \
| * | | We need `sha` reference from `diff_base_commit` to generate the diffGabriel Mazetto2016-03-291-2/+2
| * | | Use `diff_base_commit` instead of `target_branch` to generate diffsGabriel Mazetto2016-03-292-6/+6
* | | | 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
| | |/ | |/|
* | | Remove console logsJacob Schatz2016-03-301-1/+0
* | | Off the event initiallyJacob Schatz2016-03-301-1/+2
* | | Collapsed sidebar opens over instead of pushing content.Jacob Schatz2016-03-302-1/+7
* | | Sidebar collapse update issueJacob Schatz2016-03-307-18/+71
* | | User selection from collapsed sidebarJacob Schatz2016-03-301-0/+17
* | | Add json response for user avatar in merge requestJacob Schatz2016-03-301-1/+1
* | | Make changed values visible in minimized sidebar.Jacob Schatz2016-03-303-25/+39
* | | Fixed issue with notification settings not savingPhil Hughes2016-03-301-16/+17
* | | Merge branch 'added-milestone-upcoming' into 'master' Rémy Coutable2016-03-3010-53/+67
|\ \ \ | |_|/ |/| |
| * | Updated based on Ruby feedbackPhil Hughes2016-03-292-2/+2
| * | Ruby fixesPhil Hughes2016-03-292-12/+5
| * | Fixed multiselectPhil Hughes2016-03-292-28/+6
| * | Fixed rubocop issuesPhil Hughes2016-03-291-5/+6
| * | Fixed issue with milestone not being un-selectablePhil Hughes2016-03-291-0/+2
| * | Standardised the output of the JSON to always include the namePhil Hughes2016-03-296-14/+31
| * | Removed un-used codePhil Hughes2016-03-291-11/+0
| * | Updated to only include upcoming on filtersPhil Hughes2016-03-292-3/+24
| * | Dropdown bug fixesPhil Hughes2016-03-296-23/+36
* | | Merge branch 'fix-mr-comment-commit-pruned' into 'master' Robert Speicher2016-03-292-4/+9
|\ \ \
| * | | Gracefully handle notes on deleted commits in merge requestsStan Hu2016-03-282-4/+9
* | | | Merge branch 'fix_wip_in_mr_api' into 'master' Robert Speicher2016-03-291-1/+1
|\ \ \ \
| * | | | Ensuring Merge Request API returns boolean values for work_in_progressAbhi Rao2016-03-281-1/+1
* | | | | Merge branch 'handle-nil-description-slack-message' into 'master' Robert Speicher2016-03-291-1/+1
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Handle nil descriptions in Slack issue messagesStan Hu2016-03-281-1/+1
| | |/ / | |/| |
* | | | Merge branch 'fix/nomethod-error-on-ci' into 'master' Rémy Coutable2016-03-292-21/+9
|\ \ \ \
| * | | | Redirect to root path when visiting `/ci`fix/nomethod-error-on-ciGrzegorz Bizon2016-03-292-20/+4
| * | | | Add definition of before action that has been movedGrzegorz Bizon2016-03-251-1/+5
| | |_|/ | |/| |
* | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqMarin Jankovski2016-03-292-16/+46
|\ \ \ \
| * \ \ \ Merge branch 'fix-14607' into 'master' Douwe Maan2016-03-292-16/+46
| |\ \ \ \
| | * | | | Ensure project snippets have their own access levelRémy Coutable2016-03-252-16/+32
| | * | | | Ensure private project snippets are not viewable by unauthorized peopleRémy Coutable2016-03-252-1/+15
| | |/ / /
* | | | | Merge branch 'rs-remove-wip-tabindex' into 'master' Douwe Maan2016-03-291-2/+2
|\ \ \ \ \
| * | | | | Remove tabstop from the WIP toggle linksrs-remove-wip-tabindexRobert Speicher2016-03-281-2/+2
| |/ / / /
* | | | | Merge branch 'fix-dropdown-item-height' into 'master' Jacob Schatz2016-03-291-1/+5
|\ \ \ \ \
| * | | | | Set properly line heightsAlfredo Sumaran2016-03-281-1/+5