summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into emoji-picker-searchemoji-picker-searchValery Sizov2015-12-2452-339/+991
|\
| * Merge branch 'new-nav-width' into 'master' Dmitriy Zaporozhets2015-12-241-0/+2
| |\
| | * nav full widthnew-nav-widthAndriy Dyadyura2015-12-241-0/+2
| * | Merge branch 'edit-on-fork' into 'master' Dmitriy Zaporozhets2015-12-2431-307/+596
| |\ \
| | * | Fix specedit-on-forkDouwe Maan2015-12-211-2/+2
| | * | Add tests for new functionalityDouwe Maan2015-12-213-15/+122
| | * | Fix specsDouwe Maan2015-12-191-1/+1
| | * | Merge branch 'master' into edit-on-forkDouwe Maan2015-12-1811-61/+66
| | |\ \
| | * | | Fix specsDouwe Maan2015-12-181-2/+2
| | * | | Fix specs and behavior for LFS filesDouwe Maan2015-12-187-19/+25
| | * | | Satisfy RubocopDouwe Maan2015-12-183-4/+4
| | * | | Automatically fork a project when not allowed to edit a file.Douwe Maan2015-12-1829-273/+452
| * | | | Merge branch 'fix/visibility-level-setting-in-forked-projects' into 'master' Douwe Maan2015-12-247-14/+121
| |\ \ \ \
| | * | | | Add some specs for forked project visibility_level casesTomasz Maczukin2015-12-242-0/+63
| | * | | | Merge branch 'master' into fix/visibility-level-setting-in-forked-projectsTomasz Maczukin2015-12-211125-13108/+17540
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'master' into fix/visibility-level-setting-in-forked-projectsTomasz Maczukin2015-11-20500-3113/+9065
| | |\ \ \ \ \
| | * | | | | | Change update_forks_visibility_level into after_update hook in Project modelTomasz Maczukin2015-11-202-14/+13
| | * | | | | | Prevent unnecessary forks iteration at parent updateTomasz Maczukin2015-11-191-3/+5
| | * | | | | | Change forks method to has_many relationTomasz Maczukin2015-11-182-8/+6
| | * | | | | | Merge branch 'master' into fix/visibility-level-setting-in-forked-projectsTomasz Maczukin2015-11-0653-243/+282
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'master' into fix/visibility-level-setting-in-forked-projectsTomasz Maczukin2015-11-0452-140/+399
| | |\ \ \ \ \ \ \
| | * | | | | | | | Update forks visibility_level after parent project visibility_level changeTomasz Maczukin2015-11-042-14/+40
| | * | | | | | | | Fix GitlabV::isibilityLevel::level_name methodTomasz Maczukin2015-11-041-1/+1
| | * | | | | | | | Fix Project update serviceTomasz Maczukin2015-11-032-1/+10
| | * | | | | | | | Move level_name resolving to Gitlan::VisibilityLevelTomasz Maczukin2015-11-032-4/+10
| | * | | | | | | | Move visibility_level check for forked projects to Project modelTomasz Maczukin2015-11-032-2/+6
| * | | | | | | | | Merge branch 'branch-invalid-name' into 'master' Douwe Maan2015-12-248-9/+251
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Add helper methods to JS validation spec for invalid branch namesbranch-invalid-nameDouglas Barbosa Alexandre2015-12-221-87/+92
| | * | | | | | | | | Fix minor stylistic complaintsDouglas Barbosa Alexandre2015-12-213-39/+38
| | * | | | | | | | | Fix specDouglas Barbosa Alexandre2015-12-181-1/+1
| | * | | | | | | | | Merge branch 'master' into branch-invalid-nameDouglas Barbosa Alexandre2015-12-1829-289/+420
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Add specs for JS validation for invalid characters in branch nameDouglas Barbosa Alexandre2015-12-172-0/+159
| | * | | | | | | | | | Add restriction for single characters in branch nameDouglas Barbosa Alexandre2015-12-171-2/+8
| | * | | | | | | | | | Remove extra spaces in the error messagesDouglas Barbosa Alexandre2015-12-171-3/+3
| | * | | | | | | | | | Add JS validation for invalid characters in branch nameDouglas Barbosa Alexandre2015-12-175-8/+81
| | * | | | | | | | | | Remove the hint on the branch name inputDouglas Barbosa Alexandre2015-12-161-1/+0
| | * | | | | | | | | | Add more descriptive error message when create branch with invalid nameDouglas Barbosa Alexandre2015-12-163-2/+3
| * | | | | | | | | | | Merge branch 'issue_4189' into 'master' Douwe Maan2015-12-243-1/+13
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Fix redirect to wrong URL when merging and MR detail URL has an anchor. #4189issue_4189Rubén Dávila2015-12-213-1/+13
| * | | | | | | | | | | | Merge branch 'emoji-picker-fix' into 'master' Valery Sizov2015-12-249-47/+13793
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'rs-bump-underscore-rails' into 'master' Dmitriy Zaporozhets2015-12-242-3/+3
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Bump underscore-rails to ~> 1.8.0rs-bump-underscore-railsRobert Speicher2015-12-232-3/+3
| * | | | | | | | | | | | | Merge branch 'filter-project-list-fix' into 'master' Dmitriy Zaporozhets2015-12-241-5/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | fixes the search for projectsfilter-project-list-fixJacob Schatz2015-12-231-5/+5
* | | | | | | | | | | | | | | fix specsValery Sizov2015-12-242-2/+2
* | | | | | | | | | | | | | | Merge branch 'emoji-picker-fix' into emoji-picker-searchValery Sizov2015-12-241-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | fix specemoji-picker-fixValery Sizov2015-12-241-2/+2
* | | | | | | | | | | | | | | Merge remote-tracking branch 'origin/master' into emoji-picker-searchValery Sizov2015-12-2442-106/+203
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge branch 'its-its' into 'master' Robert Speicher2015-12-242-7/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | Fix spelling of "it's" to "its" where appropriate.cafuego2015-12-242-7/+7
| |/ / / / / / / / / / / / /