summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fixed codestyle and added 2FA documentationfeature/force-tfaGabriel Mazetto2015-12-244-3/+44
* Updated CHANGELOGGabriel Mazetto2015-12-241-0/+1
* Add to application_settings forced TFA optionsGabriel Mazetto2015-12-242-0/+14
* specs for forced two-factor authentication and grace periodGabriel Mazetto2015-12-243-8/+63
* Grace period support for TFAGabriel Mazetto2015-12-247-3/+53
* WIP require two factor authenticationGabriel Mazetto2015-12-246-26/+58
* Merge branch 'fix-add-key-submit' into 'master' Douwe Maan2015-12-242-1/+4
|\
| * Enable "Add key" button when user fills in a proper keyStan Hu2015-12-242-1/+4
* | Update CHANGELOGRobert Speicher2015-12-241-1/+3
|/
* Merge branch 'master' of github.com:gitlabhq/gitlabhqRobert Speicher2015-12-241-8/+8
|\
| * 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 'fix-changelog' into 'master'Robert Speicher2015-12-241-5/+4
|\ \ \
| * | | Move changelog items to their correct place.Douwe Maan2015-12-241-3/+3
* | | | Merge branch 'ldap-special-chars-fix' into 'master' Douwe Maan2015-12-244-4/+20
|\ \ \ \
| * | | | No mb_chars needed anymoreldap-special-chars-fixDouwe Maan2015-12-241-2/+2
| * | | | Fix identity and user retrieval when special characters are usedPatricio Cano2015-12-224-3/+19
* | | | | Merge branch 'emoji_picker_frequently_used' into 'master' Valery Sizov2015-12-243-3/+31
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | added default for frequently used emojisValery Sizov2015-12-242-10/+11
| * | | | fix of frequently used emojisValery Sizov2015-12-241-3/+3
| * | | | Merge branch 'emoji-picker-search' into emoji_picker_frequently_usedValery Sizov2015-12-2454-341/+993
| |\ \ \ \
| * \ \ \ \ Merge branch 'emoji-picker-search'into emoji_picker_frequently_usedemoji_picker_frequently_usedValery Sizov2015-12-24329-1939/+17218
| |\ \ \ \ \
| * | | | | | add frequently used category to emoji pickerValery Sizov2015-12-222-0/+29
| * | | | | | TYPO in the commentValery Sizov2015-12-221-1/+1
| * | | | | | customize niceScrollValery Sizov2015-12-221-1/+1
| * | | | | | add some spinachValery Sizov2015-12-222-0/+12
| * | | | | | fix specsValery Sizov2015-12-223-10/+6
| * | | | | | emoji picker: minor fixesValery Sizov2015-12-221-8/+0
| * | | | | | emoji css refactoringValery Sizov2015-12-221-1262/+1267
| * | | | | | base implementation of emoji picker [ci skip]Valery Sizov2015-12-2210-71/+1412
* | | | | | | 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 'fix-master' into 'master' Douwe Maan2015-12-241-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix NewBranchForm specDouwe Maan2015-12-241-1/+1
* | | | | | | | | Merge branch 'new-project-header-redesign' into 'master' Dmitriy Zaporozhets2015-12-2412-26/+149
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | fixes css spacing issuesnew-project-header-redesignJacob Schatz2015-12-231-27/+27
| * | | | | | | | Moves star code to a classJacob Schatz2015-12-234-37/+27
| * | | | | | | | fixes failing test by updating project clone instructionsJacob Schatz2015-12-234-10/+14
| * | | | | | | | Merge branch 'master' into new-project-header-redesignJacob Schatz2015-12-2321-44/+93
| |\ \ \ \ \ \ \ \
| * | | | | | | | | 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
| * | | | | | | | | fixes rebase issueJacob Schatz2015-12-230-0/+0
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | dropdown chooses right defaultJacob Schatz2015-12-181-4/+5
| | * | | | | | | | | adds dropdown for cloningJacob Schatz2015-12-183-15/+49
| | * | | | | | | | | adds starring and unstarring text to star button, also adds partial new stylesJacob Schatz2015-12-183-4/+22
| | * | | | | | | | | arrows for buttonsJacob Schatz2015-12-184-2/+72
| * | | | | | | | | | spinach tests will pass nowJacob Schatz2015-12-233-2/+3
| * | | | | | | | | | 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