Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fixed codestyle and added 2FA documentationfeature/force-tfa | Gabriel Mazetto | 2015-12-24 | 4 | -3/+44 |
* | Updated CHANGELOG | Gabriel Mazetto | 2015-12-24 | 1 | -0/+1 |
* | Add to application_settings forced TFA options | Gabriel Mazetto | 2015-12-24 | 2 | -0/+14 |
* | specs for forced two-factor authentication and grace period | Gabriel Mazetto | 2015-12-24 | 3 | -8/+63 |
* | Grace period support for TFA | Gabriel Mazetto | 2015-12-24 | 7 | -3/+53 |
* | WIP require two factor authentication | Gabriel Mazetto | 2015-12-24 | 6 | -26/+58 |
* | Merge branch 'fix-add-key-submit' into 'master' | Douwe Maan | 2015-12-24 | 2 | -1/+4 |
|\ | |||||
| * | Enable "Add key" button when user fills in a proper key | Stan Hu | 2015-12-24 | 2 | -1/+4 |
* | | Update CHANGELOG | Robert Speicher | 2015-12-24 | 1 | -1/+3 |
|/ | |||||
* | 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 'fix-changelog' into 'master' | Robert Speicher | 2015-12-24 | 1 | -5/+4 |
|\ \ \ | |||||
| * | | | Move changelog items to their correct place. | Douwe Maan | 2015-12-24 | 1 | -3/+3 |
* | | | | Merge branch 'ldap-special-chars-fix' into 'master' | Douwe Maan | 2015-12-24 | 4 | -4/+20 |
|\ \ \ \ | |||||
| * | | | | No mb_chars needed anymoreldap-special-chars-fix | Douwe Maan | 2015-12-24 | 1 | -2/+2 |
| * | | | | Fix identity and user retrieval when special characters are used | Patricio Cano | 2015-12-22 | 4 | -3/+19 |
* | | | | | Merge branch 'emoji_picker_frequently_used' into 'master' | Valery Sizov | 2015-12-24 | 3 | -3/+31 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | |||||
| * | | | | added default for frequently used emojis | Valery Sizov | 2015-12-24 | 2 | -10/+11 |
| * | | | | 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 | 54 | -341/+993 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'emoji-picker-search'into emoji_picker_frequently_usedemoji_picker_frequently_used | Valery Sizov | 2015-12-24 | 329 | -1939/+17218 |
| |\ \ \ \ \ | |||||
| * | | | | | | add frequently used category to emoji picker | Valery Sizov | 2015-12-22 | 2 | -0/+29 |
| * | | | | | | TYPO in the comment | Valery Sizov | 2015-12-22 | 1 | -1/+1 |
| * | | | | | | customize niceScroll | Valery Sizov | 2015-12-22 | 1 | -1/+1 |
| * | | | | | | add some spinach | Valery Sizov | 2015-12-22 | 2 | -0/+12 |
| * | | | | | | fix specs | Valery Sizov | 2015-12-22 | 3 | -10/+6 |
| * | | | | | | emoji picker: minor fixes | Valery Sizov | 2015-12-22 | 1 | -8/+0 |
| * | | | | | | emoji css refactoring | Valery Sizov | 2015-12-22 | 1 | -1262/+1267 |
| * | | | | | | base implementation of emoji picker [ci skip] | Valery Sizov | 2015-12-22 | 10 | -71/+1412 |
* | | | | | | | 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 'fix-master' into 'master' | Douwe Maan | 2015-12-24 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Fix NewBranchForm spec | Douwe Maan | 2015-12-24 | 1 | -1/+1 |
* | | | | | | | | | Merge branch 'new-project-header-redesign' into 'master' | Dmitriy Zaporozhets | 2015-12-24 | 12 | -26/+149 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | 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 | 4 | -37/+27 |
| * | | | | | | | | fixes failing test by updating project clone instructions | Jacob Schatz | 2015-12-23 | 4 | -10/+14 |
| * | | | | | | | | Merge branch 'master' into new-project-header-redesign | Jacob Schatz | 2015-12-23 | 21 | -44/+93 |
| |\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | 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 |
| * | | | | | | | | | fixes rebase issue | Jacob Schatz | 2015-12-23 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | dropdown chooses right default | Jacob Schatz | 2015-12-18 | 1 | -4/+5 |
| | * | | | | | | | | | adds dropdown for cloning | Jacob Schatz | 2015-12-18 | 3 | -15/+49 |
| | * | | | | | | | | | adds starring and unstarring text to star button, also adds partial new styles | Jacob Schatz | 2015-12-18 | 3 | -4/+22 |
| | * | | | | | | | | | arrows for buttons | Jacob Schatz | 2015-12-18 | 4 | -2/+72 |
| * | | | | | | | | | | spinach tests will pass now | Jacob Schatz | 2015-12-23 | 3 | -2/+3 |
| * | | | | | | | | | | 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 |