summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Refactor settings API documentation [ci skip]doc_refactor_settings_apiAchilleas Pipinellis2016-01-181-44/+54
* Merge branch 'margin-update' into 'master' Jacob Schatz2016-01-181-3/+3
|\
| * updatemargin-updateAndriy Dyadyura2016-01-141-1/+1
| * updateAndriy Dyadyura2016-01-141-2/+2
* | Merge branch 'hook_url_limit' into 'master' Dmitriy Zaporozhets2016-01-186-17/+22
|\ \
| * | Raise hook url limitKirilll Zaycev2016-01-156-17/+22
| |/
* | Merge branch 'diff-white-line-fix' into 'master' Jacob Schatz2016-01-181-0/+1
|\ \
| * | Removes white line when hiding diff comments in MRPhil Hughes2016-01-131-0/+1
* | | Merge branch 'comment-text-remains-in-text-box-after-submitting-it' into 'mas...Dmitriy Zaporozhets2016-01-181-1/+1
|\ \ \
| * | | Fixes issue where firefox does not delete message after comment submitcomment-text-remains-in-text-box-after-submitting-itJacob Schatz2016-01-151-1/+1
* | | | Merge branch 'rs-abuse-report-validation' into 'master' Dmitriy Zaporozhets2016-01-182-2/+2
|\ \ \ \
| * | | | Use a more sensible message for the AbuseReport uniqueness validationrs-abuse-report-validationRobert Speicher2016-01-162-2/+2
* | | | | Merge branch 'issue-page-keeps-jumping-up' into 'master' Dmitriy Zaporozhets2016-01-173-1/+36
|\ \ \ \ \
| * | | | | fixes scrollbar jump by making discussion the same size as the sidebar when s...issue-page-keeps-jumping-upJacob Schatz2016-01-134-12/+40
| * | | | | initial fixJacob Schatz2016-01-133-5/+12
* | | | | | Autosize the textarea in showEditFormRobert Speicher2016-01-161-0/+1
| |/ / / / |/| | | |
* | | | | Merge branch 'abuse-autofill-message' into 'master' Robert Speicher2016-01-164-2/+4
|\ \ \ \ \
| * | | | | sanitize user supplied input.Josh Frye2016-01-162-25/+2
| * | | | | Autofill abuse message text with user url. Closes #2838Josh Frye2016-01-164-1/+26
|/ / / / /
* | | | | Merge branch 'github_importer' into 'master' Achilleas Pipinellis2016-01-161-11/+9
|\ \ \ \ \
| * | | | | Importing GitHub cross-repository PRs is not supported atmAchilleas Pipinellis2016-01-161-2/+3
| * | | | | Add the version each feature was introduced and remove notegithub_importerAchilleas Pipinellis2016-01-151-11/+8
* | | | | | Merge branch 'saml-ts' into 'master' Achilleas Pipinellis2016-01-151-2/+14
|\ \ \ \ \ \
| * | | | | | Added advanced SAML troubleshootingsaml-tsPatricio Cano2016-01-151-2/+14
| |/ / / / /
* | | | | | Merge branch 'rs-silence-statemachine-in-cron' into 'master' Robert Speicher2016-01-151-0/+3
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Prevent StateMachine warnings from outputting during a cron taskRobert Speicher2016-01-151-0/+3
|/ / / / /
* | | | | Merge branch 'fix-autocomplete-new-issues' into 'master' Robert Speicher2016-01-153-2/+3
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Fix autocomplete for new issues/MRs/snippetsfix-autocomplete-new-issuesYorick Peterse2016-01-153-2/+3
* | | | | Merge branch 'fix-alignment-issue' into 'master' Jacob Schatz2016-01-1510-23/+10
|\ \ \ \ \
| * | | | | Replace strong by span for .item-title elementsfix-alignment-issueRémy Coutable2016-01-155-6/+6
| * | | | | Remove unnecessary classRémy Coutable2016-01-151-4/+0
| * | | | | Streamline item titles to use a single class, and add back strong tagsRémy Coutable2016-01-159-20/+12
| * | | | | Fix alignment issues after a fix on titles weightRémy Coutable2016-01-144-7/+6
* | | | | | Merge branch 'ci/build_dependencies' into 'master' Douwe Maan2016-01-159-19/+121
|\ \ \ \ \ \
| * | | | | | Change dependencies.builds to depends_on_buildsKamil Trzcinski2016-01-153-25/+21
| * | | | | | Let the CI runner know about builds that this build depends onci/build_dependenciesKamil Trzcinski2016-01-149-19/+125
* | | | | | | Merge branch 'feature/allow-artifacts-for-reporters' into 'master' Douwe Maan2016-01-1513-30/+88
|\ \ \ \ \ \ \
| * | | | | | | Add Changelog entry for new permissions for build artifactsGrzegorz Bizon2016-01-151-0/+1
| * | | | | | | Add feature tests for permissions for build artifacts read abilityfeature/allow-artifacts-for-reportersGrzegorz Bizon2016-01-157-12/+57
| * | | | | | | Fix nonexistent method in artifacts controllerGrzegorz Bizon2016-01-151-1/+1
| * | | | | | | Expand builds namespace for feature tests in spinachGrzegorz Bizon2016-01-154-15/+27
| * | | | | | | Give reporters the ability to download artifacts.Andrew Johnson2016-01-153-4/+4
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'no-mail-during-dev-bootstrap' into 'master' Jacob Vosmaer2016-01-151-0/+2
|\ \ \ \ \ \ \
| * | | | | | | Don't send (fake) email during dev bootstrapno-mail-during-dev-bootstrapJacob Vosmaer2016-01-151-0/+2
* | | | | | | | Merge branch 'simplify-procfile' into 'master' Jacob Vosmaer2016-01-153-6/+18
|\ \ \ \ \ \ \ \
| * | | | | | | | Direct sidekiq boot output to log filesimplify-procfileJacob Vosmaer2016-01-151-1/+1
| * | | | | | | | Remove duplication in ProcfileJacob Vosmaer2016-01-141-2/+2
| * | | | | | | | Improve bin/ launchersJacob Vosmaer2016-01-142-3/+15
| |/ / / / / / /
* | | | | | | | Merge branch 'fixKerberosSignUp' into 'master' Drew Blessing2016-01-152-1/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix signup for some OAuth providersSteffen Köhler2016-01-152-1/+5
View Lorry Controller Status