summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix the `inline_theme` option for the Rouge formatterrs-fix-rouge-inline-themeRobert Speicher2015-08-011-1/+1
* Merge branch 'rs-code-links' into 'master' Douwe Maan2015-08-012-1/+5
|\
| * Make `code` elements in links display as suchrs-code-linksRobert Speicher2015-07-312-1/+5
|/
* Merge branch 'api-useremails' into 'master' Robert Speicher2015-07-315-6/+425
|\
| * Fix indentationDouwe Maan2015-07-311-11/+11
| * Merge branch 'master' into api-useremailsDouwe Maan2015-07-3126-362/+512
| |\
| * | Fix docsDouwe Maan2015-07-302-7/+7
| * | Add ability to manage user email addresses via the API.Douwe Maan2015-07-295-0/+419
* | | Merge branch 'mention-name-in-flash-msg' into 'master'Douwe Maan2015-07-313-7/+8
|\ \ \
| * | | Raise alert when group is deleted.Achilleas Pipinellis2015-07-301-1/+1
| * | | Mention group and project name in flash messages upon create, update and delete.Achilleas Pipinellis2015-07-303-7/+8
* | | | Merge branch 'admin-group-member' into 'master' Douwe Maan2015-07-316-20/+33
|\ \ \ \
| * | | | Use before_actionsDouwe Maan2015-07-312-4/+7
| * | | | Restore Leave button on dashboard groups pageadmin-group-memberDouwe Maan2015-07-291-4/+3
| * | | | Show Leave button when you're the last owner, so that the error explains the ...Douwe Maan2015-07-281-1/+1
| * | | | Disable adding members from admin area when appropriateDouwe Maan2015-07-281-16/+18
| * | | | Add specific ability for managing group membersDouwe Maan2015-07-285-7/+16
* | | | | Merge branch 'fix-multiline-comment-highlighting' into 'master'Douwe Maan2015-07-313-2/+29
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Fix multi-line syntax highlightingStan Hu2015-07-303-2/+29
|/ / / /
* | | | Merge branch 'rs-mr-1050-followup' into 'master' Robert Speicher2015-07-313-3/+28
|\ \ \ \
| * | | | Fix CHANGELOG entryrs-mr-1050-followupRobert Speicher2015-07-301-1/+1
| * | | | Add spec to RelativeLinkFilter for Unicode filenamesRobert Speicher2015-07-302-2/+27
* | | | | Merge branch 'rs-markdown-feature-pipelines' into 'master' Robert Speicher2015-07-314-314/+388
|\ \ \ \ \
| * | | | | Fix setup/teardown for Markdown feature specrs-markdown-feature-pipelinesRobert Speicher2015-07-292-24/+9
| * | | | | Update Markdown feature to allow for multiple pipelinesRobert Speicher2015-07-282-163/+209
| * | | | | Add RelativeLinkFilter section to Markdown fixtureRobert Speicher2015-07-281-0/+7
| * | | | | Move MarkdownFeature to its own support fileRobert Speicher2015-07-282-115/+114
| * | | | | Make links inside ignored elements uniqueRobert Speicher2015-07-281-3/+3
| * | | | | Break up SanitizationFilter feature specsRobert Speicher2015-07-281-16/+37
| * | | | | Use aggregate_failures where appropriateRobert Speicher2015-07-281-34/+53
| * | | | | Minor Markdown feature spec reorganizationRobert Speicher2015-07-281-46/+47
| * | | | | Simplify AutolinkFilter specsRobert Speicher2015-07-281-16/+12
* | | | | | Merge branch 'api-new-attributes' into 'master' Robert Speicher2015-07-305-10/+32
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Fix Projectapi-new-attributesDouwe Maan2015-07-301-1/+1
| * | | | | No more web urlDouwe Maan2015-07-304-14/+11
| * | | | | Fix specsDouwe Maan2015-07-292-7/+13
| * | | | | Merge branch 'master' into api-new-attributesDouwe Maan2015-07-2921-49/+350
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| * | | | | Use URL helpersDouwe Maan2015-07-293-4/+5
| * | | | | Add project star and fork count, group avatar URL and user/group web URL attr...Douwe Maan2015-07-284-1/+19
| | |_|/ / | |/| | |
* | | | | Merge branch 'fix-image-file-is-not-displayed' into 'master'Robert Speicher2015-07-302-2/+4
|\ \ \ \ \
| * | | | | Fix the image file that contains non-ascii character is not displayedHiroyuki Sato2015-07-272-2/+4
* | | | | | Fix version for CHANGELOG entryStan Hu2015-07-301-1/+1
* | | | | | Merge branch 'backup-directory-permissions' into 'master' Stan Hu2015-07-304-6/+14
|\ \ \ \ \ \
| * | | | | | Stricter mkdir's in 'rake gitlab:backup:create'backup-directory-permissionsJacob Vosmaer2015-07-303-4/+14
| * | | | | | Set internal backup directory modes on createJacob Vosmaer2015-07-294-5/+3
* | | | | | | Merge branch 'fix-rake-check-hooks' into 'master'Jacob Vosmaer2015-07-301-4/+4
|\ \ \ \ \ \ \
| * | | | | | | Check that hooks directory exists before attempting to call realpathStan Hu2015-07-301-4/+4
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge branch 'fix-single-quote-in-network-graph' into 'master'Douwe Maan2015-07-305-5/+25
|\ \ \ \ \ \ \
| * | | | | | | Fix network graph when branch name has single quotesStan Hu2015-07-295-5/+25
| |/ / / / / /
* | | | | | | Merge branch 'ssh-key-form' into 'master' Job van der Voort2015-07-301-4/+3
|\ \ \ \ \ \ \
View Lorry Controller Status