summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | | | | | | Merge branch 'rs-bump-brakeman' into 'master' Dmitriy Zaporozhets2015-12-283-10/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump brakeman to ~> 3.1.0 See merge request !2219
| * | | | | | | | | | | | | | | | | | | | 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. `update-init-script` was listed two times. removed one without explanation. See merge request !2170
| * | | | | | | | | | | | | | | | | | | | `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
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [emoji-picker] Do not show frequently used category when it's empty I added one condition. See merge request !2221
| * | | | | | | | | | | | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix intermittent timeout problems with feature specs. This MR updates the gitlab-ci config to compile assets before running feature specs. Closes #4662 See merge request !2220
| * | | | | | | | | | | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only allow group/project members to mention `@all` Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/3473 See merge request !2205
| * | | | | | | | | | | | | | | | | | | 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 See merge request !2214
| * | | | | | | | | | | | | | | | | | | | 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 on triggers doc See merge request !2213
| * | | | | | | | | | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | open and close issue via ajax request. With tests Close and Reopen issues with ajax request. See merge request !2164
| * | | | | | | | | | | | | | | | | | removes unused `alert` from issue spec. Requires flash in the ↵close-open-ajax-issueJacob Schatz2015-12-233-8/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | *implementation* instead of the spec.
| * | | | | | | | | | | | | | | | | | 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: ↵Jacob Schatz2015-12-211-1/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://robots.thoughtbot.com/four-phase-test
| * | | | | | | | | | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert vote buttons back to issue and MR pages https://gitlab.com/gitlab-org/gitlab-ce/issues/3672 /cc @dzaporozhets @JobV ![joxi_screenshot_1450809309400](/uploads/379a75505e0d5f24e743aa0a6a6684e2/joxi_screenshot_1450809309400.png) See merge request !2206
| * | | | | | | | | | | | | | | | | | | 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 Open Graph meta tags See merge request !2192
| * | | | | | | | | | | | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Account for `@project.description` being nilRobert Speicher2015-12-232-1/+9
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Add page descriptions and imagesRobert Speicher2015-12-237-9/+149
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A limited number of pages have defined their own descriptions, but otherwise we default to the Project's description (if `@project` is set), or the old `brand_title` fallback. The image will either be the uploaded project icon (never a generated one), the user's uploaded icon or Gravatar, or, finally, the GitLab logo.
| * | | | | | | | | | | | | | | | | | | Add gitlab_logo.png, remove brand_logo.pngRobert Speicher2015-12-232-0/+0
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Add Open Graph meta tagsRobert Speicher2015-12-231-1/+5
| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'adding_crime_security' into 'master' Achilleas Pipinellis2015-12-252-0/+64
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding CRIME Vulnerability to Security doc Added an additional page to the security section that goes over current status and fixes for the TLS Protocol CRIME Vulnerability. Also added its respective link at the security README. Any suggestions appreciated @JobV @sytses See merge request !2102
| * | | | | | | | | | | | | | | | | | | Clean up CRIME security doc [ci skip]Achilleas Pipinellis2015-12-251-37/+41
| | | | | | | | | | | | | | | | | | | |