summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* add issue weight to contributingissue-weight-contributingJob van der Voort2015-12-281-0/+22
* Merge branch 'add-recaptcha-support' into 'master' Dmitriy Zaporozhets2015-12-2811-10/+121
|\
| * Add documentation for using reCAPTCHAadd-recaptcha-supportStan Hu2015-12-273-1/+58
| * 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-279-6/+59
* | Merge branch 'rs-bump-brakeman' into 'master' Dmitriy Zaporozhets2015-12-283-10/+16
|\ \
| * | Prevent an XSS warning from the updated Brakemanrs-bump-brakemanRobert Speicher2015-12-271-1/+1
| * | Bump brakeman to ~> 3.1.0Robert Speicher2015-12-272-9/+15
* | | Merge branch 'initscript-duplicate-update' into 'master' Sytse Sijbrandij2015-12-281-2/+0
|\ \ \
| * | | `update-init-script` was listed two times. removed one without explanation.Raymii2015-12-221-2/+0
* | | | Merge branch 'fix_frequently_emojis' into 'master' Valery Sizov2015-12-281-6/+7
|\ \ \ \
| * | | | Do not show frequently used emojis when emptyValery Sizov2015-12-281-6/+7
|/ / / /
* | | | Merge branch 'issue_4662' into 'master' Robert Speicher2015-12-281-0/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | Precompile assets before running feature specs. #4662Rubén Dávila2015-12-281-0/+1
| |/ /
* | | Merge branch 'mention-all' into 'master' Robert Speicher2015-12-2711-18/+66
|\ \ \ | |_|/ |/| |
| * | Fix specmention-allDouwe Maan2015-12-251-0/+2
| * | Merge branch 'master' into mention-allDouwe Maan2015-12-2424-50/+218
| |\ \
| * | | Fix specsDouwe Maan2015-12-242-0/+5
| * | | Only allow group/project members to mention `@all`Douwe Maan2015-12-249-18/+59
* | | | Merge branch 'grammar_fix' into 'master' Achilleas Pipinellis2015-12-261-1/+1
|\ \ \ \
| * | | | Fix typo on triggers docs [ci skip]Achilleas Pipinellis2015-12-261-1/+1
|/ / / /
* | | | Merge branch 'fix_triggers_doc' into 'master' Achilleas Pipinellis2015-12-261-3/+0
|\ \ \ \
| * | | | Remove incomplete text [ci skip]Achilleas Pipinellis2015-12-261-3/+0
|/ / / /
* | | | Merge branch 'close-open-ajax-issue' into 'master' Robert Speicher2015-12-255-11/+138
|\ \ \ \
| * | | | removes unused `alert` from issue spec. Requires flash in the *implementation...close-open-ajax-issueJacob Schatz2015-12-233-8/+3
| * | | | adds test for issue close/reopen failureJacob Schatz2015-12-233-6/+63
| * | | | resolves conflicts with new buttonsJacob Schatz2015-12-23127-373/+3032
| |\ \ \ \
| * | | | | fixes tests to work with jasmine/jqueryJacob Schatz2015-12-232-13/+16
| * | | | | 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-212-10/+3
| * | | | | removes console logsJacob Schatz2015-12-211-1/+0
| * | | | | changes `data-url` to `href` for javascript url grabbingJacob Schatz2015-12-212-3/+4
| * | | | | clarifies tests with methods like `toBeVisible()` etc.Jacob Schatz2015-12-211-12/+9
| * | | | | updates tests style for four-phase-testing as per: https://robots.thoughtbot....Jacob Schatz2015-12-211-1/+17
| * | | | | removes `console.log`sJacob Schatz2015-12-211-2/+0
| * | | | | open and close issue via ajax request. With testsJacob Schatz2015-12-215-10/+78
* | | | | | Merge branch 'revert_votes_back' into 'master' Dmitriy Zaporozhets2015-12-258-16/+51
|\ \ \ \ \ \
| * | | | | | satisfy rubocoprevert_votes_backValery Sizov2015-12-251-1/+1
| * | | | | | fix spinachValery Sizov2015-12-251-3/+5
| * | | | | | add sorting of awardsValery Sizov2015-12-254-2/+21
| * | | | | | revert back vote buttons to issue and MR pagesValery Sizov2015-12-254-11/+25
* | | | | | | Merge branch 'rs-opengraph' into 'master' Douwe Maan2015-12-2511-8/+262
|\ \ \ \ \ \ \
| * | | | | | | Add link to twitter docsDouwe Maan2015-12-251-1/+2
| * | | | | | | Add more twitter metatags.Douwe Maan2015-12-251-0/+6
| * | | | | | | Add og:site_nameDouwe Maan2015-12-251-2/+2
| * | | | | | | Satisfy RubocopDouwe Maan2015-12-251-2/+2
| * | | | | | | Add support for `twitter:label` meta tagsrs-opengraphRobert Speicher2015-12-247-4/+86
| * | | | | | | Use `request.fullpath` for `og:url` tagRobert Speicher2015-12-241-1/+1
| * | | | | | | Truncate page_description to 30 wordsRobert Speicher2015-12-242-2/+15