summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update CHANGELOG [ci skip]ci/api-variablesTomasz Maczukin2016-01-131-0/+1
|
* Merge branch '8-4-stable' into ci/api-variablesTomasz Maczukin2016-01-13431-2651/+4847
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 8-4-stable: (285 commits) Add Changelog entry for build traces data integrity fix Update doc_styleguide.md [ci skip] Added hint that you can search users by name, username, or email. Add changelog Version 8.4.0.rc1 Randomize metrics sample intervals Make the metrics sampler interval configurable Don't automatically require awesome_print Disable colorization if STDOUT is not a tty Block the reported user before destroying the record changes `$quote-gray` to `$secondary-text` makes message plural for multiple MRs and removes from loop. Duh. Prepare Installation and Update docs for 8.4 RC1 Mention channel/key bug in irkerd docs Revert "Remove the `:coffee` and `:coffeescript` Haml filters" gets merge request discussion working again adds back in discussion.haml.html for issues commenting and closing/reopening properly. removing last chunk of MR ajax changes, rest will be in another MR reverting more MR ajax files, will appear in different commit reverting MR ajax changes, which will be in a different MR ...
| * Merge branch 'master' into 8-4-stableRobert Speicher2016-01-1323-307/+596
| |\
| | * Add Changelog entry for build traces data integrity fixGrzegorz Bizon2016-01-131-0/+1
| | | | | | | | | | | | Fix has been introduced in !2224.
| | * Merge branch 'doc_styleguide' into 'master' Achilleas Pipinellis2016-01-134-26/+236
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move doc_styleguide in the development directory Reference #3841 And also add many new styleguides: - Naming - Images - Links - Headings - Formatting - Notes - API See merge request !2386
| | | * Update doc_styleguide.md [ci skip]Achilleas Pipinellis2016-01-131-24/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fix some syntax/grammar typos - Link to GFM documentation on newlines - Be less strict on the alphabetical order styleguide - You can override the "numbers in headings" rule if you discuss it first - Do not mention CE in notes if the feature is in both CE and EE
| | | * Clarify the naming guidelinedoc_styleguideAchilleas Pipinellis2016-01-121-1/+4
| | | | | | | | | | | | | | | | [ci skip]
| | | * Add new location of doc_styleguide in CONTRIBUTING.mdAchilleas Pipinellis2016-01-121-2/+2
| | | | | | | | | | | | | | | | [ci skip]
| | | * Move doc_styleguide in the development directoryAchilleas Pipinellis2016-01-123-24/+227
| | | | | | | | | | | | | | | | [ci skip]
| | * | Merge branch 'user-search-hint' into 'master' Drew Blessing2016-01-132-2/+2
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added hint that you can search users by name, username, or email. Fixes gitlab-org/gitlab-ee#19 /cc @JobV See merge request !2411
| | | * | Added hint that you can search users by name, username, or email.Patricio Cano2016-01-132-2/+2
| | |/ /
| | * | Merge branch 'configure-randomize-metrics-sample-interval' into 'master' Yorick Peterse2016-01-137-259/+318
| | |\ \ | | | | | | | | | | See merge request !2406
| | | * | Randomize metrics sample intervalsconfigure-randomize-metrics-sample-intervalYorick Peterse2016-01-132-4/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sampling data at a fixed interval means we can potentially miss data from events occurring between sampling intervals. For example, say we sample data every 15 seconds but Unicorn workers get killed after 10 seconds. In this particular case it's possible to miss interesting data as the sampler will never get to actually submitting data. To work around this (at least for the most part) the sampling interval is randomized as following: 1. Take the user specified sampling interval (15 seconds by default) 2. Divide it by 2 (referred to as "half" below) 3. Generate a range (using a step of 0.1) from -"half" to "half" 4. Every time the sampler goes to sleep we'll grab the user provided interval and add a randomly chosen "adjustment" to it while making sure we don't pick the same value twice in a row. For a specified timeout of 15 this means the actual intervals can be anywhere between 7.5 and 22.5, but never can the same interval be used twice in a row. The rationale behind this change is that on dev.gitlab.org I'm sometimes seeing certain Gitlab::Git/Rugged objects being retained, but only for a few minutes every 24 hours. Knowing the code of Gitlab and how much memory it uses/leaks I suspect we're missing data due to workers getting terminated before the sampler can write its data to InfluxDB.
| | | * | Make the metrics sampler interval configurableYorick Peterse2016-01-136-255/+272
| | | | |
| | * | | Merge branch 'fix/reference_filter_uri_decode_error_for_master' into 'master' Douwe Maan2016-01-136-10/+11
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix #9963 reference_filter "Encoding::CompatibilityError" bug with some complex URL; https://github.com/gitlabhq/gitlabhq/pull/9964 @DouweM See merge request !2383
| | | * | | Add changelogJason Lee2016-01-131-0/+1
| | | | | |
| | | * | | Use CGI.escape instead of URI.escape, because URI is obsoleted.Jason Lee2016-01-124-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | ref: https://github.com/ruby/ruby/commit/238b979f1789f95262a267d8df6239806f2859cc
| | | * | | Fix #9963 reference_filter "Encoding::CompatibilityError" bug with some ↵Jason Lee2016-01-121-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | complex URL;
| | * | | | Merge branch 'ci/api-projects' into 'master' Douwe Maan2016-01-133-9/+26
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extend projects API with CI data Reference #4264 See merge request !2303
| | | * | | | Modify CI features in projects APIci/api-projectsTomasz Maczukin2016-01-114-51/+17
| | | | | | |
| | | * | | | Update ./doc/apiTomasz Maczukin2016-01-072-3/+42
| | | | | | |
| | | * | | | Add ci fields in project create/update feature APITomasz Maczukin2016-01-052-4/+13
| | | | | | |
| | | * | | | Add CI data to projcet entityTomasz Maczukin2016-01-051-0/+3
| | | | | | |
| | * | | | | Merge branch 'maintain-milestone-filter' into 'master' Douwe Maan2016-01-132-1/+2
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | enable milestone filter to stick See merge request !2241
| | | * | | | | enable milestone filter to stickGreg Smethells2016-01-122-1/+2
| | | | | | | |
| * | | | | | | Version 8.4.0.rc1v8.4.0.rc1Marin Jankovski2016-01-131-1/+1
| |/ / / / / /
| * | | | | | Merge branch 'referenced-merge-requests' into 'master' Dmitriy Zaporozhets2016-01-136-8/+19
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | merge request close message moved and merge request now refered by `!`. Fixes #4161 ![Screen_Shot_2016-01-12_at_8.38.57_AM](/uploads/9390ce0ebd1d14bfc83130ff4913a823/Screen_Shot_2016-01-12_at_8.38.57_AM.png) See merge request !2387
| | * | | | | | changes `$quote-gray` to `$secondary-text`referenced-merge-requestsJacob Schatz2016-01-122-2/+2
| | | | | | | |
| | * | | | | | makes message plural for multiple MRs and removes from loop. Duh.Jacob Schatz2016-01-123-5/+11
| | | | | | | |
| | * | | | | | merge request close message moved and merge request now refered by `!`.Jacob Schatz2016-01-125-6/+11
| | | | | | | |
| * | | | | | | Merge branch 'rs-disable-colorization' into 'master' Dmitriy Zaporozhets2016-01-132-1/+3
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disable colorization if STDOUT is not a tty Closes #6118 See merge request !2403
| | * | | | | | | Don't automatically require awesome_printrs-disable-colorizationRobert Speicher2016-01-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It patches core classes (such as String) to add colorization methods like `red` which we can't disable the same way we can with the Colorization gem.
| | * | | | | | | Disable colorization if STDOUT is not a ttyRobert Speicher2016-01-121-0/+2
| | | | | | | | |
| * | | | | | | | Merge branch 'rs-block-user-before-removal' into 'master' Dmitriy Zaporozhets2016-01-133-4/+23
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Block the reported user before destroying the record This is intended to prevent the user from creating new objects while the transaction that removes them is being run, resulting in objects with nil authors which can then not be edited. See https://gitlab.com/gitlab-org/gitlab-ce/issues/7117 See merge request !2402
| | * | | | | | | | Block the reported user before destroying the recordrs-block-user-before-removalRobert Speicher2016-01-123-4/+23
| | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is intended to prevent the user from creating new objects while the transaction that removes them is being run, resulting in objects with nil authors which can then not be edited. See https://gitlab.com/gitlab-org/gitlab-ce/issues/7117
| * | | | | | | | Merge branch 'rs-time_ago_with_tooltip-conversion' into 'master' Dmitriy Zaporozhets2016-01-132-1/+5
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure time_ago_with_tooltip is using a Time object Somehow this test existed on EE but not in CE, so it started failing after a bad CE-to-EE merge. See merge request !2398
| | * | | | | | | | Make sure time_ago_with_tooltip is using a Time objectrs-time_ago_with_tooltip-conversionRobert Speicher2016-01-122-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Somehow this test existed on EE but not in CE, so it started failing after a bad CE-to-EE merge.
| * | | | | | | | | Merge branch 'comment-and-close-button-does-not-submit-comment' into 'master' Dmitriy Zaporozhets2016-01-136-22/+38
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Comment and close button does not submit comment See merge request !2399
| | * | | | | | | | | gets merge request discussion working againcomment-and-close-button-does-not-submit-commentJacob Schatz2016-01-123-4/+24
| | | | | | | | | | |
| | * | | | | | | | | adds back in discussion.haml.html for issues commenting and ↵Jacob Schatz2016-01-122-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | closing/reopening properly.
| | * | | | | | | | | removing last chunk of MR ajax changes, rest will be in another MRJacob Schatz2016-01-125-5/+17
| | | | | | | | | | |
| | * | | | | | | | | reverting more MR ajax files, will appear in different commitJacob Schatz2016-01-125-124/+31
| | | | | | | | | | |
| | * | | | | | | | | reverting MR ajax changes, which will be in a different MRJacob Schatz2016-01-122-16/+2
| | | | | | | | | | |
| | * | | | | | | | | reverting _mr_title.html.hamlJacob Schatz2016-01-121-16/+10
| | | | | | | | | | |
| | * | | | | | | | | reverting merge_request_controllerJacob Schatz2016-01-121-9/+2
| | | | | | | | | | |
| | * | | | | | | | | restores merge request coffee fileJacob Schatz2016-01-121-49/+0
| | | | | | | | | | |
| | * | | | | | | | | reverting _disscusionJacob Schatz2016-01-121-4/+5
| | | | | | | | | | |
| | * | | | | | | | | fixes conflictsJacob Schatz2016-01-11422-2997/+4659
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | initial json requests instead of HTMLJacob Schatz2016-01-0710-39/+66
| | | | | | | | | | | |
| | * | | | | | | | | | adds tests (and passes them) for ajax open and close merge requests.Jacob Schatz2016-01-063-2/+100
| | | | | | | | | | | |
View Lorry Controller Status