summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Add a migration to remove requesters that are owners of their project18790-dont-show-request-button-to-project-ownerRémy Coutable2016-07-053-11/+53
* Fix condition in Ability and start with cheaper checksRémy Coutable2016-07-051-7/+7
* New :request_access ability to replace a ugly helperRémy Coutable2016-07-058-87/+73
* Merge branch 'instrument-cache-fetch-hit-and-misses' into 'master' Yorick Peterse2016-07-053-0/+126
|\
| * RailsCache metrics now includes fetch_hit/fetch_miss and read_hit/read_miss i...Paco Guzman2016-07-053-2/+116
| * Instrument cache fetch hit and cache fetch missesPaco Guzman2016-07-051-0/+12
* | Merge branch 'mrchrisw/docs/shibboleth' into 'master' Achilleas Pipinellis2016-07-051-1/+1
|\ \
| * | Fix wording around NGINX Shibboleth setupmrchrisw/docs/shibbolethChris Wilson2016-07-011-1/+1
* | | Merge branch 'doc-mysql-priv' into 'master' Achilleas Pipinellis2016-07-052-5/+21
|\ \ \ | |_|/ |/| |
| * | Add missing privileges to MySQL databaseAchilleas Pipinellis2016-07-052-5/+21
* | | Merge branch 'index-on-emoji-name-and-user' into 'master' Yorick Peterse2016-07-053-1/+14
|\ \ \
| * | | Add index on both Award Emoji user and nameindex-on-emoji-name-and-userZ.J. van de Weg2016-07-053-1/+14
| |/ /
* | | Merge branch 'refactor/ci-config-move-global-entries' into 'master' Rémy Coutable2016-07-0536-275/+1021
|\ \ \ | |/ / |/| |
| * | Add minor improvements in readability in CI configrefactor/ci-config-move-global-entriesGrzegorz Bizon2016-07-046-8/+6
| * | Extract CI configuration entry node factory methodGrzegorz Bizon2016-07-041-8/+12
| * | Improve description of CI types node and in specsGrzegorz Bizon2016-06-302-3/+3
| * | Explicitly define entry node class in new CI configGrzegorz Bizon2016-06-292-11/+11
| * | Add CI config entry validator for allowed keysGrzegorz Bizon2016-06-294-18/+17
| * | Return compound value if CI config node is compositeGrzegorz Bizon2016-06-291-1/+6
| * | Move global CI cache configuration to new CI classesGrzegorz Bizon2016-06-292-29/+3
| * | Add global cache config entry to new CI configGrzegorz Bizon2016-06-2916-36/+64
| * | Add CI config entry location info to error messageGrzegorz Bizon2016-06-294-14/+15
| * | Make it possible to set parent in CI config nodeGrzegorz Bizon2016-06-293-5/+18
| * | Merge branch 'master' into refactor/ci-config-move-global-entriesGrzegorz Bizon2016-06-28552-3362/+7573
| |\ \
| * | | Validate interface only with CI node validatorGrzegorz Bizon2016-06-273-40/+24
| * | | Add new ci config entry that handles cache configGrzegorz Bizon2016-06-275-12/+151
| * | | Add ci config entry that represents array of pathsGrzegorz Bizon2016-06-242-0/+52
| * | | Add ci config class that represents a boolean valueGrzegorz Bizon2016-06-243-0/+62
| * | | Add ci config class that represents a key valueGrzegorz Bizon2016-06-243-0/+62
| * | | Fix ci config cache validation in legacy processorGrzegorz Bizon2016-06-242-3/+16
| * | | Minor refactorings in new CI configuration classesGrzegorz Bizon2016-06-235-6/+10
| * | | Move CI stages configuration to new CI configGrzegorz Bizon2016-06-2312-29/+147
| * | | Assume that unspecified CI config is undefinedGrzegorz Bizon2016-06-238-94/+112
| * | | Return default config value when entry is undefinedGrzegorz Bizon2016-06-229-51/+74
| * | | Handle CI environment variables in a new CI configGrzegorz Bizon2016-06-228-9/+115
| * | | Rename CI config null node entry to undefined nodeGrzegorz Bizon2016-06-225-23/+16
| * | | Return CI entry config as value by defaultGrzegorz Bizon2016-06-214-14/+3
| * | | Handle after script CI config in new classesGrzegorz Bizon2016-06-218-24/+24
| * | | Handle CI services config in new CI config classesGrzegorz Bizon2016-06-217-11/+82
| * | | Move CI image configuration entry to new CI configGrzegorz Bizon2016-06-215-21/+34
| * | | Add image configuration entry to new ci configGrzegorz Bizon2016-06-212-0/+68
| * | | Use generic type validator in new ci configurationGrzegorz Bizon2016-06-213-4/+13
* | | | Merge branch '19496-fix-build' into 'master' Stan Hu2016-07-051-2/+1
|\ \ \ \
| * | | | Assert against `ActionMailer::Base.deliveries` relatively.Timothy Andrew2016-07-051-2/+1
|/ / / /
* | | | Merge branch 'diagnosing-mail-issues' into 'master' Achilleas Pipinellis2016-07-041-2/+51
|\ \ \ \
| * | | | Add troubleshooting section for SMTP settingsStan Hu2016-07-011-2/+51
* | | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqDmitriy Zaporozhets2016-07-047-9/+65
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' into dev-masterTomasz Maczukin2016-07-02396-3101/+7106
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch '18033-private-repo-mentions' into 'master' Douwe Maan2016-06-304-2/+42
| |\ \ \ \ \ \
| | * | | | | | Ensure logged-out users can't see private refsSean McGivern2016-06-304-2/+42