summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* elastic: almost all integrated exept view logicelasticsearchValery Sizov2016-01-0713-85/+58
* elastic search init commitValery Sizov2016-01-0516-35/+1075
* Merge branch 'improve_weight_icon' into 'master' Dmitriy Zaporozhets2016-01-054-3/+3
|\
| * Improve weight iconDrew Blessing2015-12-225-4/+3
* | Merge branch 'approvers_data_consistency' into ee_masterValery Sizov2016-01-042-4/+6
|\ \
| * | User is not automatically removed from suggested approvers list if user is de...Valery Sizov2015-12-302-4/+6
* | | Merge branch 'approvals_reset_for_fork' into 'master' Dmitriy Zaporozhets2016-01-043-10/+8
|\ \ \
| * | | Approvals are not reset after a new push is made if the request is coming fro...Valery Sizov2015-12-303-10/+8
| |/ /
* | | Merge branch 'jenkins-integration-fix' into 'master' Marin Jankovski2016-01-041-1/+1
|\ \ \ | |/ / |/| |
| * | Added class to self when calling a post method.Jose Torres2015-12-311-1/+1
|/ /
* | Merge branch 'ce_upstream' into 'master' Valery Sizov2015-12-30176-778/+17601
|\ \
| * | fixes tests so KRB5 button is clickableJacob Schatz2015-12-291-1/+2
| * | fix spinachValery Sizov2015-12-292-2/+2
| * | fix syntax errorValery Sizov2015-12-291-3/+3
| * | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ee into ce_upstreamValery Sizov2015-12-298-285/+292
| |\ \
| * | | fixes conflicts with frontend codeJacob Schatz2015-12-282-82/+65
| * | | Merge remote-tracking branch 'origin/master' into ce_upstreamValery Sizov2015-12-25175-1034/+17873
| |\ \ \
| | * \ \ 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