Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Implement @rymai's feedback after review. | Timothy Andrew | 2016-05-12 | 1 | -2/+10 |
* | Add a spec for `WikiLinkFilter` | Timothy Andrew | 2016-05-12 | 1 | -0/+77 |
* | Merge branch 'issue_15572_snippets_tab_under_user_profile' into 'master' | Douwe Maan | 2016-05-11 | 2 | -4/+59 |
|\ | |||||
| * | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into issue_15572_sni... | Long Nguyen | 2016-05-11 | 64 | -894/+606 |
| |\ | |||||
| * | | Add specs for user routing and update spec for user controller | Long Nguyen | 2016-05-08 | 2 | -0/+59 |
| * | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into issue_15572_sni... | Long Nguyen | 2016-05-08 | 8 | -29/+360 |
| |\ \ | |||||
| * | | | user routings refactor | Long Nguyen | 2016-05-08 | 1 | -0/+4 |
| * | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into issue_15572_sni... | Long Nguyen | 2016-05-05 | 62 | -410/+1660 |
| |\ \ \ | |||||
| * | | | | Remove unused code, update spec, and update changelog | Long Nguyen | 2016-05-05 | 1 | -8/+0 |
* | | | | | Merge branch 'hook-docs-behavior' into 'master' | Robert Speicher | 2016-05-11 | 1 | -2/+2 |
|\ \ \ \ \ | |||||
| * | | | | | Fix test failures | Jacob Vosmaer | 2016-05-09 | 1 | -2/+2 |
* | | | | | | Merge branch '17249-starred' into 'master' | Robert Speicher | 2016-05-11 | 2 | -12/+28 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Tidy up user project specs | Sean McGivern | 2016-05-11 | 1 | -13/+8 |
| * | | | | | | Restrict starred projects to viewable ones | Sean McGivern | 2016-05-10 | 2 | -12/+33 |
* | | | | | | | Merge branch '17270-only-generate-email-on-push-once-for-all-recipients' into... | Robert Speicher | 2016-05-11 | 3 | -45/+58 |
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | |||||
| * | | | | | | Only generate repository push email once | Sean McGivern | 2016-05-11 | 3 | -45/+58 |
* | | | | | | | Merge branch 'stanhu/gitlab-ce-add-eager-load-lib' into 'master' | Robert Speicher | 2016-05-10 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Fix a few places where autoloading would fail | Rémy Coutable | 2016-05-10 | 1 | -1/+1 |
* | | | | | | | | Fix an issue when filtering merge requests with more than one label | Rémy Coutable | 2016-05-10 | 1 | -0/+137 |
| |/ / / / / / |/| | | | | | | |||||
* | | | | | | | Merge branch 'fix/using-uploads-in-global-snippets' into 'master' | Robert Speicher | 2016-05-10 | 1 | -0/+18 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | |||||
| * | | | | | | Do not process upload links if no project context | Grzegorz Bizon | 2016-05-10 | 1 | -3/+3 |
| * | | | | | | Fix using link to uploads in global snippets | Grzegorz Bizon | 2016-05-10 | 1 | -0/+18 |
* | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce | Dmitriy Zaporozhets | 2016-05-10 | 53 | -886/+220 |
|\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch '2460-3690-support-multiline-tag-message' into 'master' | Rémy Coutable | 2016-05-10 | 4 | -0/+218 |
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | |||||
| | * | | | | | | Add integration specs for tags | Rémy Coutable | 2016-05-10 | 4 | -0/+218 |
| * | | | | | | | Merge branch 'revert-4026' into 'master' | Rémy Coutable | 2016-05-10 | 2 | -4/+2 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||||
| | * | | | | | | Revert "Merge branch 'wiki-fix' into 'master' " | Rémy Coutable | 2016-05-10 | 2 | -4/+2 |
| * | | | | | | | Merge branch 'remove-annotate-gem' into 'master' | Yorick Peterse | 2016-05-10 | 47 | -882/+0 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||||
| | * | | | | | | Remove the annotate gem and delete old annotations | Jeroen van Baarsen | 2016-05-09 | 47 | -882/+0 |
* | | | | | | | | Use a case-insensitive comparison in sanitizing URI schemes | Stan Hu | 2016-05-09 | 1 | -0/+6 |
|/ / / / / / / | |||||
* | | | | | | | Merge branch 'fix/todos-for-private-group-mentions' into 'master' | Douwe Maan | 2016-05-09 | 1 | -0/+19 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Fix adding a todo for private group members | Ahmad Sherif | 2016-05-07 | 1 | -0/+19 |
* | | | | | | | | Merge branch 'issue_15394' into 'master' | Rémy Coutable | 2016-05-09 | 3 | -1/+17 |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | |||||
| * | | | | | | | Sanitize milestones and label titlesissue_15394 | Felipe Artur | 2016-05-05 | 3 | -1/+17 |
* | | | | | | | | Merge branch '2954-api-expose-issue-user_notes_count' into 'master' | Rémy Coutable | 2016-05-09 | 2 | -0/+49 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Expose MergeRequest#user_notes_count in the API and use the method in issues ... | Rémy Coutable | 2016-05-09 | 2 | -14/+48 |
| * | | | | | | | | API: Expose Issue#user_notes_count | cnam-dep | 2016-05-09 | 1 | -0/+15 |
| | |_|/ / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'rs-backport-ee-372' into 'master' | Rémy Coutable | 2016-05-09 | 3 | -8/+75 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||||
| * | | | | | | | Backport changes from gitlab-org/gitlab-ee!372rs-backport-ee-372 | Robert Speicher | 2016-05-04 | 3 | -8/+75 |
| |/ / / / / / | |||||
* | | | | | | | Merge branch 'wiki-fix' into 'master' | Rémy Coutable | 2016-05-09 | 2 | -2/+4 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Use the proper GitLab URL for links in Wiki | Artem Sidorenko | 2016-05-09 | 2 | -2/+4 |
* | | | | | | | | Merge branch 'rs-remove-wall_enabled' into 'master' | Dmitriy Zaporozhets | 2016-05-09 | 2 | -2/+0 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||||
| * | | | | | | | Remove `wall_enabled` field from Projectrs-remove-wall_enabled | Robert Speicher | 2016-05-08 | 2 | -2/+0 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'trusted-proxies-ip-addr' into 'master' | Rémy Coutable | 2016-05-09 | 1 | -0/+51 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Add tests for setting trusted_proxiestrusted-proxies-ip-addr | DJ Mountney | 2016-05-04 | 1 | -0/+51 |
* | | | | | | | | Merge branch 'escape-commit-titles' into 'master' | Robert Speicher | 2016-05-08 | 1 | -0/+9 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Escape HTML in commit titles in system note messages | Stan Hu | 2016-05-07 | 1 | -0/+9 |
| | |/ / / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'fix-build-notification-on-merge-page-change' into 'master' | Stan Hu | 2016-05-08 | 1 | -0/+6 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | |||||
| * | | | | | | | Fix build notification on merge request page change even if the build status ... | Benedikt Huss | 2016-05-08 | 1 | -0/+6 |
| |/ / / / / / | |||||
* | | | | | | | Update SVG sanitizer to conform to SVG 1.1 | Stan Hu | 2016-05-06 | 3 | -0/+112 |
|/ / / / / / |