summaryrefslogtreecommitdiff
path: root/config
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into decouple-member-notificationDouglas Barbosa Alexandre2016-04-117-10/+13
|\
| * Enable asset compression in production.connorshea2016-04-091-0/+3
| * Merge branch 'rs-update-rails' into 'master' Robert Speicher2016-04-091-0/+1
| |\
| | * Bump rails to 4.2.6rs-update-railsRobert Speicher2016-04-051-0/+1
| * | Merge branch 'redis-connection-pool' into 'master' Robert Speicher2016-04-084-10/+8
| |\ \
| | * | Put CACHE_NAMESPACE in the Gitlab::Redis moduleJacob Vosmaer2016-04-071-3/+1
| | * | Add Gitlab::Redis connection poolJacob Vosmaer2016-04-044-7/+7
| | |/
| * | Instrument Rails cache codeinstrument-rails-cacheYorick Peterse2016-04-081-0/+1
* | | Use singular resource for NotificationSettingDouglas Barbosa Alexandre2016-04-081-2/+2
* | | Merge branch 'master' into decouple-member-notificationDouglas Barbosa Alexandre2016-04-085-9/+14
|\ \ \ | |/ /
| * | Remove dumb debug statement and add many tests.Jacob Schatz2016-04-072-2/+1
| * | Add optional colon.Jacob Schatz2016-04-071-1/+2
| * | Merge branch 'feature/expose-builds-badge' into 'master' Rémy Coutable2016-04-071-3/+4
| |\ \
| | * | Add project badges view prototypeGrzegorz Bizon2016-04-061-1/+1
| | * | Improve routes for project badgesGrzegorz Bizon2016-04-061-3/+4
| * | | Merge branch 'saml-external-groups' into 'master' Robert Speicher2016-04-071-0/+3
| |\ \ \
| | * | | Added documentationPatricio Cano2016-04-061-0/+1
| | * | | Config examplesPatricio Cano2016-04-041-0/+2
| | | |/ | | |/|
| * | | Merge branch 'patch/fix-markdown-preview-wikis' into 'master' Robert Speicher2016-04-071-0/+1
| |\ \ \ | | |_|/ | |/| |
| | * | Add specific markdown_preview route for WikisGabriel Mazetto2016-03-301-0/+1
| * | | Premailer shouldn't remove script tags from our emailsRobert Speicher2016-04-051-1/+2
| | |/ | |/|
| * | Remove "Congratulations!" tweet button on newly-created project.connorshea2016-03-311-1/+0
| * | Improve and finish the fallback to the In-Reply-To and References header for ...2364-fallback-to-in-reply-to-headerRémy Coutable2016-03-252-2/+2
| |/
* | Change how notification settings in profile are rendered and updatedDmitriy Zaporozhets2016-03-301-0/+1
* | Create NotificationSettings object only when user change value in dropdownDmitriy Zaporozhets2016-03-301-0/+1
|/
* Merge branch 'rs-rails-routes' into 'master' Douwe Maan2016-03-231-0/+12
|\
| * Add special cases for built-in Rails routes in developmentRobert Speicher2016-03-221-0/+12
* | Fix an issue causing the Dashboard/Milestones page to be blankRémy Coutable2016-03-231-2/+1
|/
* Merge branch 'master' into 2489-soft-delete-issuesZeger-Jan van de Weg2016-03-212-0/+8
|\
| * Merge branch 'backport-ee-premailer' into 'master' Rémy Coutable2016-03-212-0/+8
| |\
| | * Inline mailer CSS using premailer.Douwe Maan2016-03-192-0/+8
* | | Soft delete issuablesZeger-Jan van de Weg2016-03-191-2/+2
|/ /
* | Merge remote-tracking branch 'origin/master' into remove-wipRémy Coutable2016-03-1814-89/+366
|\ \ | |/
| * Fixes issue on dashboard issuesPhil Hughes2016-03-181-0/+2
| * Added omniauth-auth0 Gem + Applicable Documentation.Daniel Carraro2016-03-161-0/+6
| * Merge branch 'support-utf8-wiki-page-title' into 'master' Douwe Maan2016-03-161-0/+13
| |\
| | * Support Wiki with UTF-8 page nameHiroyuki Sato2016-03-161-0/+13
| * | Original implementation to allow users to subscribe to labelsTimothy Andrew2016-03-151-0/+4
| |/
| * Merge branch 'application-settings' into 'master' Robert Speicher2016-03-151-1/+1
| |\
| | * Let `oauth/applications#index` handle the `profiles#applications` routeapplication-settingsRobert Speicher2016-03-131-1/+1
| * | Merge branch 'share-project-ce' into 'master' Dmitriy Zaporozhets2016-03-141-0/+2
| |\ \
| | * | Add functionality to setup share of project with group via project settingsDmitriy Zaporozhets2016-03-111-0/+2
| * | | Revert "Revert "Merge branch 'support-go-subpackages' into 'master' ""Stan Hu2016-03-121-0/+1
| * | | Revert "Merge branch 'support-go-subpackages' into 'master' "Douwe Maan2016-03-121-1/+0
| * | | Merge branch 'support-go-subpackages' into 'master' Douwe Maan2016-03-121-0/+1
| |\ \ \
| | * | | Support Golang subpackage fetchingsupport-go-subpackagesStan Hu2016-03-121-0/+1
| | |/ /
| * | | Merge branch 'filter-import-url' into 'master' Douwe Maan2016-03-121-1/+1
| |\ \ \
| | * | | Filter import_url params because they may contain auth information. Fixes #14199filter-import-urlJosh Frye2016-03-101-1/+1
| | |/ /
| * | | Merge branch 'rs-issue-12944' into 'master' Douwe Maan2016-03-111-5/+5
| |\ \ \
| | * | | Use a custom Devise failure app to handle unauthenticated .zip requestsrs-issue-12944Robert Speicher2016-03-081-5/+5
View Lorry Controller Status