summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #8442 from Hexide/dev-email-template-datesDmitriy Zaporozhets2014-12-281-1/+3
|\ | | | | Add commit dates to repository-push email tempalte
| * Add commit dates to repository-push email tempalteMiz2014-12-111-1/+3
| |
* | Merge pull request #7957 from cirosantilli/rm-unused-project-codeDmitriy Zaporozhets2014-12-281-5/+0
|\ \ | | | | | | Remove unused Project#code function [failure unrelated]
| * | Remove unused Project#code function.Ciro Santilli2014-10-041-5/+0
| | |
* | | Merge pull request #8439 from glasspelican/TeamcityDmitriy Zaporozhets2014-12-283-2/+120
|\ \ \ | | | | | | | | Teamcity integration using 8.1 rest api
| * | | Teamcity interaction using 8.1 rest apiJason Lippert2014-12-233-2/+120
| | | |
* | | | Merge branch 'ui-fixes' into 'master'Dmitriy Zaporozhets2014-12-283-7/+13
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ui fixes Fixes the ui bugs described in #925. Also added the suggestion to keep the header at the top of the page. Fixes #925 Some before/after screenshots: - Border doesn't reach bottom on smaller pages - [Before](https://gitlab.com/uploads/gitlab-org/gitlab-ce/5096094d94/Screenshot_from_2014-12-27_19_49_24.png) - [After](https://gitlab.com/uploads/gitlab-org/gitlab-ce/551c1924e4/Screenshot_from_2014-12-27_19_51_43.png) - Ability to always scroll 48px (visible by the scrollbar) - [Before](https://gitlab.com/uploads/gitlab-org/gitlab-ce/ea591bf7b3/Screenshot_from_2014-12-27_19_53_41.png) - [After](https://gitlab.com/uploads/gitlab-org/gitlab-ce/97df62b40d/Screenshot_from_2014-12-27_19_53_17.png) - Mobile sidebar icons off screen (Visible by the scrollbar on the after picture) - [Before](https://gitlab.com/uploads/gitlab-org/gitlab-ce/b6d9a4d076/Screenshot_from_2014-12-27_19_49_05.png) - [After](https://gitlab.com/uploads/gitlab-org/gitlab-ce/fc52ac31ba/Screenshot_from_2014-12-27_19_48_16.png) - Header fixed at top - [Before](https://gitlab.com/uploads/gitlab-org/gitlab-ce/5d74dc1ea5/Screenshot_from_2014-12-27_19_59_28.png) - [After](https://gitlab.com/uploads/gitlab-org/gitlab-ce/57c4c3ea7d/Screenshot_from_2014-12-27_20_00_05.png) See merge request !269
| * | | | Changed header to stay at the top of the page.Stephan van Leeuwen2014-12-273-3/+7
| | | | |
| * | | | Updated mobile sidebar to allow scrollingStephan van Leeuwen2014-12-261-2/+4
| | | | |
| * | | | Updated sidebar style to span the whole height.Stephan van Leeuwen2014-12-261-2/+2
| | | | |
* | | | | Improve UI for group milestone and project milestone pagesDmitriy Zaporozhets2014-12-272-75/+71
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Show assigned issues/mr be default on dashboardDmitriy Zaporozhets2014-12-263-40/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was default before but now it fixed with providing assignee_id parameter making url shareble and dont reset when other filters users. Also this commit removes old methods that are not used any more. Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Fix no-ssh message for non logged in userDmitriy Zaporozhets2014-12-261-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | set z-index for navbar and sidebar explicitlyDmitriy Zaporozhets2014-12-262-2/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Fix links for no-ssh messageDmitriy Zaporozhets2014-12-261-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Fix UI for no-ssh-key messageDmitriy Zaporozhets2014-12-265-38/+10
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Make nprogress color to redDmitriy Zaporozhets2014-12-261-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Put nprogress spinner to bottom left positionDmitriy Zaporozhets2014-12-261-0/+6
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Fix nav_link support for several path optionsDmitriy Zaporozhets2014-12-252-20/+35
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Merge branch 'master' into oauth2_providerDmitriy Zaporozhets2014-12-2521-219/+365
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: app/views/layouts/nav/_profile.html.haml
| * | | | Align sidebar navigation differentlyDmitriy Zaporozhets2014-12-251-2/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Fix testsDmitriy Zaporozhets2014-12-251-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Small UI imporovement for merge request accept widget and projects pageDmitriy Zaporozhets2014-12-252-6/+7
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Merge branch 'master' into ui-improvementsDmitriy Zaporozhets2014-12-258-63/+162
| |\ \ \ \
| | * | | | Fold sidebar for mobile devices and expand for desktopDmitriy Zaporozhets2014-12-257-42/+94
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | | | fold-subnav class for folded sidebar navigation. Dashboard and project nav ↵Dmitriy Zaporozhets2014-12-244-22/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | adopted Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | Improve issue/mr page for tabletsDmitriy Zaporozhets2014-12-253-11/+13
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | Set of UI changes mostly for issue and merge requestDmitriy Zaporozhets2014-12-2511-140/+179
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * return edit/close buttons to old position (right of title) * make 'Issue #1' header smaller * move mr commits to separate tab * change inline/side diff switcher to buttons from tabs * make issue sidebar start with dicsussion block Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Fix layout if broadcast message enabledDmitriy Zaporozhets2014-12-241-0/+4
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Fix tests and add message if no oauth appsDmitriy Zaporozhets2014-12-252-16/+20
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Rework oauth2 featureDmitriy Zaporozhets2014-12-2513-73/+113
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * improve UI * add authorization * add separate page for oauth applications Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Improve code styleDmitriy Zaporozhets2014-12-253-11/+18
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | convert erb to hamlValery Sizov2014-12-244-57/+37
| | | | |
* | | | | Doorkeeper integrationValery Sizov2014-12-2421-1/+351
|/ / / /
* | | | Merge branch 'project-path' into 'master'Dmitriy Zaporozhets2014-12-247-42/+42
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Project path Fixes gitlab/gitlabhq#1781, gitlab/gitlabhq#1763 See merge request !1337
| * | | | For API compatibility still generate path from name if only name providedDmitriy Zaporozhets2014-12-221-1/+8
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Allow Group path to be changed at the same time as nameDmitriy Zaporozhets2014-12-222-11/+7
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Set group name from path in admin controllerDmitriy Zaporozhets2014-12-221-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Set group path during creationDmitriy Zaporozhets2014-12-224-6/+18
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Set project path & name in one field without transforamtionDmitriy Zaporozhets2014-12-222-24/+9
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Merge branch 'sidebar-nav' into 'master'Dmitriy Zaporozhets2014-12-2481-1134/+887
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sidebar navigation This MR changes layout of the GitLab to sidebar navigation. Layouts: - [x] Project layout - [x] Project settings layout - [x] Dashboard layout - [x] Profile layout - [x] Group layout - [x] Snippets layout - [x] Admin layout Pages: - [x] Activity pages - [x] Issue/mr pages - [x] Issues/merge requests pages Common: - [x] Fix tests See merge request !1329
| * | | | Fix diff commentsDmitriy Zaporozhets2014-12-241-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Fix scroll problems and disable authorized_only filterDmitriy Zaporozhets2014-12-243-6/+5
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Improvements to issues/mr filters:Dmitriy Zaporozhets2014-12-242-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * use filter_params variable when set filter values * fix project issues spinach tests Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Refactor issuable list pagesDmitriy Zaporozhets2014-12-245-28/+33
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Refactor issues and merge requests listsDmitriy Zaporozhets2014-12-2320-210/+140
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | One column issue/mr lists for projectDmitriy Zaporozhets2014-12-236-114/+59
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Show issuable context labels as blocksDmitriy Zaporozhets2014-12-232-4/+4
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Render MR diff full size of screenDmitriy Zaporozhets2014-12-224-38/+46
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Fix issueable context update and fix testsDmitriy Zaporozhets2014-12-226-8/+8
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>