summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Adds ability to remove the forked relationshipHan Loong Liauw2015-10-135-2/+32
| | | | | | | This was previously possible through the API but can now be done through the project#edit settings screen if the current user is the owner of the project. Update changelog
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceStan Hu2015-10-1215-12/+35
|\
| * Merge branch 'reset_service_password' into 'master' Dmitriy Zaporozhets2015-10-123-0/+23
| |\ | | | | | | | | | | | | | | | | | | Invalidate stored service password if the endpoint URL is changed See merge request !1558
| | * Invalidate stored service password if the endpoint URL is changedreset_service_passwordValery Sizov2015-10-123-0/+23
| | |
| * | Merge branch 'spellcheck_false' into 'master' Dmitriy Zaporozhets2015-10-1212-12/+12
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Add spellcheck=false to certain input fields https://dev.gitlab.org/gitlab/gitlabhq/issues/2563 See merge request !1559
| | * | Add spellcheck=false to certain input fieldsspellcheck_falseValery Sizov2015-10-1212-12/+12
| | |/
* | | Make group deleted text consistent with group created and updated textsteuneboon2015-10-121-1/+1
| | |
* | | Fix typo(missing quote) when deleting groupsteuneboon2015-10-121-1/+1
|/ /
* | Merge branch 'master' into 'master' Robert Speicher2015-10-101-7/+7
|\ \ | | | | | | | | | | | | | | | | | | Persist filters when sorting on user admin page Closes #2806 See merge request !1543
| * | Persist filters when sorting on user admin pageJerry Lukins2015-10-101-7/+7
| | |
* | | Merge branch 'fix-remove-button-alignment' into 'master' Dmitriy Zaporozhets2015-10-101-2/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In SSH key detailed view, align the "Remove" button with the right container Also fixes a bootlint warning. Before: ![image](https://gitlab.com/stanhu/gitlab-ce/uploads/d6d8765ed9dceb6a31a6b4475b2166e1/image.png) After: ![image](https://gitlab.com/stanhu/gitlab-ce/uploads/8252211125ace212335aa6bf2ba78549/image.png) See merge request !1555
| * | | In SSH key detailed view, align the "Remove" button with the right containerStan Hu2015-10-091-2/+3
| | | |
* | | | Merge branch 'make-diff-css-better-for-mobile' into 'master' Dmitriy Zaporozhets2015-10-103-45/+89
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make diff file view easier to use on mobile screens Viewing diffs on a mobile screen is a bit of an awkward experience at the moment. Here are a few issues (by no means complete): ## Before ### Tabs are scrunched ![image](https://gitlab.com/stanhu/gitlab-ce/uploads/45924e36cfb107dc56795a7dcdfbc5b5/image.png) ### Filenames take too much room, buttons cluttered ![image](https://gitlab.com/stanhu/gitlab-ce/uploads/a5e5611271fe26dfd3922aa0b8780458/image.png) ## After This MR makes a few tweaks to make this a bit better. It just addresses a few issues, but there is plenty of room for improvement (e.g. shrink fonts, etc.): ### Eliminate padding to make tabs fit ![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/fbcf128d1f221b9b9e53df274238dc62/image.png) ### Make filenames, buttons more readable This screenshot allows the filename to use the whole row, omits the file mode changes, and puts the buttons centered in the view: ![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/d2e5b9424f058827ba2552056c516e18/image.png) Towards a better mobile experience: #2787 See merge request !1449
| * | | Make diff file view easier to use on mobile screensStan Hu2015-10-093-45/+89
| | | |
* | | | Merge branch 'fix-issue-filter-dropdown-labels' into 'master' Dmitriy Zaporozhets2015-10-096-6/+16
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Restore placeholders in issue filters from "Any" to "Milestone" and "Label" 1f11096c included new filters but made it hard to determine which dropdown did what. This patch restores the original placeholders. ### Before ![image](https://gitlab.com/stanhu/gitlab-ce/uploads/2326b836e364275341ea0ad8c0a0926b/image.png) ### After ![image](https://gitlab.com/stanhu/gitlab-ce/uploads/b0e519f9cf8d1a3c0f054286e3b809cb/image.png) See merge request !1554
| * | | Restore placeholders in issue filters from "Any" to "Milestone" and "Label"Stan Hu2015-10-086-6/+16
| |/ / | | | | | | | | | | | | 1f11096c included new filters but made it hard to determine which dropdown did what. This patch restores the original placeholders.
* | | Merge branch 'rs-mr-tab-loader' into 'master' Douwe Maan2015-10-091-5/+8
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make the loading spinner toggle more explicit Occasionally the loading spinner would stay visible after the tab finished loading. This change makes the toggle explicit so that it's always shown on `beforeSend`, and always hidden on `complete`. Plus a bonus semi-colon eradication! :boom: See merge request !1553
| * | | Make the loading spinner toggle more explicitrs-mr-tab-loaderRobert Speicher2015-10-081-5/+8
| |/ / | | | | | | | | | | | | | | | | | | | | | Occasionally the loading spinner would stay visible after the tab finished loading. This change makes the toggle explicit so that it's always shown on `beforeSend`, and always hidden on `complete`. Plus a bonus semi-colon eradication! :boom:
* | | Merge branch 'improve_empty_fork' into 'master' Dmitriy Zaporozhets2015-10-091-29/+34
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show message if user tries to fork and has no available namespaces This merge request improves the UX when users try to fork a project and have no eligible namespaces. ### Current behavior ![Screen_Shot_2015-09-25_at_1.39.45_PM](https://gitlab.com/dblessing/gitlab-ce/uploads/45a303703a0197e78f7f9bdbea8718b5/Screen_Shot_2015-09-25_at_1.39.45_PM.png) ### Proposed behavior ![Screen_Shot_2015-09-25_at_1.38.57_PM](https://gitlab.com/dblessing/gitlab-ce/uploads/613c53bcfb52d79fdf8bd1d09410c152/Screen_Shot_2015-09-25_at_1.38.57_PM.png) ### Things to check I'm not exactly loving the wording I have here. I'm open to improvements. See merge request !1441
| * | | Show message if user tries to fork and has no available namespacesDrew Blessing2015-10-081-29/+34
| |/ /
* | | fixed positioning of hamburger menu on headerHan Loong Liauw2015-10-092-2/+6
|/ / | | | | | | | | - Changed to margin for vertical allign as used in bootstrap 3 original - Also added an `active` state to show when the extra items are enabled
* | Merge remote-tracking branch 'public/project-find-with-namespace-performance'Dmitriy Zaporozhets2015-10-082-7/+41
|\ \ | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | Revamp finding projects by namespacesYorick Peterse2015-10-082-8/+14
| | | | | | | | | | | | | | | | | | | | | By using a JOIN we can remove the need for using 2 separate queries to find a project by its namespace. Combined with an index (only needed for PostgreSQL) this reduces the query time from ~245 ms (~520 ms for the first call) down to roughly 10 ms (~15 ms for the first call).
| * | Added concern for case-insensitive WHERE queriesYorick Peterse2015-10-071-0/+28
| | | | | | | | | | | | | | | | | | On PostgreSQL these queries use LOWER(...) to compare columns and values. For MySQL a regular WHERE is performed as MySQL is already case-insensitive.
* | | Merge remote-tracking branch 'public/trending-projects-performance'Dmitriy Zaporozhets2015-10-082-9/+16
|\ \ \
| * | | Revamp trending projects queryYorick Peterse2015-10-062-9/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This changes the query to use a COUNT nested in an INNER JOIN, instead of a COUNT plus a GROUP BY. There are two reasons for this: 1. Using a COUNT in an INNER JOIN can be quite a bit faster. 2. The use of a GROUP BY means that method calls such as "any?" (and everything else that calls "count") operate on a Hash that counts the amount of notes on a per project basis, instead of just counting the total amount of projects. The query has been moved into Project.trending as its logic is simple enough. As a result of this testing the TrendingProjectsFinder class simply involves testing if the right methods are called, removing the need for setting up database records.
| * | | Use >= instead of > in TrendingProjectsFinderYorick Peterse2015-10-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | By using >= we can ensure we actually get all comments of the past month, instead of the comments of the past month minus the first day in the range.
* | | | Merge branch 'implement-new-gitlab-colors' into 'master' Dmitriy Zaporozhets2015-10-085-127/+146
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add new GitLab colors After this merge request all css must use variables for colours. ![7Od6vP7usJ__1_](https://gitlab.com/gitlab-org/gitlab-ce/uploads/01dd327770f25c76448a5860a76e34c9/7Od6vP7usJ__1_.png) cc @skyruler See merge request !1542
| * | | Improve help/ui pageDmitriy Zaporozhets2015-10-081-3/+48
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Add new GitLab colorsDmitriy Zaporozhets2015-10-085-124/+98
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Merge branch 'XenGi/gitlab-ce-master'Stan Hu2015-10-081-0/+1
|\ \ \ \ | |/ / / |/| | |
| * | | hooks: Add full project namespace to payloadRicardo Band2015-10-021-0/+1
| | | | | | | | | | | | | | | | | | | | Payload of "project_member, :create" and "project_member, :destroy" now also have a field project_path_with_namespace.
* | | | Merge branch 'fix-build-highlight' into 'master' Dmitriy Zaporozhets2015-10-082-2/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix build highlight Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> cc @ayufan See merge request !1539
| * | | | Fix build highlightDmitriy Zaporozhets2015-10-082-2/+1
| | |_|/ | |/| | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Check originalEvent.repeat *and* event.repeatrs-quick-submitRobert Speicher2015-10-071-1/+1
| | | | | | | | | | | | | | | | | | | | phantomjs < 2.0 doesn't support creating `KeyboardEvent` so the tests were failing on CI
* | | | Check originalEvent.repeatRobert Speicher2015-10-071-1/+1
| | | |
* | | | Quick Submit all the things!Robert Speicher2015-10-079-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds quick submit behavior to the forms for: - Blobs ("new file") - Commit messages - Issuables - Notes - Labels - Milestones - Wikis
* | | | Remove "quick submit" behavior specific to the Notes JSRobert Speicher2015-10-071-7/+0
| | | |
* | | | Add "Quick Submit" JS behaviorRobert Speicher2015-10-071-0/+29
| | | |
* | | | Require jquery.turbolinks in all JS specsRobert Speicher2015-10-071-2/+1
|/ / / | | | | | | | | | Side-effect: This simplifies the requiresInput handler
* | | Merge branch 'stanhu/gitlab-ce-improve-label-milestones-filter'Dmitriy Zaporozhets2015-10-074-10/+29
|\ \ \
| * | | Support filtering by "Any" milestone or issue and fix "No Milestone" and "No ↵Stan Hu2015-10-074-10/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Label" filters Closes #2619 Closes https://github.com/gitlabhq/gitlabhq/issues/9631
* | | | Merge branch 'cleanup-ci-pages' into 'master' Dmitriy Zaporozhets2015-10-0723-298/+130
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cleanup CI pages - [x] Remove `ci/projects/:id` page - [x] Remove Continuous integration from project menu - [x] Remove unused css/js - [x] Remove Ci::Commit and Ci::Build controllers - [x] Move CI services to project settings area cc @ayufan Part of #2594 See merge request !1529
| * | | | Fix tests and few CI featuresDmitriy Zaporozhets2015-10-073-2/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Move CI services to project settings areaDmitriy Zaporozhets2015-10-077-72/+54
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Remove Ci::Commit and Ci::Build controllerscleanup-ci-pagesDmitriy Zaporozhets2015-10-077-89/+43
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Remove unused JSDmitriy Zaporozhets2015-10-072-42/+0
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Remove test for removed page and add menu highlight for build pageDmitriy Zaporozhets2015-10-071-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Remove Continuous Integration from project menuDmitriy Zaporozhets2015-10-076-77/+13
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Move no runners alert to project ci settingsDmitriy Zaporozhets2015-10-073-3/+4
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>