summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into merge-when-build-succeeds-uncheckedmerge-when-build-succeeds-uncheckedDouwe Maan2016-01-061-0/+5
|\
| * 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
* | | | | Get "Merge when build succeeds" to work when commits were pushed to MR target...Douwe Maan2016-01-051-1/+1
|/ / / /
* | | | 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
* | | | | | 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
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | adds starring and unstarring text to star button, also adds partial new stylesJacob Schatz2015-12-231-1/+1
* | | | | Merge branch 'edit-on-fork' into 'master' Dmitriy Zaporozhets2015-12-246-149/+171
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Add tests for new functionalityDouwe Maan2015-12-211-1/+5
| * | | | Fix specs and behavior for LFS filesDouwe Maan2015-12-183-7/+15
| * | | | Automatically fork a project when not allowed to edit a file.Douwe Maan2015-12-186-148/+158
* | | | | Merge branch 'improve_emoji_picker' into 'master' Dmitriy Zaporozhets2015-12-231-1/+0
|\ \ \ \ \
| * | | | | base implementation of emoji picker [ci skip]Valery Sizov2015-12-221-1/+0
* | | | | | Make CI Lint form synchronousfix/ci-lintGrzegorz Bizon2015-12-221-1/+3
|/ / / / /
* | | | | Merge branch 'admin_add_identity' into 'master' Robert Speicher2015-12-211-1/+16
|\ \ \ \ \
| * | | | | Allow admin to create new user identitiesDrew Blessing2015-12-151-1/+16
* | | | | | Merge branch 'tduehr/gitlab-ce-cas-support'Douwe Maan2015-12-212-1/+30
|\ \ \ \ \ \
| * | | | | | add CAS authentication supporttduehr2015-12-142-1/+30
| |/ / / / /
* | | | | | Backport JIRA serviceDrew Blessing2015-12-181-2/+3
| |/ / / / |/| | | |
* | | | | Merge branch 'fix-merge-immediately' into 'master' Robert Speicher2015-12-161-1/+1
|\ \ \ \ \
| * | | | | Fix 'Merge Immediately' buttonfix-merge-immediatelyDouwe Maan2015-12-161-1/+1
* | | | | | Merge branch 'fix-endpoint-not-setting-var' into 'master' Douwe Maan2015-12-161-6/+3
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Fix endpoint not setting needed @ci_commitZeger-Jan van de Weg2015-12-161-6/+3
* | | | | | Merge remote-tracking branch 'origin/feature/update-rubocop'Dmitriy Zaporozhets2015-12-163-3/+4
|\ \ \ \ \ \
| * | | | | | Fixed Rubocop offensesGabriel Mazetto2015-12-153-3/+4
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'rs-issue-4032' into 'master' Douwe Maan2015-12-151-1/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Fix note pollingrs-issue-4032Robert Speicher2015-12-121-1/+2
| |/ / / /