summaryrefslogtreecommitdiff
path: root/config
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'instrument-infra' into 'master'Grzegorz Bizon2017-06-071-4/+4
|\
| * Add prometheus text formatterPawel Chojnacki2017-06-021-1/+1
| * Use only ENV for metrics folder locationPawel Chojnacki2017-06-023-10/+4
| * Split metrics from health controller into metrics controllerPawel Chojnacki2017-06-022-0/+6
* | Merge branch '12910-snippets-description' into 'master'Phil Hughes2017-06-072-1/+9
|\ \
| * | Support uploads for newly created personal snippets12910-snippets-descriptionJarka Kadlecova2017-06-071-0/+5
| * | Support descriptions for snippetsJarka Kadlecova2017-05-312-1/+4
* | | Merge branch 'sidekiq-transaction' into 'master'Sean McGivern2017-06-051-0/+49
|\ \ \
| * | | Fix keys seedDouwe Maan2017-06-021-10/+14
| * | | Allow scheduling from after_commit hooksDouwe Maan2017-06-021-9/+27
| * | | Forbid Sidekiq scheduling in transactionsYorick Peterse2017-06-021-0/+27
| | |/ | |/|
* | | Merge branch '30469-convdev-index' into 'master'Sean McGivern2017-06-051-0/+2
|\ \ \
| * | | Add Conversational Development Index page to admin panelTaurie Davis, Simon Knox and Adam Niedzielski2017-06-011-0/+2
* | | | Merge branch '32992-consider-using-zopfli-over-standard-gzip-compression-for-...Tim Zallmann2017-06-041-3/+11
|\ \ \ \ | |_|/ / |/| | |
| * | | utilize zopfli compression algorithm for frontend assetsMike Greiling2017-05-301-0/+2
| * | | skip asset compression in CIMike Greiling2017-05-301-3/+9
* | | | Merge branch '32747-translation-of-dates-for-cycle-analytics-is-incomplete' i...James Lopez2017-06-022-0/+71
|\ \ \ \
| * | | | Add translations for elapsed time in words32747-translation-of-dates-for-cycle-analytics-is-incompleteRuben Davila2017-06-022-0/+71
* | | | | Merge branch '31511-jira-settings' into 'master'Sean McGivern2017-06-022-1/+2
|\ \ \ \ \
| * | | | | Add Integrations bundlekushalpandya2017-06-011-0/+1
| * | | | | simplify test&save actions when setting a service integrationJarka Kadlecova2017-06-011-1/+1
* | | | | | Merge branch 'winh-karma-sourcemaps' into 'master'Filipa Lacerda2017-06-022-2/+2
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Use inline source maps for karma (!11815)winh-karma-sourcemapswinh2017-05-312-2/+2
* | | | | | Merge branch 'dm-gravatar-username' into 'master'Sean McGivern2017-06-011-1/+1
|\ \ \ \ \ \
| * | | | | | Add username parameter to gravatar URLDouwe Maan2017-06-011-1/+1
* | | | | | | Merge branch '31644-make-cookie-sessions-unique' into 'master'Douwe Maan2017-06-011-1/+7
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Update session cookie key name to be unique to instance in development31644-make-cookie-sessions-uniqueEric Eastwood2017-06-011-1/+7
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'dm-discussions-n-plus-1' into 'master'Sean McGivern2017-06-012-0/+15
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Do not try to preload Commits when using Note.includes(:noteable)Douwe Maan2017-05-312-0/+15
* | | | | | Merge remote-tracking branch 'upstream/master' into rename-builds-controllerLin Jen-Shin2017-05-317-7/+144
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Merge branch 'gitaly-opt-out' into 'master'Rémy Coutable2017-05-302-2/+2
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | Enable Gitaly by default in GitLab 9.3Jacob Vosmaer2017-05-302-2/+2
| * | | | | Merge branch 'fix/gb/improve-active-record-test-extensions' into 'master'Rémy Coutable2017-05-301-1/+1
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Make `ActiveRecord::Migrator` idempotent again in test envfix/gb/improve-active-record-test-extensionsGrzegorz Bizon2017-05-291-1/+1
| | | |/ / | | |/| |
| * | | | Merge branch '31849-pipeline-show-view-realtime' into 'master'Phil Hughes2017-05-301-3/+3
| |\ \ \ \
| | * | | | Creates a mediator for pipeline details vue in order to mount several vue app...Filipa Lacerda2017-05-261-3/+3
| | | |_|/ | | |/| |
| * | | | Merge branch '31616-add-uptime-of-gitlab-instance-in-admin-area' into 'master'Rémy Coutable2017-05-301-0/+1
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | 31616-add-uptime-of-gitlab-instance-in-admin-areajboltz882017-05-291-0/+1
| * | | | Merge branch 'rework-authorizations-performance' into 'master'Douwe Maan2017-05-291-0/+132
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Use CTEs for nested groups and authorizationsYorick Peterse2017-05-171-0/+132
| * | | | Merge branch 'fix-counter-cache-for-acts-as-taggable' into 'master'Stan Hu2017-05-261-0/+4
| |\ \ \ \
| | * | | | Fix Counter Cache not being disabled for acts-on-taggablefix-counter-cache-for-acts-as-taggableKamil Trzcinski2017-05-261-0/+4
| * | | | | Merge branch 'locale-region-fix' into 'master'Douwe Maan2017-05-261-1/+1
| |\ \ \ \ \
| | * | | | | Fixed locale frontend not picking up regionslocale-region-fixPhil Hughes2017-05-251-1/+1
* | | | | | | Use another scope to add the - prefix, feedback:Lin Jen-Shin2017-05-311-25/+27
* | | | | | | Use - as the prefix so we don't conflict with namespacesLin Jen-Shin2017-05-261-1/+1
* | | | | | | Merge remote-tracking branch 'upstream/master' into rename-builds-controllerLin Jen-Shin2017-05-2615-58/+105
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge branch '32737-audit-long-term-cacheability-of-webpack-assets' into 'mas...Tim Zallmann2017-05-261-2/+16
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| | * | | | | name all webpack chunks to improve long term cacheabilityMike Greiling2017-05-251-1/+13
| | * | | | | add NameAllModulesPlugin to cover shortcomings of NamedModulesPluginMike Greiling2017-05-251-1/+3
| | |/ / / /
View Lorry Controller Status