summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* note votes methids implementationupvote_count_to_apiValery Sizov2015-12-291-2/+2
* Revert upvotes and downvotes params to MR APIValery Sizov2015-12-286-21/+22
* Merge branch 'revert_votes_back' into 'master' Dmitriy Zaporozhets2015-12-258-16/+51
|\
| * 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 'rs-opengraph' into 'master' Douwe Maan2015-12-2511-8/+262
|\ \
| * | Add link to twitter docsDouwe Maan2015-12-251-1/+2
| * | Add more twitter metatags.Douwe Maan2015-12-251-0/+6
| * | Add og:site_nameDouwe Maan2015-12-251-2/+2
| * | Satisfy RubocopDouwe Maan2015-12-251-2/+2
| * | Add support for `twitter:label` meta tagsrs-opengraphRobert Speicher2015-12-247-4/+86
| * | Use `request.fullpath` for `og:url` tagRobert Speicher2015-12-241-1/+1
| * | Truncate page_description to 30 wordsRobert Speicher2015-12-242-2/+15
| * | Account for `@project.description` being nilRobert Speicher2015-12-232-1/+9
| * | Add page descriptions and imagesRobert Speicher2015-12-237-9/+149
| * | Add gitlab_logo.png, remove brand_logo.pngRobert Speicher2015-12-232-0/+0
| * | Add Open Graph meta tagsRobert Speicher2015-12-231-1/+5
* | | Merge branch 'adding_crime_security' into 'master' Achilleas Pipinellis2015-12-252-0/+64
|\ \ \ | |_|/ |/| |
| * | Clean up CRIME security doc [ci skip]Achilleas Pipinellis2015-12-251-37/+41
| * | Merge branch 'master' into adding_crime_securityAchilleas Pipinellis2015-12-25228-868/+18553
| |\ \ | |/ / |/| |
* | | 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
|\ \ \ \ \ \ \