summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Fix typo in CI settingsSteffen Köhler2016-01-011-1/+1
* Swap Author and Assignee Selectors on issuable index viewZeger-Jan van de Weg2015-12-301-4/+4
* Merge branch 'fix/missing-ci-build-traces' into 'master' Grzegorz Bizon2015-12-302-9/+57
|\
| * Add hotfix that allows to access build artifacts created before 8.3fix/missing-ci-build-tracesGrzegorz Bizon2015-12-292-9/+36
| * Hotfix for builds trace data integrityGrzegorz Bizon2015-12-281-1/+22
* | Merge branch 'fix-user-autocomplete' into 'master' Robert Speicher2015-12-301-1/+1
|\ \
| * | Fix user autocomplete uriIgor Matsko2015-12-261-1/+1
* | | Fix project transfer e-mail sending incorrect paths in e-mail notificationStan Hu2015-12-291-1/+3
* | | Merge branch 'upvote_count_to_api' into 'master' Valery Sizov2015-12-292-8/+4
|\ \ \
| * | | note votes methids implementationupvote_count_to_apiValery Sizov2015-12-291-2/+2
| * | | Revert upvotes and downvotes params to MR APIValery Sizov2015-12-282-6/+2
* | | | Merge branch 'influxdb-without-sidekiq' into 'master' Yorick Peterse2015-12-293-38/+7
|\ \ \ \
| * | | | Write to InfluxDB directly via UDPYorick Peterse2015-12-293-38/+7
* | | | | Merge branch 'issue_3780' into 'master' Dmitriy Zaporozhets2015-12-291-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Downcased user or email search for avatar_icon.issue_3780Stefan Kahlhöfer2015-12-281-1/+1
* | | | | Merge branch 'feature/recaptcha_settings' into 'master' Dmitriy Zaporozhets2015-12-296-12/+50
|\ \ \ \ \
| * | | | | 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-286-12/+50
| |/ / / /
* | | | | Merge branch 'fix-spelling-mistake' into 'master' Robert Speicher2015-12-291-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix spelling mistake, thanks Connor.fix-spelling-mistakeSytse Sijbrandij2015-12-281-1/+1
* | | | | Move InfluxDB settings to ApplicationSettingrelocate-influxdb-settingsYorick Peterse2015-12-282-0/+61
|/ / / /
* | | | Merge branch 'influxdb' into 'master' Dmitriy Zaporozhets2015-12-281-0/+33
|\ \ \ \
| * | | | Drop empty tag values from metricsYorick Peterse2015-12-171-1/+5
| * | | | Cast values to strings before escaping themYorick Peterse2015-12-171-1/+1
| * | | | Storing of application metrics in InfluxDBYorick Peterse2015-12-171-0/+29
* | | | | Merge branch 'disable-git-follow' into 'master' Dmitriy Zaporozhets2015-12-281-1/+3
|\ \ \ \ \
| * | | | | Disable --follow in `git log` to avoid loading duplicate commit data in infin...Stan Hu2015-12-251-1/+3
* | | | | | Merge branch 'rs-fix-shortcut-help' into 'master' Dmitriy Zaporozhets2015-12-283-12/+8
|\ \ \ \ \ \
| * | | | | | Fix the "Show all" link for the keyboard shortcut modalrs-fix-shortcut-helpRobert Speicher2015-12-273-12/+8
* | | | | | | Merge branch 'add-recaptcha-support' into 'master' Dmitriy Zaporozhets2015-12-283-10/+38
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Make sign-up form retain fields after failed CAPTCHA testStan Hu2015-12-271-4/+5
| * | | | | | Fix failed specStan Hu2015-12-271-1/+1
| * | | | | | Add support for Google reCAPTCHA in user registration to prevent spammersStan Hu2015-12-273-6/+33
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'rs-bump-brakeman' into 'master' Dmitriy Zaporozhets2015-12-281-1/+1
|\ \ \ \ \ \
| * | | | | | Prevent an XSS warning from the updated Brakemanrs-bump-brakemanRobert Speicher2015-12-271-1/+1
| | |/ / / / | |/| | | |
* | | | | | Do not show frequently used emojis when emptyValery Sizov2015-12-281-6/+7
|/ / / / /
* | | | | Merge branch 'mention-all' into 'master' Robert Speicher2015-12-272-2/+2
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Merge branch 'master' into mention-allDouwe Maan2015-12-2414-35/+181
| |\ \ \ \
| * | | | | Only allow group/project members to mention `@all`Douwe Maan2015-12-242-2/+2
* | | | | | Merge branch 'close-open-ajax-issue' into 'master' Robert Speicher2015-12-253-10/+41
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | removes unused `alert` from issue spec. Requires flash in the *implementation...close-open-ajax-issueJacob Schatz2015-12-231-0/+1
| * | | | | adds test for issue close/reopen failureJacob Schatz2015-12-231-2/+3
| * | | | | resolves conflicts with new buttonsJacob Schatz2015-12-2364-254/+1980
| |\ \ \ \ \
| * | | | | | changes `issue-box` to `status-box` since html was changed as wellJacob Schatz2015-12-211-9/+9
| * | | | | | adds alerts for when http request errors out in some way.Jacob Schatz2015-12-211-0/+2
| * | | | | | removes console logsJacob Schatz2015-12-211-1/+0
| * | | | | | changes `data-url` to `href` for javascript url grabbingJacob Schatz2015-12-212-3/+4
| * | | | | | removes `console.log`sJacob Schatz2015-12-211-2/+0
| * | | | | | open and close issue via ajax request. With testsJacob Schatz2015-12-213-9/+38
* | | | | | | Merge branch 'revert_votes_back' into 'master' Dmitriy Zaporozhets2015-12-254-9/+29
|\ \ \ \ \ \ \
View Lorry Controller Status