summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master-create-group-projects' into 'master'Dmitriy Zaporozhets2014-05-2810-68/+81
|\
| * Allow masters to create projects in groupsDmitriy Zaporozhets2014-05-282-2/+2
| * Use new Projects::TransferService classDmitriy Zaporozhets2014-05-281-1/+1
| * Add ability rule for creating project in namespaceDmitriy Zaporozhets2014-05-284-5/+15
| * Refactor project transfer service. Add security check when create or transfer...Dmitriy Zaporozhets2014-05-283-60/+63
* | Merge pull request #7032 from erbunao/markdown_clipboardDmitriy Zaporozhets2014-05-289-23/+127
|\ \ | |/ |/|
| * Implements and refactors clipboard feature for markdown.erbunao2014-05-289-23/+127
* | Fix haml indentDmitriy Zaporozhets2014-05-281-3/+3
* | Backport CI service refactoring from EEDmitriy Zaporozhets2014-05-289-5/+61
|/
* Dont show remove source branch ckecbox/button if you dont have suchDmitriy Zaporozhets2014-05-274-12/+2
* Make MR dicussion and changes tabs more noticableDmitriy Zaporozhets2014-05-272-4/+13
* Merge branch 'no_link_inside_code_block' into 'master'Dmitriy Zaporozhets2014-05-271-65/+48
|\
| * Make sure slashes are handled properly.Marin Jankovski2014-05-261-0/+8
| * Do not replace links inside code blocks, less code for the same amount of work.Marin Jankovski2014-05-261-67/+42
* | Use css truncation on dashboardDmitriy Zaporozhets2014-05-266-14/+36
|/
* Move logic to image_service.Marin Jankovski2014-05-262-11/+42
* Make existing tests test something, return correct errors.Marin Jankovski2014-05-262-6/+15
* Fix help testsDmitriy Zaporozhets2014-05-241-13/+2
* Fix specs. Fix note form reset after submitDmitriy Zaporozhets2014-05-241-3/+2
* Remove unused cssDmitriy Zaporozhets2014-05-241-17/+0
* Improve notes form UI/UXDmitriy Zaporozhets2014-05-247-58/+75
* Improve comments cssDmitriy Zaporozhets2014-05-241-12/+6
* Merge branch 'branch-creation-flow' into 'master'Dmitriy Zaporozhets2014-05-233-4/+4
|\
| * Fix testsDmitriy Zaporozhets2014-05-231-1/+1
| * Branch link on branches page goes to tree view instead of commitsDmitriy Zaporozhets2014-05-231-1/+1
| * Redirect to tree view after branch createdDmitriy Zaporozhets2014-05-231-2/+2
* | Merge branch 'move-protected-branches' into 'master'Dmitriy Zaporozhets2014-05-2312-113/+108
|\ \
| * | Move protected branches to Project settingsDmitriy Zaporozhets2014-05-2312-113/+108
| |/
* | Replace jquery deprecated .live with .onMarin Jankovski2014-05-231-1/+1
|/
* Implements drag and drop upload in creating issuesEarle Bunao & Neil Calabroso2014-05-2321-41/+307
* Merge branch 'api-remove-branch' into 'master'Dmitriy Zaporozhets2014-05-235-14/+66
|\
| * Improve protected branch explanationDmitriy Zaporozhets2014-05-221-5/+5
| * Improve branch-removal logicDmitriy Zaporozhets2014-05-223-9/+8
| * Add BranchesHelperDmitriy Zaporozhets2014-05-221-0/+11
| * Delete branch service with permission checksDmitriy Zaporozhets2014-05-221-0/+42
* | Merge branch 'fix-scroll-to' into 'master'Dmitriy Zaporozhets2014-05-222-2/+2
|\ \
| * | Fix scroll to highlighted line. Replace scrollTO js file with gemDmitriy Zaporozhets2014-05-222-2/+2
| |/
* | Fix testsDmitriy Zaporozhets2014-05-221-1/+1
* | Merge pull request #7002 from olafmandel/user_avatar_in_relative_rootDmitriy Zaporozhets2014-05-222-2/+2
|\ \
| * | Fix avatar URLs in JS-lists for relative_url_rootOlaf Mandel2014-05-202-2/+2
* | | Merge pull request #7005 from alankehoe/masterDmitriy Zaporozhets2014-05-221-1/+4
|\ \ \
| * | | Update message on the group dashboard pageAlan Kehoe2014-05-201-1/+4
| | |/ | |/|
* | | Merge branch 'improved-edit-file-ui' into 'master'Dmitriy Zaporozhets2014-05-223-11/+19
|\ \ \
| * | | Improve edit page UI/UXDmitriy Zaporozhets2014-05-223-11/+19
| |/ /
* | | Merge branch 'new-group-avatar' into 'master'Dmitriy Zaporozhets2014-05-221-0/+11
|\ \ \
| * | | Allow set group avatar when create group. Not only edit pageDmitriy Zaporozhets2014-05-201-0/+11
| | |/ | |/|
* | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into grammar_fixesMarc Radulescu2014-05-2276-370/+757
|\ \ \ | | |/ | |/|
| * | Merge branch 'small-ui-improvements' into 'master'Dmitriy Zaporozhets2014-05-202-5/+4
| |\ \
| | * | Fix UI for wiki error messageDmitriy Zaporozhets2014-05-201-3/+2
| | * | Fix admin user errors uiDmitriy Zaporozhets2014-05-201-2/+2
| | |/