summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | Merge branch 'fix/private-references' into 'master' Douwe Maan2016-01-141-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * \ \ \ Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into ↵Rémy Coutable2016-01-132-4/+3
| |\ \ \ \ | | | |/ / | | |/| | | | | | | fix/private-references
| * | | | Show referenced MRs & Issues only when the current viewer can access themRémy Coutable2016-01-131-1/+1
| | | | |
* | | | | Broadcast Messages can now be editedRobert Speicher2016-01-131-5/+17
| | | | | | | | | | | | | | | | | | | | Closes #3046
* | | | | Remove alert_type attribute from BroadcastMessageRobert Speicher2016-01-131-4/+7
| |/ / / |/| | |
* | | | Merge branch 'configure-randomize-metrics-sample-interval' into 'master' Yorick Peterse2016-01-131-0/+1
|\ \ \ \ | | | | | | | | | | See merge request !2406
| * | | | Make the metrics sampler interval configurableYorick Peterse2016-01-131-0/+1
| |/ / /
* | | | Block the reported user before destroying the recordrs-block-user-before-removalRobert Speicher2016-01-121-4/+2
|/ / / | | | | | | | | | | | | | | | | | | | | | 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 'fix/ci-linter-sequence-validations' into 'master' Robert Speicher2016-01-111-2/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Allow subsequent validations in CI Linter Closes #5851 See merge request !2368
| * | | Allow subsequent validations in CI Linterfix/ci-linter-sequence-validationsGrzegorz Bizon2016-01-111-2/+4
| | | | | | | | | | | | | | | | Closes #5851
* | | | Merge branch 'group-issues-sorting' into 'master' Dmitriy Zaporozhets2016-01-111-1/+1
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve performance of getting issues on group level For testing I used the URL http://localhost:3000/groups/gitlab-org/issues?milestone_title=8.1. Prior to these changes said URL would take about 10-12 seconds to load. By applying these changes the loading time has been reduced to roughly 2-3 seconds. There's still some stuff going on in some views that I have to look at, resolving those changes might reduce the loading time a bit more. I also still have to check if I didn't break too many tests. Fixes: gitlab-org/gitlab-ce#3707 gitlab-org/gitlab-ce#4071 See merge request !2318
| * | | Sort by ID when sorting using "Recently created"Yorick Peterse2016-01-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sorting by "id" has the same effect as sorting by created_at while performing far better and without the need of an extra index (in case one wanted to speed up sorting by "created_at"). Sorting by "Recently updated" still uses the physical "updated_at" column as there's no way to use the "id" column for this instead.
* | | | Merge gitlab.com:gitlab-org/gitlab-ceJeroen Nijhof2016-01-081-2/+8
|\ \ \ \ | | |/ / | |/| |
| * | | Add support for ref and path to commits filteringDmitriy Zaporozhets2016-01-071-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Filter commits by search parameterDmitriy Zaporozhets2016-01-071-2/+8
| |/ / | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge gitlab.com:gitlab-org/gitlab-ceJeroen Nijhof2016-01-074-3/+29
|\ \ \ | |/ /
| * | Merge branch 'master' of github.com:gitlabhq/gitlabhqJacob Vosmaer2016-01-072-0/+28
| | |
| * | Merge branch 'remove-influxdb-credentials' into 'master' Yorick Peterse2016-01-071-2/+0
| |\ \ | | | | | | | | See merge request !2319
| | * | Remove InfluxDB username/passwordremove-influxdb-credentialsYorick Peterse2016-01-061-2/+0
| | | | | | | | | | | | | | | | | | | | InfluxDB over UDP doesn't use authentication, thus there's no need for these settings.
| * | | Merge branch 'master' into merge-when-build-succeeds-uncheckedmerge-when-build-succeeds-uncheckedDouwe Maan2016-01-061-0/+5
| |\ \ \ | | |/ /
| * | | Get "Merge when build succeeds" to work when commits were pushed to MR ↵Douwe Maan2016-01-051-1/+1
| | | | | | | | | | | | | | | | target branch while builds were running
* | | | Merge gitlab.com:gitlab-org/gitlab-ceJeroen Nijhof2016-01-0679-870/+1139
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'brunsa2/gitlab-ce-diverging-branch-graphs' into 'master' Douwe Maan2016-01-051-0/+5
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | Add graphs of commits ahead/behind default branch (by @brunsa2) Replaces https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/1716 See merge request !2301
| | * | Merge branch 'master' into diverging-branch-graphsJeff Stubler2015-12-0333-241/+366
| | |\ \
| | * \ \ Merge branch 'master' into diverging-branch-graphsJeff Stubler2015-11-1214-40/+166
| | |\ \ \
| | * | | | Refactor for style issuesJeff Stubler2015-11-111-2/+1
| | | | | |
| | * | | | Add graphs showing commits ahead and behind default to branches pageJeff Stubler2015-11-011-0/+6
| | | | | |
| * | | | | Add `AbuseReport#notify`rs-abuse-reports-refactorRobert Speicher2016-01-041-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | Tell, Don't Ask.
| * | | | | Redirect back to user profile page after abuse reportRobert Speicher2016-01-041-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now the reporter will see the fruits of their labor, namely, the red icon!
| * | | | | Merge branch 'show-all-builds-by-default' into 'master' Robert Speicher2016-01-042-6/+6
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show all builds by default in the builds page Fixes #4240 See merge request !2243
| | * | | | | Show 'All' tab by default in the builds pageshow-all-builds-by-defaultDouglas Barbosa Alexandre2016-01-042-6/+6
| | | | | | |
| * | | | | | remove public field from namespace and refactoringnamespace-clean_upValery Sizov2016-01-042-2/+2
| |/ / / / /
| * | | | | Write to InfluxDB directly via UDPYorick Peterse2015-12-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This removes the need for Sidekiq and any overhead/problems introduced by TCP. There are a few things to take into account: 1. When writing data to InfluxDB you may still get an error if the server becomes unavailable during the write. Because of this we're catching all exceptions and just ignore them (for now). 2. Writing via UDP apparently requires the timestamp to be in nanoseconds. Without this data either isn't written properly. 3. Due to the restrictions on UDP buffer sizes we're writing metrics one by one, instead of writing all of them at once.
| * | | | | When reCAPTCHA is disabled, allow registrations to go through without a codefeature/recaptcha_settingsStan Hu2015-12-281-1/+1
| | | | | |
| * | | | | reCAPTCHA is configurable through Admin Settings, no reload needed.Gabriel Mazetto2015-12-283-1/+9
| | |_|_|/ | |/| | |
| * | | | Move InfluxDB settings to ApplicationSettingrelocate-influxdb-settingsYorick Peterse2015-12-281-0/+8
| | | | |
| * | | | Merge branch 'add-recaptcha-support' into 'master' Dmitriy Zaporozhets2015-12-282-6/+30
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for Google reCAPTCHA in user registration to prevent spammers To do: - [x] Failing reCAPTCHA test causes all the fields to be lost - ~~[ ] Improve styling of reCAPTCHA box~~ (not possible) - ~~[ ] Put settings in `application_settings` (?)~~ ![image](/uploads/d38ca89820d3c0066fb8aeb645fd77f0/image.png) ![image](/uploads/6b050749963691b023d076682abcf736/image.png) Page when you fail CAPTCHA: ![image](/uploads/bc4846f0a5144985bc41dfa75eeab4c1/image.png) See merge request !2216
| | * | | | Fix failed specStan Hu2015-12-271-1/+1
| | | | | |
| | * | | | Add support for Google reCAPTCHA in user registration to prevent spammersStan Hu2015-12-272-6/+30
| | | | | |
| * | | | | Prevent an XSS warning from the updated Brakemanrs-bump-brakemanRobert Speicher2015-12-271-1/+1
| | | | | |
| * | | | | Merge branch 'mention-all' into 'master' Robert Speicher2015-12-271-1/+1
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Only allow group/project members to mention `@all` Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/3473 See merge request !2205
| | * | | | Merge branch 'master' into mention-allDouwe Maan2015-12-241-1/+1
| | |\ \ \ \
| | * | | | | Only allow group/project members to mention `@all`Douwe Maan2015-12-241-1/+1
| | | | | | |
| * | | | | | Fixed codestyle and added 2FA documentationfeature/force-tfaGabriel Mazetto2015-12-242-3/+5
| | | | | | |
| * | | | | | Add to application_settings forced TFA optionsGabriel Mazetto2015-12-241-0/+2
| | | | | | |
| * | | | | | specs for forced two-factor authentication and grace periodGabriel Mazetto2015-12-242-8/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | simplified code and fixed stuffs
| * | | | | | Grace period support for TFAGabriel Mazetto2015-12-242-3/+31
| | | | | | |
| * | | | | | WIP require two factor authenticationGabriel Mazetto2015-12-242-0/+14
| | |/ / / / | |/| | | |
| * | | | | Merge branch 'new-project-header-redesign' into 'master' Dmitriy Zaporozhets2015-12-241-1/+1
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Dropdowns for clone. Star and Fork with new count areas. Star and Unstarred Works now Fixes #2876 and #3482 Used existing styles. <br/> Did not attempt to make pixel perfect as styles already exist. <br/> ![Screen_Shot_2015-12-18_at_5.24.56_PM](/uploads/a79ba1e0be0232f2aeef8a43f3253479/Screen_Shot_2015-12-18_at_5.24.56_PM.png) See merge request !2156
| | * | | | adds starring and unstarring text to star button, also adds partial new stylesJacob Schatz2015-12-231-1/+1
| | | | | |