summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add pagination headers to already paginated API resourcesadd-pagination-headers-to-apiRémy Coutable2016-01-146-21/+52
|
* Merge branch 'fix/private-references' into 'master' Douwe Maan2016-01-1415-17/+352
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show referenced MRs & Issues only when the current viewer can access them This addresses both issues identified in #6066. ## The private MR by user `remy2` with a note referencing to a public issue ![Screen_Shot_2016-01-12_at_16.45.02](/uploads/c245ec2c1fdea1f9ba05183c24e142d9/Screen_Shot_2016-01-12_at_16.45.02.png) --- ## The public issue viewed by user `remy` **who doesn't have access to `remy2/private-project`** before the fix ![Screen_Shot_2016-01-12_at_18.14.50](/uploads/8db5580e803f5bddd6cb935233c579a0/Screen_Shot_2016-01-12_at_18.14.50.png) --- ## The public issue viewed by user `remy` **who doesn't have access to `remy2/private-project`** with the fix ![Screen_Shot_2016-01-13_at_12.02.32](/uploads/cb199f7b78191fba486a11412412e307/Screen_Shot_2016-01-13_at_12.02.32.png) --- ## The public issue viewed by user `remy2` with the fix (no change) ![Screen_Shot_2016-01-13_at_11.54.06](/uploads/ddece590d69f597a95559beddcd36660/Screen_Shot_2016-01-13_at_11.54.06.png) See merge request !2405
| * Fix specs and rubocop warningsfix/private-referencesRémy Coutable2016-01-143-8/+9
| |
| * Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into ↵Rémy Coutable2016-01-1366-433/+942
| |\ | | | | | | | | | fix/private-references
| * | Ensure the API doesn't return notes that the current user shouldn't seeRémy Coutable2016-01-132-2/+70
| | |
| * | Add spec for Note#cross_reference_not_visible_for?Rémy Coutable2016-01-131-0/+24
| | |
| * | Improve & adds specs for Issue/MR referencesRémy Coutable2016-01-137-135/+218
| | | | | | | | | | | | | | | - Improve specs for private Issue/MR referenced in public Issue - Add specs for private Issue/MR referenced in public MR
| * | Move complex view condition to a model methodRémy Coutable2016-01-132-1/+8
| | | | | | | | | | | | | | | This is moved to a model method rather than an helper method because the API will need it too.
| * | Show referenced MRs & Issues only when the current viewer can access themRémy Coutable2016-01-138-3/+155
| | |
* | | Merge branch 'rs-broadcasts' into 'master' Douwe Maan2016-01-1419-126/+315
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Allow broadcast messages to be edited Closes #3046 See merge request !2268
| * | | Remove (invalid) timestamp formattingrs-broadcastsRobert Speicher2016-01-131-2/+2
| | | |
| * | | Move `BroadcastMessage#status` to a helper since it's presentationalRobert Speicher2016-01-135-31/+31
| | | |
| * | | Update CHANGELOGRobert Speicher2016-01-131-0/+1
| | | | | | | | | | | | | | | | [ci skip]
| * | | Broadcast Messages can now be editedRobert Speicher2016-01-135-28/+49
| | | | | | | | | | | | | | | | Closes #3046
| * | | Update Broadcast Message featuresRobert Speicher2016-01-132-14/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Removes redundant "Create a broadcast message" scenario that was entirely covered by the "Create a customized broadcast message" scenario. - Adds "Edit an existing broadcast message" scenario - Adds "Remove an existing broadcast message" scenario
| * | | Update BroadcastMessage modelRobert Speicher2016-01-133-6/+117
| | | | | | | | | | | | | | | | | | | | - Adds default values for `color` and `font` attributes - Adds `active?`, `started?`, `ended?`, and 'status' methods
| * | | Update broadcast_message helperRobert Speicher2016-01-134-26/+45
| | | | | | | | | | | | | | | | | | | | Now it returns the fully-formatted message so we can be consistent about how it's shown.
| * | | Simplify BroadcastMessage factoryRobert Speicher2016-01-133-11/+11
| | | | | | | | | | | | | | | | Also make the feature tests less brittle.
| * | | Simplify broadcast message JSRobert Speicher2016-01-131-3/+4
| | | | | | | | | | | | | | | | Also resets the default example message when the user input is blank.
| * | | Remove alert_type attribute from BroadcastMessageRobert Speicher2016-01-135-7/+12
| | | |
| * | | Move broadcast message form to a partialRobert Speicher2016-01-133-34/+39
| | | |
| * | | Style the broadcast message formRobert Speicher2016-01-133-6/+13
| | | |
| * | | Add js-requires-input to formRobert Speicher2016-01-131-3/+2
| | | |
* | | | Merge branch 'rs-milestone-buttons' into 'master' Dmitriy Zaporozhets2016-01-142-9/+10
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Update button style on milestone pages See merge request !2414
| * | | | Fix misaligned edit button in milestone collection partialrs-milestone-buttonsRobert Speicher2016-01-131-3/+4
| | | | |
| * | | | Update button styles for Milestones#showRobert Speicher2016-01-131-6/+6
| | | | |
* | | | | Merge branch 'update-go-1.5.3' into 'master' Achilleas Pipinellis2016-01-141-4/+4
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Update documentation to Go 1.5.3 Security fix: https://groups.google.com/forum/#!topic/golang-dev/MEATuOi_ei4 See merge request !2418
| * | | | Update to Go 1.5.3Stan Hu2016-01-131-4/+4
|/ / / /
* | | | 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
| | | | | |
View Lorry Controller Status