Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Enable "Add key" button when user fills in a proper key | Stan Hu | 2015-12-24 | 1 | -1/+1 |
* | Merge branch 'master' of github.com:gitlabhq/gitlabhq | Robert Speicher | 2015-12-24 | 1 | -8/+8 |
|\ | |||||
| * | Merge pull request #9915 from huacnlee/avoid-ability-methods-allocations | Dmitriy Zaporozhets | 2015-12-24 | 1 | -8/+8 |
| |\ | |||||
| | * | Avoid allocations in Ability class. | Jason Lee | 2015-12-16 | 1 | -8/+8 |
* | | | Merge branch 'ldap-special-chars-fix' into 'master' | Douwe Maan | 2015-12-24 | 1 | -0/+1 |
|\ \ \ | |||||
| * | | | Fix identity and user retrieval when special characters are used | Patricio Cano | 2015-12-22 | 1 | -0/+1 |
* | | | | Merge branch 'emoji_picker_frequently_used' into 'master' | Valery Sizov | 2015-12-24 | 1 | -1/+27 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | added default for frequently used emojis | Valery Sizov | 2015-12-24 | 1 | -7/+9 |
| * | | | fix of frequently used emojis | Valery Sizov | 2015-12-24 | 1 | -3/+3 |
| * | | | Merge branch 'emoji-picker-search' into emoji_picker_frequently_used | Valery Sizov | 2015-12-24 | 38 | -312/+611 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'emoji-picker-search'into emoji_picker_frequently_usedemoji_picker_frequently_used | Valery Sizov | 2015-12-24 | 116 | -667/+1113 |
| |\ \ \ \ | |||||
| * | | | | | add frequently used category to emoji picker | Valery Sizov | 2015-12-22 | 1 | -0/+26 |
| * | | | | | TYPO in the comment | Valery Sizov | 2015-12-22 | 1 | -1/+1 |
| * | | | | | customize niceScroll | Valery Sizov | 2015-12-22 | 1 | -1/+1 |
| * | | | | | fix specs | Valery Sizov | 2015-12-22 | 1 | -2/+4 |
| * | | | | | emoji css refactoring | Valery Sizov | 2015-12-22 | 1 | -1262/+1267 |
| * | | | | | base implementation of emoji picker [ci skip] | Valery Sizov | 2015-12-22 | 8 | -56/+1372 |
* | | | | | | Merge branch 'fix-explore-ui' into 'master' | Dmitriy Zaporozhets | 2015-12-24 | 3 | -3/+3 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix explore projects page UIfix-explore-ui | Dmitriy Zaporozhets | 2015-12-24 | 3 | -3/+3 |
* | | | | | | | Merge branch 'new-project-header-redesign' into 'master' | Dmitriy Zaporozhets | 2015-12-24 | 8 | -23/+142 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | fixes css spacing issuesnew-project-header-redesign | Jacob Schatz | 2015-12-23 | 1 | -27/+27 |
| * | | | | | | | Moves star code to a class | Jacob Schatz | 2015-12-23 | 3 | -35/+25 |
| * | | | | | | | fixes failing test by updating project clone instructions | Jacob Schatz | 2015-12-23 | 2 | -6/+7 |
| * | | | | | | | Merge branch 'master' into new-project-header-redesign | Jacob Schatz | 2015-12-23 | 13 | -39/+80 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | refactoring javascript to put starring functionality in a function | Jacob Schatz | 2015-12-23 | 1 | -19/+24 |
| * | | | | | | | | spacing changed from 4 to 2 in ` _clone_panel.html.haml`. | Jacob Schatz | 2015-12-23 | 1 | -21/+21 |
| * | | | | | | | | spinach tests will pass now | Jacob Schatz | 2015-12-23 | 1 | -1/+1 |
| * | | | | | | | | dropdown chooses right default | Jacob Schatz | 2015-12-23 | 1 | -4/+5 |
| * | | | | | | | | adds dropdown for cloning | Jacob Schatz | 2015-12-23 | 3 | -15/+49 |
| * | | | | | | | | adds starring and unstarring text to star button, also adds partial new styles | Jacob Schatz | 2015-12-23 | 3 | -4/+22 |
| * | | | | | | | | arrows for buttons | Jacob Schatz | 2015-12-23 | 4 | -2/+72 |
* | | | | | | | | | Merge branch 'emoji-picker-search' into 'master' | Valery Sizov | 2015-12-24 | 4 | -3/+30 |
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | / / / | | |_|_|_|/ / / | |/| | | | | | | |||||
| * | | | | | | | Merge remote-tracking branch 'origin/master' into emoji-picker-searchemoji-picker-search | Valery Sizov | 2015-12-24 | 36 | -310/+609 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | fix specs | Valery Sizov | 2015-12-24 | 2 | -2/+2 |
| | |_|_|_|/ / / | |/| | | | | | | |||||
| * | | | | | | | Merge remote-tracking branch 'origin/master' into emoji-picker-search | Valery Sizov | 2015-12-24 | 22 | -75/+128 |
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | | |||||
| * | | | | | | | fixes after review | Valery Sizov | 2015-12-24 | 4 | -6/+6 |
| * | | | | | | | Merge branch 'emoji-picker-fix' into emoji-picker-search | Valery Sizov | 2015-12-24 | 3 | -8/+15 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | emoji picker search | Valery Sizov | 2015-12-23 | 3 | -1/+28 |
* | | | | | | | | | Merge branch 'fix-milestones-with-slashes' into 'master' | Dmitriy Zaporozhets | 2015-12-24 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Fix Error 500 when global milestones have slashes | Stan Hu | 2015-12-22 | 1 | -1/+1 |
| | |_|_|_|_|/ / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'new-nav-width' into 'master' | Dmitriy Zaporozhets | 2015-12-24 | 1 | -0/+2 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | nav full widthnew-nav-width | Andriy Dyadyura | 2015-12-24 | 1 | -0/+2 |
* | | | | | | | | | Merge branch 'edit-on-fork' into 'master' | Dmitriy Zaporozhets | 2015-12-24 | 27 | -283/+469 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Add tests for new functionality | Douwe Maan | 2015-12-21 | 1 | -1/+5 |
| * | | | | | | | | | Merge branch 'master' into edit-on-fork | Douwe Maan | 2015-12-18 | 2 | -47/+52 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Fix specs and behavior for LFS files | Douwe Maan | 2015-12-18 | 6 | -16/+22 |
| * | | | | | | | | | | Satisfy Rubocop | Douwe Maan | 2015-12-18 | 3 | -4/+4 |
| * | | | | | | | | | | Automatically fork a project when not allowed to edit a file. | Douwe Maan | 2015-12-18 | 26 | -269/+448 |
* | | | | | | | | | | | Merge branch 'fix/visibility-level-setting-in-forked-projects' into 'master' | Douwe Maan | 2015-12-24 | 4 | -14/+49 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into fix/visibility-level-setting-in-forked-projects | Tomasz Maczukin | 2015-12-21 | 501 | -5078/+5296 |
| |\ \ \ \ \ \ \ \ \ \ \ |