summaryrefslogtreecommitdiff
path: root/config
Commit message (Expand)AuthorAgeFilesLines
* Fix missing constraints causing route failures when usernames with periods ar...sh-add-user-constraintsStan Hu2016-10-081-1/+4
* Merge branch 'memoize_shell_secret_token' into 'master' Rémy Coutable2016-10-071-1/+1
|\
| * Load Github::Shell's secret token from file on initialization instead of ever...Justin DiPierro2016-10-061-1/+1
* | Add markdown cache columns to the database, but don't use them yetNick Thomas2016-10-071-0/+41
* | Merge branch '23034-memoize-ar-migrator-migrations-in-tests' into 'master' Yorick Peterse2016-10-071-0/+18
|\ \
| * | Memoize ActiveRecord::Migrator.migrations in testsNick Thomas2016-10-061-0/+18
* | | Change user & group landing page routing from /u/:name & /groups/:name to /:nameDmitriy Zaporozhets2016-10-062-12/+31
| |/ |/|
* | Merge branch 'issue-boards-new-issue' into 'master' Fatih Acet2016-10-061-1/+1
|\ \ | |/ |/|
| * Added ability to save the new issuePhil Hughes2016-10-061-1/+1
* | MergeRequest new form load diff asynchronouslynew-merge-requests-commit-tab-activePaco Guzman2016-10-061-0/+1
|/
* Merge commit 'dev/security' into 'master'Rémy Coutable2016-10-062-0/+4
|\
| * Don't send Private-Token headers to SentryJacob Vosmaer2016-10-042-0/+4
* | Cleanup config/routes.rb even further by extracting more routes into separate...dz-more-route-cleanupDmitriy Zaporozhets2016-10-058-66/+65
* | Put namespaces#show route below user ssh keys routeDmitriy Zaporozhets2016-10-051-2/+2
* | Put user keys routing back below project routingDmitriy Zaporozhets2016-10-052-3/+3
* | Split routes on multiple filesdz-split-routesDmitriy Zaporozhets2016-10-0510-803/+775
* | add configurable email subject suffixFu Xu2016-10-032-0/+2
* | Merge branch 'initialize-redis' into 'master' Yorick Peterse2016-09-301-0/+3
|\ \
| * | Initialize Redis pool in single-threaded contextJacob Vosmaer2016-09-301-0/+3
| |/
* | Use `Module#prepend` instead of `alias_method_chain`Andre Guedes2016-09-302-25/+27
* | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqRémy Coutable2016-09-291-2/+13
|\ \
| * | Set a restrictive CORS policy on the API for credentialed requestsNick Thomas2016-09-261-0/+11
| * | Move Rack::Attack and Rack::Cors middlewares to be before Warden::ManagerNick Thomas2016-09-261-2/+2
| |/
* | Merge branch '22364-rails-cache-connection-pool-sidekiq-servers' into 'master' Rémy Coutable2016-09-291-0/+4
|\ \
| * | Use a ConnectionPool for Rails.cache on Sidekiq servers22364-rails-cache-connection-pool-sidekiq-serversPaco Guzman2016-09-281-0/+4
| |/
* | Update warn message for MySQL fixmrchrisw/mysql-connection-warnChris Wilson2016-09-281-1/+1
* | Add Pipelines for CommitKamil Trzcinski2016-09-271-0/+1
|/
* Revert "Merge branch '22364-rails-cache-redis-connection-pool' into 'master'"Rubén Dávila Santos2016-09-221-4/+0
* Merge branch 'and-you-get-awards' into 'master' Rémy Coutable2016-09-211-9/+9
|\
| * Remove duplicate routeand-you-get-awardsZeger-Jan van de Weg2016-09-201-1/+0
| * Use routing concerns to DRY the routesZ.J. van de Weg2016-09-191-9/+9
| * Snippets get award emoji! :thumbsup:Z.J. van de Weg2016-09-191-1/+2
* | Merge branch '21170-cycle-analytics' into 'master' Stan Hu2016-09-211-0/+2
|\ \
| * | Implement (some) comments from @DouweM's review.Timothy Andrew2016-09-201-1/+1
| * | Merge remote-tracking branch 'origin/master' into 21170-cycle-analyticsTimothy Andrew2016-09-205-7/+16
| |\ \ | | |/
| * | Merge remote-tracking branch 'origin/master' into 21170-cycle-analyticsTimothy Andrew2016-09-072-0/+9
| |\ \
| * | | Display numbers for the "Issue (Tracker)" cycle analytics metric.Timothy Andrew2016-08-261-0/+2
* | | | Use a ConnectionPool for Rails.cache on Sidekiq servers22364-rails-cache-redis-connection-poolPaco Guzman2016-09-201-0/+4
| |_|/ |/| |
* | | Gitlab::Checks is now instrumentedPaco Guzman2016-09-131-1/+2
* | | Merge branch 'rails-5-backports' into 'master' Robert Speicher2016-09-121-6/+2
|\ \ \
| * | | No need for this variable.Connor Shea2016-09-121-6/+1
| * | | Remove x-json mime_type, rename to json_mime_types.rails-5-backportsConnor Shea2016-09-111-3/+2
| * | | Fix two problematic bits of code that will be deprecated or broken in Rails 5.Connor Shea2016-09-051-6/+8
| | |/ | |/|
* | | Merge branch 'gitlab-workhorse-safeties' into 'master' Jacob Vosmaer (GitLab)2016-09-091-0/+8
|\ \ \
| * | | Verify JWT messages from gitlab-workhorseJacob Vosmaer2016-09-051-0/+8
| |/ /
* | | Make merge requests bulk update workingDmitriy Zaporozhets2016-09-081-0/+1
* | | Limited amount of pruned Event rows per runOlaf Tomalka2016-09-071-1/+1
* | | Added cron to prune events older than 12 months.Olaf Tomalka2016-09-071-0/+3
|/ /
* | Merge branch 'fix-sidekiq-sentry-context' into 'master' Robert Speicher2016-08-311-0/+1
|\ \
| * | Fix Sentry not reporting right program for Sidekiq workersfix-sidekiq-sentry-contextStan Hu2016-08-251-0/+1
| |/
View Lorry Controller Status