summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'fix-avatar-access' into 'master'Dmitriy Zaporozhets2015-02-241-0/+9
|\ | | | | | | | | | | | | | | | | | | Allow non authenticated access to avatars For #2047 cc @douwe See merge request !1583
| * Allow non authenticated access to avatarsDmitriy Zaporozhets2015-02-231-0/+9
| |
* | Better readme titleDmitriy Zaporozhets2015-02-231-3/+3
|/
* Merge branch 'api-empty-commit' into 'master'Dmitriy Zaporozhets2015-02-242-8/+13
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | Improve error messages when file editing fails Give more specific errors in API responses and web UI flash messages when a file update fails. See #1479. Instead of returning false from `Gitlab::Satellite::Files::EditFileAction#commit!` when a `Grit::Git::CommandFailed` error is raised, now `#commit!` raises a different error depending on whether the failure happened during checkout, commit, or push. @dzaporozhets Please let me know if you want to change the HTTP status codes or the error messages in `Files::UpdateService` cc @sytse See merge request !1569
| * Improve error messages when file editing failsVinnie Okada2015-02-222-8/+13
| | | | | | | | | | Give more specific errors in API responses and web UI flash messages when a file update fails.
* | Merge branch 'fix-commit-zen-mode' into 'master'Dmitriy Zaporozhets2015-02-241-1/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | Fix ZenMode on commit show and milestone edit pages. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/1110 See merge request !1557
| * | Initialize ZenMode on commit show and milestone edit pages.Douwe Maan2015-02-211-1/+2
| | |
* | | Git Clone btn more apparentSabba Petri2015-02-231-0/+2
| | | | | | | | | | | | | | | | | | | | | Added a faint background to the button to show that it is in an active state for the user. White background is often hard to tell if something is being pushed, so adding a "shadow" makes it a bit easier to tell. Fixes #1998
* | | Correct spelling of 'a project avatar'Marco Wessel2015-02-231-1/+1
| | |
* | | Fix updating issue 500 errorDmitriy Zaporozhets2015-02-221-1/+1
| | |
* | | Fix dashboard for projects > 30Dmitriy Zaporozhets2015-02-221-1/+1
| |/ |/|
* | Merge branch 'master' into rails-4.1.9Vinnie Okada2015-02-2215-98/+63
|\ \ | | | | | | | | | | | | Conflicts: app/views/dashboard/projects.html.haml
| * | Create Aside js class for handling all sidebars in UI for mobile devicesDmitriy Zaporozhets2015-02-2111-90/+56
| | |
| * | Improve projects UI a bitDmitriy Zaporozhets2015-02-214-8/+7
| | |
* | | Merge branch 'master' into rails-4.1.9Vinnie Okada2015-02-2140-261/+428
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | 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
| * | Render gitlab.com import block only if host is not gitlab.comDmitriy Zaporozhets2015-02-211-12/+13
| | |
| * | Merge branch 'mr-commit-comment-diff-lines' into 'master'Dmitriy Zaporozhets2015-02-211-9/+9
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix commit comments on first line of diff not rendering in Merge Request Discussion view. Example can be seen near the bottom on this MR: !1533. Before: ![Screen Shot 2015-02-20 at 10.24.34](https://dev.gitlab.org/uploads/gitlab/gitlabhq/35600b98b5/Screen_Shot_2015-02-20_at_10.24.34.png) After: the [note](https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/1533/diffs#note_36449) is actually rendered. See merge request !1552
| | * | Fix commit comments on first line of diff not rendering in Merge Request ↵Douwe Maan2015-02-201-9/+9
| | |/ | | | | | | | | | Discussion view.
| * | Merge branch 'empty-project-redirect-vs-404' into 'master'Dmitriy Zaporozhets2015-02-2113-13/+12
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Redirect from /tree/master on empty repo instead of showing 404. See https://gitlab.com/gitlab-org/gitlab-ce/issues/1114 See merge request !1559
| | * | Move 'require_non_empty_project' filter to front so 'assign_ref_vars' ↵Douwe Maan2015-02-2013-13/+12
| | |/ | | | | | | | | | doesn't 404.
| * | Merge branch 'go-get-workaround-nginx' of https://github.com/mattes/gitlabhq ↵Marin Jankovski2015-02-201-7/+0
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mattes-go-get-workaround-nginx Conflicts: lib/support/nginx/gitlab lib/support/nginx/gitlab-ssl
| | * | remove go-import meta tag from haml filemattes2014-12-311-7/+0
| | | |
| * | | Merge branch 'mr-body-single-commit' into 'master'Dmitriy Zaporozhets2015-02-201-6/+7
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Base new MR description on commit description if there's only one. Closes #2029, again. See merge request !1561
| | * | | Base new MR description on commit description if there's only one.Douwe Maan2015-02-201-6/+7
| | | | |
| * | | | Merge branch 'upload-xss-access-control' into 'master'Marin Jankovski2015-02-202-0/+36
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 Maan2015-02-201-1/+1
| | | | | |
| | * | | | Use controllers to serve uploads, with XSS prevention and access control.Douwe Maan2015-02-202-0/+36
| | | |_|/ | | |/| |
| * | | | Add gitorious.org importerMarcin Kulik2015-02-203-0/+91
| | |/ / | |/| |
| * | | Merge branch 'mr-title-single-commit' into 'master'Dmitriy Zaporozhets2015-02-201-3/+8
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Base new MR title on commit title if there's only one. Closes #2029. See merge request !1558
| | * | | Base new MR title on commit title if there's only one.Douwe Maan2015-02-201-3/+8
| | |/ /
| * | | Fix commits calendar vertical days.Douwe Maan2015-02-201-3/+0
| |/ /
| * | Bigger and bold title for issue/mr show pagesDmitriy Zaporozhets2015-02-203-4/+4
| | |
| * | Minor css improvementsDmitriy Zaporozhets2015-02-2010-32/+59
| | | | | | | | | | | | | | | * lighter color for comments count * better UI for issue assigee.milestone block
| * | Improve sidebar navigation UI for mobile devicesDmitriy Zaporozhets2015-02-191-3/+3
| | |
| * | Remove overflow-y style that cause overflow-x strange behaviour on macDmitriy Zaporozhets2015-02-191-1/+0
| | |
| * | Improve commits page UIDmitriy Zaporozhets2015-02-192-4/+4
| | |
| * | Improve issue and merge request lists UIDmitriy Zaporozhets2015-02-195-103/+115
| | |
| * | Refactor commits cssDmitriy Zaporozhets2015-02-193-223/+212
| | |
| * | Improve commits UIDmitriy Zaporozhets2015-02-193-10/+27
| | |
* | | Update path helper referencesVinnie Okada2015-02-197-11/+11
| | | | | | | | | | | | | | | Use the path helpers for nested project resources, for Rails 4.1.9 compatibility.
* | | Merge branch 'master' into rails-4.1.9Vinnie Okada2015-02-1989-540/+760
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: app/views/dashboard/_project.html.haml app/views/events/event/_common.html.haml app/views/explore/projects/_project.html.haml app/views/groups/_projects.html.haml app/views/projects/_home_panel.html.haml app/views/projects/_issues_nav.html.haml app/views/projects/issues/_discussion.html.haml app/views/projects/issues/_issues.html.haml app/views/projects/issues/show.html.haml app/views/projects/merge_requests/_discussion.html.haml app/views/projects/merge_requests/_show.html.haml app/views/projects/milestones/index.html.haml app/views/projects/notes/_edit_form.html.haml app/views/shared/_issuable_filter.html.haml
| * | Fix active tab testsDmitriy Zaporozhets2015-02-192-1/+2
| | |
| * | Improve sidebar active stateDmitriy Zaporozhets2015-02-192-3/+6
| | |
| * | Sidebar items should be same height for collapsed and expanded versionDmitriy Zaporozhets2015-02-191-2/+2
| | |
| * | Fix collapsing of milestones and labels itemsDmitriy Zaporozhets2015-02-191-2/+4
| | |
| * | Fix tab highlightingDmitriy Zaporozhets2015-02-191-1/+1
| | |
| * | Prettify milestones pageDmitriy Zaporozhets2015-02-193-18/+11
| | |
| * | Restlye issueable filters to be more compactDmitriy Zaporozhets2015-02-194-119/+120
| | |
| * | Move labels/milestones tabs to side navigationDmitriy Zaporozhets2015-02-197-57/+42
| | |
| * | Update bootstrap-sass gemDmitriy Zaporozhets2015-02-195-14/+14
| | |
View Lorry Controller Status