summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Track call counts in Gitlab::Metrics.measure_blockmetrics-measure-block-transactionYorick Peterse2016-04-113-3/+8
|
* Added specs for Gitlab::Metrics::System.cpu_timeYorick Peterse2016-04-111-0/+6
|
* Store block timings as transaction valuesYorick Peterse2016-04-114-39/+47
| | | | | | | | | | This makes it easier to query, simplifies the code, and makes it possible to figure out what transaction the data belongs to (simply because it's now stored _in_ the transaction). This new setup keeps track of both the real/wall time _and_ CPU time spent in a block, both measured using milliseconds (to keep all units the same).
* Merge branch 'patch-1' into 'master' Achilleas Pipinellis2016-04-111-7/+6
|\ | | | | | | | | | | | | Correct documentation on enabling artifacts. The docs say to enable artifacts that settings should be set to "false". This updates the documents to change the setting to "true". See merge request !3630
| * fix typoBenjamin Montgomery2016-04-101-1/+3
| |
| * Make the purpose of artifact config options clearerBenjamin Montgomery2016-04-101-9/+6
| |
| * actually enable artifactsBenjamin Montgomery2016-04-091-2/+2
| |
* | Merge branch 'add-missing-mixin' into 'master' Stan Hu2016-04-111-4/+6
|\ \ | | | | | | | | | | | | | | | | | | Use false/true mixin in migration from !3640 See merge request !3646
| * | Use false/true mixin in migration from !3640Stan Hu2016-04-101-4/+6
|/ /
* | Merge branch 'fix-raw-sql-migrations' into 'master' Stan Hu2016-04-114-12/+18
|\ \ | | | | | | | | | | | | | | | | | | Fix more SQL migrations to use raw commands gitlab-org/gitlab-development-kit#109 See merge request !3640
| * | Fix more SQL migrations to use raw commandsStan Hu2016-04-104-12/+18
| | | | | | | | | | | | gitlab-org/gitlab-development-kit#109
* | | Merge branch 'upgrade-annotate' into 'master' Robert Speicher2016-04-112-4/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade annotate from 2.6.10 to 2.7.0 We don’t have any tests for this, so no need to run them. [ci skip] Includes compatibility with Rails 5. Changelog: https://github.com/ctran/annotate_models/releases/tag/v2.7.0 Working towards #14286. See merge request !3645
| * | | Upgrade annotate from 2.6.10 to 2.7.0connorshea2016-04-102-4/+4
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | Includes compatibility with Rails 5. We don’t have any tests for this, so no need to run them. [ci skip] Changelog: https://github.com/ctran/annotate_models/releases/tag/v2.7.0 Working towards #14286.
* | | Merge branch 'upgrade-premailer-rails' into 'master' Robert Speicher2016-04-111-3/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade premailer-rails from 1.9.0 to 1.9.2 Includes compatibility with Rails 5. Changelog: https://github.com/fphilipe/premailer-rails/blob/master/CHANGELOG.md#v192 Working towards #14286. See merge request !3643
| * | | Upgrade premailer-rails from 1.9.0 to 1.9.2connorshea2016-04-101-3/+3
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | Includes compatibility with Rails 5. Changelog: https://github.com/fphilipe/premailer-rails/blob/master/CHANGELOG.md#v19 2 Working towards #14286.
* | | Merge branch 'fix-milestone-seedfu' into 'master' Robert Speicher2016-04-111-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix seed_fu failure with inserting milestones into test DB Milestones were not being saved due to "invalid state" validation errors See merge request !3641
| * | | Fix seed_fu failure with inserting milestones into test DBStan Hu2016-04-101-1/+1
| | | | | | | | | | | | | | | | Milestones were not being saved due to "invalid state" validation errors
* | | | Merge branch 'issue_14353' into 'master' Jacob Schatz2016-04-111-1/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ignore toggling the sidebar for resolutions over 1200px width Closes #14353 ![sidebar1](/uploads/4b8d0eaa1b320c319239cb572932f740/sidebar1.gif) See merge request !3547
| * | | | Use existence operator insteadissue_14353Alfredo Sumaran2016-04-101-1/+1
| | | | |
| * | | | Check existence of variable methodAlfredo Sumaran2016-04-101-1/+1
| | | | | | | | | | | | | | | | | | | | This happens because tab's `shown` event is triggered first if we enter directly to the diff page therefore Breakpoints class is not initialized yet.
| * | | | Ignore toggling sidebar for above 1200px resolutionAlfredo Sumaran2016-04-101-1/+2
| | |/ / | |/| |
* | | | Merge branch 'prevent_users_from_upvoting_downvoting_emoji' into 'master' Jacob Schatz2016-04-113-3/+78
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | prevent users from being able to both upvote and downvote See merge request !3495
| * | | write test to prevent reoccurence of issueprevent_users_from_upvoting_downvoting_emojiArinde Eniola2016-04-091-0/+64
| | | |
| * | | prevent users from being able to both upvote and downvoteArinde Eniola2016-04-092-3/+14
| | | |
* | | | Merge branch 'rs-markdown-preview-tabindex' into 'master' Jacob Schatz2016-04-101-3/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove tab stop from "Write", "Preview", "Go full screen" links Closes #15089 See merge request !3635
| * | | | Remove tab stop from "Write", "Preview", "Go full screen" linksrs-markdown-preview-tabindexRobert Speicher2016-04-091-3/+3
| |/ / / | | | | | | | | | | | | Closes #15089
* | | | Merge branch 'redesign_labels_page' into 'master' Jacob Schatz2016-04-106-11/+74
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Redesign labels page closes #14227 ## Desktop ![Screen_Shot_2016-04-05_at_7.19.37_PM](/uploads/a52b764565b6e2739fb6932178f8bde5/Screen_Shot_2016-04-05_at_7.19.37_PM.png) ## Mobile ![Screen_Shot_2016-04-04_at_6.40.57_PM](/uploads/9804b074126fcdb6755918e9f4c472a7/Screen_Shot_2016-04-04_at_6.40.57_PM.png) See merge request !3507
| * | | apply some css changesredesign_labels_pageArinde Eniola2016-04-061-4/+1
| | | |
| * | | fix the failing tests and some changesArinde Eniola2016-04-064-14/+18
| | | |
| * | | finish up the design and add info to the changelogArinde Eniola2016-04-064-8/+15
| | | |
| * | | make the view responsive for extra small deviceArinde Eniola2016-04-061-0/+20
| | | |
| * | | set the width to the elementsArinde Eniola2016-04-061-2/+3
| | | |
| * | | change the subscribe, delete and edit buttons to iconsArinde Eniola2016-04-063-8/+42
| | | |
* | | | Merge branch 'project-services-page-should-contain-full-info' into 'master' Achilleas Pipinellis2016-04-102-15/+21
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Everything on one page. See merge request !3636
| * | | | Everything on one page.project-services-page-should-contain-full-infoSytse Sijbrandij2016-04-092-15/+21
| | | | |
* | | | | Merge branch 'fix-project-last-activity-at-migration' into 'master' Robert Speicher2016-04-101-7/+9
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use raw SQL instead of Rails models in 20130403003950 migration Closes gitlab-org/gitlab-development-kit#109 Closes https://github.com/gitlabhq/gitlabhq/issues/10123 See merge request !3638
| * | | | | Use raw SQL instead of Rails models in 20130403003950 migrationStan Hu2016-04-091-7/+9
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | Closes gitlab-org/gitlab-development-kit#109 Closes https://github.com/gitlabhq/gitlabhq/issues/10123
* | | | | Merge branch 'rs-sidekiq-sentry-context' into 'master' Stan Hu2016-04-101-0/+10
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a `sidekiq` tag to Sentry Raven context This will let us filter errors that were/were not in the Sidekiq environment. Source: http://stackoverflow.com/a/28370539/223897 Closes #15092 See merge request !3634
| * | | | Add a `program` tag to Sentry Raven contextrs-sidekiq-sentry-contextRobert Speicher2016-04-091-0/+10
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will let us filter errors by the program environment in which they were encountered. Source: http://stackoverflow.com/a/28370539/223897 Closes #15092
* | | | Merge branch 'enable-compress-in-production' into 'master' Robert Speicher2016-04-092-0/+4
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Enable asset compression in production. `config.assets.compress` needed to be explicitly enabled. Follow-up to !3544. Resolves #14344. See merge request !3632
| * | | Enable asset compression in production.connorshea2016-04-092-0/+4
| | |/ | |/| | | | | | | | | | | | | `config.assets.compress` needed to be explicitly enabled. Follow-up to !3544. Resolves #14344.
* | | Merge branch '14400-diff-redesign' into 'master' Jacob Schatz2016-04-0919-74/+119
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | Diff redesign Fixes #14400 Fixes #13500 ![diffs_redesign](/uploads/16da9557e497114d886ef5ece2f306b3/diffs_redesign.gif) See merge request !3476
| * | Remove comment count & icon from side by side view14400-diff-redesignAnnabel Dunstone2016-04-071-6/+0
| | |
| * | Diff touch upsAnnabel Dunstone2016-04-075-11/+8
| | |
| * | Fix lint errorsAnnabel Dunstone2016-04-073-8/+6
| | |
| * | Remove comment count & iconAnnabel Dunstone2016-04-071-3/+0
| | |
| * | Diff design updatesAnnabel Dunstone2016-04-0715-67/+90
| | |
| * | Merge conflict fixesAnnabel Dunstone2016-04-071-15/+15
| | |
| * | Update diff_comments testsAnnabel Dunstone2016-04-072-5/+5
| | |
| * | Update diff colors and iconsAnnabel Dunstone2016-04-077-15/+29
| | |
View Lorry Controller Status