summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* 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 '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
* | | | | | Merge branch 'fix_rightsidebar_overlapping_build_section' into 'master' Jacob Schatz2016-03-291-0/+6
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | fix right sidebar overllaping build section in merge requestfix_rightsidebar_overlapping_build_sectionArinde Eniola2016-03-271-0/+6
* | | | | | Merge branch 'add_link_to_fork_counter_button' into 'master' Jacob Schatz2016-03-282-2/+2
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | add link to forks pages in fork counter buttonadd_link_to_fork_counter_buttonArinde Eniola2016-03-242-2/+2
* | | | | | Merge branch 'functional-sidebar' into 'master' Dmitriy Zaporozhets2016-03-2818-115/+442
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Fix small style issuefunctional-sidebarJacob Schatz2016-03-282-4/+4
| * | | | | Update, so filtering works properly.Jacob Schatz2016-03-263-3/+8
| * | | | | Fix filter so it works with new multi select drop-downs.Jacob Schatz2016-03-251-4/+4
| * | | | | Use hidden inputs instead of `data-selected`Jacob Schatz2016-03-252-10/+7
| * | | | | Fix minor code style issuesJacob Schatz2016-03-253-15/+20
| * | | | | Edit button leaves modal openJacob Schatz2016-03-254-10/+16
| * | | | | Add back in currentUserJacob Schatz2016-03-251-1/+1
| * | | | | Fix features until tests pass.Jacob Schatz2016-03-254-11/+24
| * | | | | Fixed JS error that was failing the buildsPhil Hughes2016-03-251-5/+6
| * | | | | Fixed some colours in sidebarPhil Hughes2016-03-252-4/+8
| * | | | | Add Assign to me button and unassigned.Jacob Schatz2016-03-253-31/+39
| * | | | | Assign current user when no user is assigned linkJacob Schatz2016-03-254-40/+77
| * | | | | Add js-extras so show any and show no for milestones show up.Jacob Schatz2016-03-251-1/+1
| * | | | | Remove console logJacob Schatz2016-03-251-1/+0
| * | | | | Fix subscription button by hooking it back up.Jacob Schatz2016-03-252-0/+2
| * | | | | Fix broken functionality in sidebar after merge.Jacob Schatz2016-03-258-17/+42
| * | | | | Fix endpointAlfredo Sumaran2016-03-253-3/+5
| * | | | | Remove unnecessary sentenceAlfredo Sumaran2016-03-251-1/+0
| * | | | | Add missing #Alfredo Sumaran2016-03-251-1/+1
| * | | | | Rename header for dropdownsJacob Schatz2016-03-251-2/+2
| * | | | | Add multi select stay open functionalityJacob Schatz2016-03-254-31/+58
| * | | | | New dropdowns work on merge requests too!Jacob Schatz2016-03-256-22/+36
| * | | | | Adds new dropdown ajax to user selectionJacob Schatz2016-03-254-6/+43
| * | | | | Adding dropdown for usersJacob Schatz2016-03-252-1/+3
| * | | | | Remove api calls from api.js.coffee.Jacob Schatz2016-03-251-39/+0
| * | | | | Make remove multi and remove single work.Jacob Schatz2016-03-253-12/+8