| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Fix and improve help rendering | Sullivan SENECHAL | 2015-04-03 | 1 | -1/+1 |
| | | |||||
| * | Add autocomplete controller | Dmitriy Zaporozhets | 2015-03-26 | 1 | -0/+5 |
| | | |||||
| * | Restyle oauth accounts at profile page and add ability to unlink accountimprove-profile | Dmitriy Zaporozhets | 2015-03-21 | 1 | -1/+5 |
| | | |||||
| * | Fix commits routing | Dmitriy Zaporozhets | 2015-03-20 | 1 | -2/+1 |
| | | |||||
| * | Fix commits routing for branches with slashfix-commits-routing | Dmitriy Zaporozhets | 2015-03-20 | 1 | -11/+20 |
| | | |||||
| * | Extend the commit calendar to show the actual commits for a date | Hannes Rosenögger | 2015-03-18 | 1 | -1/+4 |
| | | |||||
| * | Merge branch 'issue_subscription' into 'master' | Dmitriy Zaporozhets | 2015-03-17 | 1 | -0/+4 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | Subscription to issue/mr Fixes #1911 and #1909   See merge request !1702 | ||||
| | * | tests | Valery Sizov | 2015-03-16 | 1 | -2/+2 |
| | | | |||||
| | * | Subscription | Valery Sizov | 2015-03-15 | 1 | -0/+4 |
| | | | |||||
| * | | Move group leave action from dashboard/groups to groups/group_members. | Douwe Maan | 2015-03-15 | 1 | -5/+2 |
| | | | |||||
| * | | Move group members index from `/members` to `/group_members`. | Douwe Maan | 2015-03-15 | 1 | -2/+3 |
| | | | |||||
| * | | Move project members index from `/team` to `/project_members` | Douwe Maan | 2015-03-15 | 1 | -1/+0 |
| | | | |||||
| * | | Use `project_member` instead of `team_member`. | Douwe Maan | 2015-03-15 | 1 | -2/+2 |
| |/ | |||||
| * | Remove projects page from dashboard | Dmitriy Zaporozhets | 2015-03-10 | 1 | -1/+0 |
| | | |||||
| * | Add starred projects page to dashboard | Dmitriy Zaporozhets | 2015-03-09 | 1 | -0/+6 |
| | | |||||
| * | Move profile groups page to dashboard | Dmitriy Zaporozhets | 2015-03-08 | 1 | -5/+6 |
| | | |||||
| * | Add GitLab UI development kit | Dmitriy Zaporozhets | 2015-03-08 | 1 | -6/+3 |
| | | |||||
| * | Add dashboard milestones. | Douwe Maan | 2015-03-03 | 1 | -1/+5 |
| | | |||||
| * | Add comment about note attachment redirect. | Douwe Maan | 2015-02-28 | 1 | -0/+1 |
| | | |||||
| * | Redirect old note attachment path to new uploads path. | Douwe Maan | 2015-02-27 | 1 | -0/+4 |
| | | |||||
| * | Merge branch 'extend_markdown_upload' into 'master' | Dmitriy Zaporozhets | 2015-02-25 | 1 | -8/+8 |
| |\ | | | | | | | | | | | | | | | | | | | Generalizes image upload in drag and drop in markdown to all files From https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/265 by Hannes Rosenögger. - [x] Rebase on master when !1553 is merged in See merge request !1530 | ||||
| | * | Merge branch 'master' into extend_markdown_upload | Douwe Maan | 2015-02-24 | 1 | -133/+186 |
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/views/projects/issues/_form.html.haml # app/views/projects/merge_requests/_form.html.haml # app/views/projects/merge_requests/_new_submit.html.haml # app/views/projects/milestones/_form.html.haml # app/views/projects/notes/_form.html.haml # app/views/projects/wikis/_form.html.haml # config/routes.rb # spec/controllers/projects_controller_spec.rb | ||||
| | * \ | Merge branch 'master' into extend_markdown_upload | Douwe Maan | 2015-02-21 | 1 | -0/+6 |
| | |\ \ | |||||
| | * | | | Fix specs. | Douwe Maan | 2015-02-20 | 1 | -4/+6 |
| | | | | | |||||
| | * | | | Fix URL to uploaded file. | Douwe Maan | 2015-02-20 | 1 | -3/+3 |
| | | | | | |||||
| | * | | | Merge branch 'extend_markdown_upload' into generic-uploads | Douwe Maan | 2015-02-20 | 1 | -6/+6 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/controllers/files_controller.rb # app/controllers/projects/uploads_controller.rb # app/uploaders/attachment_uploader.rb | ||||
| | | * | | | Refactor. | Douwe Maan | 2015-02-17 | 1 | -2/+5 |
| | | | | | | |||||
| | | * | | | implement Project::UploadsController | Hannes Rosenögger | 2015-02-17 | 1 | -2/+3 |
| | | | | | | |||||
| | | * | | | Generalize the image upload in markdown | Hannes Rosenögger | 2015-02-17 | 1 | -2/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | This commit generalizes the image upload via drag and drop so it supports all files. It also adds access control for these files. | ||||
| | * | | | | Satisfy Rubocop. | Douwe Maan | 2015-02-20 | 1 | -2/+2 |
| | | | | | | |||||
| * | | | | | Re-enable rescuing from Bitbucket OAuth errors. | Douwe Maan | 2015-02-24 | 1 | -0/+1 |
| | | | | | | |||||
| * | | | | | Add Bitbucket importer. | Douwe Maan | 2015-02-24 | 1 | -0/+5 |
| | |_|_|/ |/| | | | |||||
| * | | | | Using gitlab url to build links for gitlab issue tracker and add a spec. Fix ↵ | Marin Jankovski | 2015-02-23 | 1 | -10/+17 |
| | | | | | | | | | | | | | | | | | rubocop warnings in path. | ||||
| * | | | | Fix markdown image uploader after rails update | Dmitriy Zaporozhets | 2015-02-23 | 1 | -3/+3 |
| | | | | | |||||
| * | | | | Fix style issue for rubocop | Dmitriy Zaporozhets | 2015-02-23 | 1 | -8/+12 |
| | | | | | |||||
| * | | | | Merge branch 'master' into rails-4.1.9 | Vinnie Okada | 2015-02-21 | 1 | -0/+20 |
| |\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: app/views/projects/commits/_commit.html.haml app/views/projects/issues/_issue.html.haml app/views/projects/issues/_issue_context.html.haml app/views/projects/merge_requests/_merge_request.html.haml app/views/projects/merge_requests/show/_context.html.haml | ||||
| | * | | | Merge branch 'upload-xss-access-control' into 'master' | Marin Jankovski | 2015-02-20 | 1 | -0/+14 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix note attachments XSS and access control Replaces the reverted #1528, as proposed in https://gitlab.com/gitlab-org/omnibus-gitlab/issues/434, as discussed with @dzaporozhets and as summarized in #2032. @marin Could you take a look at the nginx config and apply it to Omnibus once this gets merged? See merge request !1553 | ||||
| | | * | | | Satisfy Rubocop. | Douwe Maan | 2015-02-20 | 1 | -4/+6 |
| | | |/ / | |||||
| | | * | | Use controllers to serve uploads, with XSS prevention and access control. | Douwe Maan | 2015-02-20 | 1 | -0/+12 |
| | | |/ | |||||
| | * | | Add gitorious.org importer | Marcin Kulik | 2015-02-20 | 1 | -0/+6 |
| | |/ | |||||
| * | | Upgrade to Rails 4.1.9 | Vinnie Okada | 2015-02-14 | 1 | -125/+167 |
| |/ | | | | | | Make the following changes to deal with new behavior in Rails 4.1.2: * Use nested resources to avoid slashes in arguments to path helpers. | ||||
| * | Add admin services templates. | Marin Jankovski | 2015-02-11 | 1 | -4/+6 |
| | | |||||
| * | Merge branch 'markdown-preview-via-post' into 'master' | Dmitriy Zaporozhets | 2015-02-06 | 1 | -1/+1 |
| |\ | | | | | | | | | | | | | | | Don't have Markdown preview fail for long comments/wiki pages. See https://github.com/gitlabhq/gitlabhq/issues/8611. See merge request !1479 | ||||
| | * | Don't have Markdown preview fail for long content by using POST rather than GET. | Douwe Maan | 2015-02-06 | 1 | -1/+1 |
| | | | | | | | | | See https://github.com/gitlabhq/gitlabhq/issues/8611. | ||||
| * | | GitLab.com integration: refactoring | Valery Sizov | 2015-02-05 | 1 | -4/+4 |
| | | | |||||
| * | | GitLab integration. Importer | Valery Sizov | 2015-02-05 | 1 | -5/+16 |
| |/ | |||||
| * | code folding | Valery Sizov | 2015-02-03 | 1 | -2/+2 |
| | | |||||
| * | Commit page: async load branches info | Valery Sizov | 2015-02-03 | 1 | -2/+6 |
| | | | | | | Conflicts: config/routes.rb | ||||
| * | Rubocop: Style/AlignHash enabled | Dmitriy Zaporozhets | 2015-02-02 | 1 | -6/+4 |
| | | |||||
| * | Rubocop enabled for: Use spaces inside hash literal braces | Dmitriy Zaporozhets | 2015-02-02 | 1 | -24/+24 |
| | | |||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |