summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fixed MergeRequestController specpatch/fix-mergerequest-diffGabriel Mazetto2016-03-302-2/+3
|
* 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-293-4/+10
|\ | | | | | | | | | | | | Gracefully handle notes on deleted commits in merge requests Closes #3250 See merge request !3402
| * Gracefully handle notes on deleted commits in merge requestsStan Hu2016-03-283-4/+10
| | | | | | | | Closes #3250
* | Merge branch ↵Robert Speicher2016-03-295-44/+83
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | 'mariusz_jachimowicz/gitlab-ce-i_14415_expose_label_description' into 'master' api - expose label description Resolves #14415 See merge request !3314
| * | api - expose label descriptionMariusz Jachimowicz2016-03-245-44/+83
| | |
* | | Merge branch 'fix_wip_in_mr_api' into 'master' Robert Speicher2016-03-293-5/+16
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Ensuring Merge Request API returns boolean values for work_in_progress Fixes #14692. See merge request !3432
| * | | Ensuring Merge Request API returns boolean values for work_in_progressAbhi Rao2016-03-283-5/+16
| | | | | | | | | | | | | | | | Fixes #14692
* | | | Merge branch 'handle-nil-description-slack-message' into 'master' Robert Speicher2016-03-293-1/+12
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Handle nil descriptions in Slack issue messages Closes #14676 See merge request !3420
| * | | | Handle nil descriptions in Slack issue messagesStan Hu2016-03-283-1/+12
| | |_|/ | |/| | | | | | | | | | Closes #14676
* | | | Merge branch 'gitlab-shell-2.7' into 'master' Robert Speicher2016-03-291-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated gitlab-shell to 2.7 This is done to include the changes introduced in https://gitlab.com/gitlab-org/gitlab-shell/merge_requests/42. See merge request !3437
| * | | | Updated gitlab-shell to 2.7gitlab-shell-2.7Yorick Peterse2016-03-291-1/+1
|/ / / / | | | | | | | | | | | | | | | | This is done to include the changes introduced in https://gitlab.com/gitlab-org/gitlab-shell/merge_requests/42.
* | | | Merge branch 'rs-fix-migrations' into 'master' Dmitriy Zaporozhets2016-03-295-34/+54
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use raw SQL instead of Rails models in migrations where appropriate Closes #14694. See merge request !3429
| * | | | Use raw SQL instead of Rails models in migrations where appropriaters-fix-migrationsRobert Speicher2016-03-285-34/+54
| | | | | | | | | | | | | | | | | | | | Closes #14694.
* | | | | Merge branch 'doc-update-8.5-to-8.6-fix-steps-order' into 'master' Rémy Coutable2016-03-291-21/+21
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix order of steps to prevent PostgreSQL errors when running migration Supersedes https://github.com/gitlabhq/gitlabhq/pull/10100. /cc @stanhu @rodrigomanhaes See merge request !3355
| * | | | | Fix order of steps to prevent PostgreSQL errors when running migration [ci skip]doc-update-8.5-to-8.6-fix-steps-orderRodrigo Manhães2016-03-221-21/+21
| | | | | |
* | | | | | Merge branch 'fix/nomethod-error-on-ci' into 'master' Rémy Coutable2016-03-294-21/+31
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix error when visiting CI root path Closes #14528, closes #14687 See merge request !3377
| * | | | | | Redirect to root path when visiting `/ci`fix/nomethod-error-on-ciGrzegorz Bizon2016-03-293-25/+20
| | | | | | |
| * | | | | | Add definition of before action that has been movedGrzegorz Bizon2016-03-253-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #14528
* | | | | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqMarin Jankovski2016-03-296-16/+387
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'fix-14607' into 'master' Douwe Maan2016-03-296-16/+387
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure private project snippets are not viewable by unauthorized people Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/14607 See merge request !1946
| | * | | | | | Ensure project snippets have their own access levelRémy Coutable2016-03-255-16/+266
| | | | | | | |
| | * | | | | | Ensure private project snippets are not viewable by unauthorized peopleRémy Coutable2016-03-253-1/+122
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/14607.
* | | | | | | Merge branch 'rs-remove-wip-tabindex' into 'master' Douwe Maan2016-03-291-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove tabstop from the WIP toggle links [ci skip] See merge request !3426
| * | | | | | | Remove tabstop from the WIP toggle linksrs-remove-wip-tabindexRobert Speicher2016-03-281-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | Merge branch 'fix-dropdown-item-height' into 'master' Jacob Schatz2016-03-291-1/+5
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix dropdown line height **Before** ![Screen_Shot_2016-03-28_at_5.54.37_PM](/uploads/67681da80b9104924083f13af3833553/Screen_Shot_2016-03-28_at_5.54.37_PM.png) **After** ![Screen_Shot_2016-03-28_at_5.57.37_PM](/uploads/5df14c2d131cc88dbc75b87959f56c3c/Screen_Shot_2016-03-28_at_5.57.37_PM.png) See merge request !3431
| * | | | | | | | 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 overlapping build section in merge request closes #14608 ![build](/uploads/d1902f5fa335274c92ac1b1a8193466f/build.gif) See merge request !3415
| * | | | | | | | 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 button closes #14412 ![fork_link](/uploads/5afef05bc592b0cf1c90ae4d154aed87/fork_link.gif) See merge request !3387
| * | | | | | | | add link to forks pages in fork counter buttonadd_link_to_fork_counter_buttonArinde Eniola2016-03-242-2/+2
| | | | | | | | |
* | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2016-03-2835-410/+800
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | Merge branch 'functional-sidebar' into 'master' Dmitriy Zaporozhets2016-03-2821-167/+480
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updates sidebar to use new dropdowns for issues and merge requests Fixes #12935, #13164 See merge request !3175
| | * | | | | | | Fix small style issuefunctional-sidebarJacob Schatz2016-03-282-4/+4
| | | | | | | | |
| | * | | | | | | Update, so filtering works properly.Jacob Schatz2016-03-263-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bulk update works as well
| | * | | | | | | 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-255-29/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix underscore template error. Fix `=` spacing
| | * | | | | | | Edit button leaves modal openJacob Schatz2016-03-254-10/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add user avatar to user selection
| | * | | | | | | Add back in currentUserJacob Schatz2016-03-251-1/+1
| | | | | | | | |
| | * | | | | | | Fix features until tests pass.Jacob Schatz2016-03-255-58/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Milestones needed a none selector Assignee needed unassign.
| | * | | | | | | 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-259-17/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added nice animations too.