Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'rs-fix-rouge-inline-theme' into 'master' | Stan Hu | 2015-08-04 | 1 | -1/+1 |
|\ | |||||
| * | Fix the `inline_theme` option for the Rouge formatterrs-fix-rouge-inline-theme | Robert Speicher | 2015-08-01 | 1 | -1/+1 |
* | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce | Dmitriy Zaporozhets | 2015-08-04 | 2 | -2/+5 |
|\ \ | |||||
| * \ | Merge branch 'update-mr-branch-text' into 'master' | Douwe Maan | 2015-08-04 | 1 | -2/+4 |
| |\ \ | |||||
| | * | | Update merge request text to reflect editability of source/target branch | Stan Hu | 2015-08-03 | 1 | -2/+4 |
| * | | | Link to admin raketask | Sytse Sijbrandij | 2015-08-03 | 1 | -0/+1 |
* | | | | Merge branch 'add-user' into 'master' | Job van der Voort | 2015-08-04 | 7 | -0/+29 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | typo | karen Carias | 2015-08-03 | 1 | -1/+1 |
| * | | | text fixed | karen Carias | 2015-08-03 | 2 | -8/+8 |
| * | | | typo | karen Carias | 2015-07-30 | 2 | -9/+9 |
| * | | | added new doc about adding users and members | karen Carias | 2015-07-30 | 7 | -0/+29 |
* | | | | Merge branch 'add-license' | Dmitriy Zaporozhets | 2015-08-03 | 5 | -8/+69 |
|\ \ \ \ | |||||
| * \ \ \ | Merge branch 'master' into add-licenseadd-license | Douwe Maan | 2015-07-31 | 16 | -337/+468 |
| |\ \ \ \ | |||||
| * | | | | | Fix method name. | Douwe Maan | 2015-07-30 | 1 | -1/+1 |
| * | | | | | Show buttons to add license, changelog and contribution guide if they're miss... | Douwe Maan | 2015-07-30 | 4 | -7/+68 |
* | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce | Dmitriy Zaporozhets | 2015-08-03 | 3 | -46/+3 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'redis-store' into 'master' | Kamil TrzciĆski | 2015-08-03 | 3 | -46/+3 |
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | |||||
| | * | | | | | Bump redis-store to 1.1.6 and remove redid-store-fix-expiryredis-store | Kamil Trzcinski | 2015-07-31 | 3 | -46/+3 |
* | | | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhq | Dmitriy Zaporozhets | 2015-08-03 | 48 | -406/+1069 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhq | Stan Hu | 2015-08-02 | 9 | -6/+43 |
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | |||||
| | * | | | | | Merge pull request #9520 from gipcompany/annotate-models-update | Stan Hu | 2015-08-02 | 9 | -6/+43 |
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | | | |||||
| | | * | | | | Re-annotate models | Atsushi Ishida | 2015-08-03 | 9 | -6/+43 |
| | |/ / / / | |||||
| * | | | | | Merge branch 'rs-code-links' into 'master' | Douwe Maan | 2015-08-01 | 2 | -1/+5 |
| |\ \ \ \ \ | |||||
| | * | | | | | Make `code` elements in links display as suchrs-code-links | Robert Speicher | 2015-07-31 | 2 | -1/+5 |
| |/ / / / / | |||||
| * | | | | | Merge branch 'api-useremails' into 'master' | Robert Speicher | 2015-07-31 | 5 | -6/+425 |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| | * | | | | Fix indentation | Douwe Maan | 2015-07-31 | 1 | -11/+11 |
| | * | | | | Merge branch 'master' into api-useremails | Douwe Maan | 2015-07-31 | 26 | -362/+512 |
| | |\ \ \ \ | | | | |/ / | | | |/| | | |||||
| | * | | | | Fix docs | Douwe Maan | 2015-07-30 | 2 | -7/+7 |
| | * | | | | Add ability to manage user email addresses via the API. | Douwe Maan | 2015-07-29 | 5 | -0/+419 |
| * | | | | | Merge branch 'mention-name-in-flash-msg' into 'master' | Douwe Maan | 2015-07-31 | 3 | -7/+8 |
| |\ \ \ \ \ | |||||
| | * | | | | | Raise alert when group is deleted. | Achilleas Pipinellis | 2015-07-30 | 1 | -1/+1 |
| | * | | | | | Mention group and project name in flash messages upon create, update and delete. | Achilleas Pipinellis | 2015-07-30 | 3 | -7/+8 |
| * | | | | | | Merge branch 'admin-group-member' into 'master' | Douwe Maan | 2015-07-31 | 6 | -20/+33 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Use before_actions | Douwe Maan | 2015-07-31 | 2 | -4/+7 |
| | * | | | | | | Restore Leave button on dashboard groups pageadmin-group-member | Douwe Maan | 2015-07-29 | 1 | -4/+3 |
| | * | | | | | | Show Leave button when you're the last owner, so that the error explains the ... | Douwe Maan | 2015-07-28 | 1 | -1/+1 |
| | * | | | | | | Disable adding members from admin area when appropriate | Douwe Maan | 2015-07-28 | 1 | -16/+18 |
| | * | | | | | | Add specific ability for managing group members | Douwe Maan | 2015-07-28 | 5 | -7/+16 |
| * | | | | | | | Merge branch 'fix-multiline-comment-highlighting' into 'master' | Douwe Maan | 2015-07-31 | 3 | -2/+29 |
| |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | |||||
| | * | | | | | | Fix multi-line syntax highlighting | Stan Hu | 2015-07-30 | 3 | -2/+29 |
| |/ / / / / / | |||||
| * | | | | | | Merge branch 'rs-mr-1050-followup' into 'master' | Robert Speicher | 2015-07-31 | 3 | -3/+28 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Fix CHANGELOG entryrs-mr-1050-followup | Robert Speicher | 2015-07-30 | 1 | -1/+1 |
| | * | | | | | | Add spec to RelativeLinkFilter for Unicode filenames | Robert Speicher | 2015-07-30 | 2 | -2/+27 |
| * | | | | | | | Merge branch 'rs-markdown-feature-pipelines' into 'master' | Robert Speicher | 2015-07-31 | 4 | -314/+388 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Fix setup/teardown for Markdown feature specrs-markdown-feature-pipelines | Robert Speicher | 2015-07-29 | 2 | -24/+9 |
| | * | | | | | | | Update Markdown feature to allow for multiple pipelines | Robert Speicher | 2015-07-28 | 2 | -163/+209 |
| | * | | | | | | | Add RelativeLinkFilter section to Markdown fixture | Robert Speicher | 2015-07-28 | 1 | -0/+7 |
| | * | | | | | | | Move MarkdownFeature to its own support file | Robert Speicher | 2015-07-28 | 2 | -115/+114 |
| | * | | | | | | | Make links inside ignored elements unique | Robert Speicher | 2015-07-28 | 1 | -3/+3 |
| | * | | | | | | | Break up SanitizationFilter feature specs | Robert Speicher | 2015-07-28 | 1 | -16/+37 |