summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'feature/ldap-sync-edgecases' into 'master' Douwe Maan2016-01-142-1/+5
|\
| * Code style fixes and some code simplifiedGabriel Mazetto2016-01-081-2/+2
| * Repair ldap_blocked state when no ldap identity exist anymoreGabriel Mazetto2016-01-081-0/+2
| * Prevent ldap_blocked users from being unblocked by the Admin UIGabriel Mazetto2016-01-081-1/+3
* | Merge branch 'fix/private-references' into 'master' Douwe Maan2016-01-141-1/+1
|\ \
| * \ Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into fix/pri...Rémy Coutable2016-01-132-4/+3
| |\ \
| * | | 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
* | | | 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
|\ \ \
| * | | 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
|/ /
* | Merge branch 'fix/ci-linter-sequence-validations' into 'master' Robert Speicher2016-01-111-2/+4
|\ \
| * | Allow subsequent validations in CI Linterfix/ci-linter-sequence-validationsGrzegorz Bizon2016-01-111-2/+4
* | | Merge branch 'group-issues-sorting' into 'master' Dmitriy Zaporozhets2016-01-111-1/+1
|\ \ \ | |/ / |/| |
| * | Sort by ID when sorting using "Recently created"Yorick Peterse2016-01-071-1/+1
* | | 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
| * | Filter commits by search parameterDmitriy Zaporozhets2016-01-071-2/+8
| |/
* | 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
| |\
| | * Remove InfluxDB username/passwordremove-influxdb-credentialsYorick Peterse2016-01-061-2/+0
| * | 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 target...Douwe Maan2016-01-051-1/+1
* | | 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
| |\ \ | | |/ | |/|
| | * 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
| * | | | Redirect back to user profile page after abuse reportRobert Speicher2016-01-041-2/+5
| * | | | Merge branch 'show-all-builds-by-default' into 'master' Robert Speicher2016-01-042-6/+6
| |\ \ \ \
| | * | | | 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
| * | | | 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
| |\ \ \ \
| | * | | | 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
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | 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
View Lorry Controller Status