summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | Merge pull request #9915 from huacnlee/avoid-ability-methods-allocationsDmitriy Zaporozhets2015-12-241-8/+8
| |\ \ \ \ \
| | * | | | | Avoid allocations in Ability class.Jason Lee2015-12-161-8/+8
* | | | | | | Merge branch 'ldap-special-chars-fix' into 'master' Douwe Maan2015-12-241-0/+1
|\ \ \ \ \ \ \
| * | | | | | | Fix identity and user retrieval when special characters are usedPatricio Cano2015-12-221-0/+1
* | | | | | | | Merge branch 'emoji_picker_frequently_used' into 'master' Valery Sizov2015-12-241-1/+27
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | added default for frequently used emojisValery Sizov2015-12-241-7/+9
| * | | | | | | fix of frequently used emojisValery Sizov2015-12-241-3/+3
| * | | | | | | Merge branch 'emoji-picker-search' into emoji_picker_frequently_usedValery Sizov2015-12-2438-312/+611
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'emoji-picker-search'into emoji_picker_frequently_usedemoji_picker_frequently_usedValery Sizov2015-12-24116-667/+1113
| |\ \ \ \ \ \ \ \
| * | | | | | | | | add frequently used category to emoji pickerValery Sizov2015-12-221-0/+26
| * | | | | | | | | TYPO in the commentValery Sizov2015-12-221-1/+1
| * | | | | | | | | customize niceScrollValery Sizov2015-12-221-1/+1
| * | | | | | | | | fix specsValery Sizov2015-12-221-2/+4
| * | | | | | | | | emoji css refactoringValery Sizov2015-12-221-1262/+1267
| * | | | | | | | | base implementation of emoji picker [ci skip]Valery Sizov2015-12-228-56/+1372
* | | | | | | | | | Merge branch 'fix-explore-ui' into 'master' Dmitriy Zaporozhets2015-12-243-3/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix explore projects page UIfix-explore-uiDmitriy Zaporozhets2015-12-243-3/+3
* | | | | | | | | | | Merge branch 'new-project-header-redesign' into 'master' Dmitriy Zaporozhets2015-12-248-23/+142
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | |
| * | | | | | | | | | fixes css spacing issuesnew-project-header-redesignJacob Schatz2015-12-231-27/+27
| * | | | | | | | | | Moves star code to a classJacob Schatz2015-12-233-35/+25
| * | | | | | | | | | fixes failing test by updating project clone instructionsJacob Schatz2015-12-232-6/+7
| * | | | | | | | | | Merge branch 'master' into new-project-header-redesignJacob Schatz2015-12-2313-39/+80
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | refactoring javascript to put starring functionality in a functionJacob Schatz2015-12-231-19/+24
| * | | | | | | | | | | spacing changed from 4 to 2 in ` _clone_panel.html.haml`.Jacob Schatz2015-12-231-21/+21
| * | | | | | | | | | | spinach tests will pass nowJacob Schatz2015-12-231-1/+1
| * | | | | | | | | | | dropdown chooses right defaultJacob Schatz2015-12-231-4/+5
| * | | | | | | | | | | adds dropdown for cloningJacob Schatz2015-12-233-15/+49
| * | | | | | | | | | | adds starring and unstarring text to star button, also adds partial new stylesJacob Schatz2015-12-233-4/+22
| * | | | | | | | | | | arrows for buttonsJacob Schatz2015-12-234-2/+72
* | | | | | | | | | | | Merge branch 'emoji-picker-search' into 'master' Valery Sizov2015-12-244-3/+30
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | / / / / / / | | |_|_|_|/ / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge remote-tracking branch 'origin/master' into emoji-picker-searchemoji-picker-searchValery Sizov2015-12-2436-310/+609
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | fix specsValery Sizov2015-12-242-2/+2
| | |_|_|_|/ / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge remote-tracking branch 'origin/master' into emoji-picker-searchValery Sizov2015-12-2422-75/+128
| |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | |
| * | | | | | | | | | fixes after reviewValery Sizov2015-12-244-6/+6
| * | | | | | | | | | Merge branch 'emoji-picker-fix' into emoji-picker-searchValery Sizov2015-12-243-8/+15
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | emoji picker searchValery Sizov2015-12-233-1/+28
* | | | | | | | | | | | Merge branch 'fix-milestones-with-slashes' into 'master' Dmitriy Zaporozhets2015-12-241-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Fix Error 500 when global milestones have slashesStan Hu2015-12-221-1/+1
| | |_|_|_|_|/ / / / / | |/| | | | | | | | |
* | | | | | | | | | | 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-2427-283/+469
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Add tests for new functionalityDouwe Maan2015-12-211-1/+5
| * | | | | | | | | | | | Merge branch 'master' into edit-on-forkDouwe Maan2015-12-182-47/+52
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Fix specs and behavior for LFS filesDouwe Maan2015-12-186-16/+22
| * | | | | | | | | | | | | Satisfy RubocopDouwe Maan2015-12-183-4/+4
| * | | | | | | | | | | | | Automatically fork a project when not allowed to edit a file.Douwe Maan2015-12-1826-269/+448
| | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'fix/visibility-level-setting-in-forked-projects' into 'master' Douwe Maan2015-12-244-14/+49
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into fix/visibility-level-setting-in-forked-projectsTomasz Maczukin2015-12-21501-5078/+5296
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | |
| * | | | | | | | | | | | | Merge branch 'master' into fix/visibility-level-setting-in-forked-projectsTomasz Maczukin2015-11-20274-1722/+3161
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Change update_forks_visibility_level into after_update hook in Project modelTomasz Maczukin2015-11-202-14/+13
View Lorry Controller Status