summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* fix typofix/project-export-errorJames Lopez2016-07-061-1/+1
* even more debugJames Lopez2016-07-063-3/+5
* add more debug info to project exportJames Lopez2016-07-051-0/+4
* Merge branch 'upgrade-doorkeeper' into 'master' Robert Speicher2016-07-052-4/+4
|\
| * Upgrade Doorkeeper from 3.1.0 to 4.0.0.upgrade-doorkeeperConnor Shea2016-07-012-4/+4
* | Merge branch 'dz-remove-profile-sidebar' into 'master' Dmitriy Zaporozhets2016-07-056-43/+10
|\ \
| * | Set user data in profile link in the headerDmitriy Zaporozhets2016-07-052-7/+3
| * | Fix profile test to click on header user profile linkDmitriy Zaporozhets2016-07-052-3/+6
| * | Remove current user link to the profile from sidebarDmitriy Zaporozhets2016-07-053-34/+2
|/ /
* | Merge branch 'dz-add-profile-settings-link' into 'master' Dmitriy Zaporozhets2016-07-051-0/+2
|\ \
| * | Add profile settings link to header user dropdowndz-add-profile-settings-linkDmitriy Zaporozhets2016-07-051-0/+2
* | | 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
View Lorry Controller Status