summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* satisfy rubocoprevert_votes_backValery Sizov2015-12-251-1/+1
* fix spinachValery Sizov2015-12-251-3/+5
* add sorting of awardsValery Sizov2015-12-254-2/+21
* revert back vote buttons to issue and MR pagesValery Sizov2015-12-254-11/+25
* Merge branch 'ci_triggers_docs' into 'master' Achilleas Pipinellis2015-12-257-20/+197
|\
| * Add examples for triggers [ci skip]Achilleas Pipinellis2015-12-251-5/+76
| * Merge branch 'master' into ci_triggers_docsci_triggers_docsAchilleas Pipinellis2015-12-25208-820/+18111
| |\
| * | Add images and examplesAchilleas Pipinellis2015-12-255-2/+95
| * | Remove triggers from yaml doc [ci skip]Achilleas Pipinellis2015-12-241-27/+0
| * | Add triggers doc in top level readme [ci skip]Achilleas Pipinellis2015-12-241-5/+6
| * | Document triggers in yaml/README.md [ci skip]Achilleas Pipinellis2015-12-211-0/+27
| * | Init documentation on Triggers [ci skip]Achilleas Pipinellis2015-12-212-19/+31
* | | Merge branch 'support-api-lookup-by-username' into 'master' Dmitriy Zaporozhets2015-12-254-5/+29
|\ \ \
| * | | Add API support for looking up a user by usernameStan Hu2015-12-244-5/+29
* | | | Merge branch 'feature/force-tfa' into 'master' Dmitriy Zaporozhets2015-12-2516-27/+220
|\ \ \ \ | |_|_|/ |/| | |
| * | | 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 'ref-filter-html' into 'master' Robert Speicher2015-12-245-17/+20
|\ \ \ \ | |/ / / |/| | |
| * | | Escape all the things.Douwe Maan2015-12-245-17/+20
* | | | 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
|\ \ \ \ \ \ \ \ \