summaryrefslogtreecommitdiff
path: root/app/views/projects
Commit message (Collapse)AuthorAgeFilesLines
* Fixed issue with dropdown buttonscommit-headerPhil Hughes2016-06-171-1/+1
|
* Use line-height instead of height.Jacob Schatz2016-06-171-1/+1
|
* Merge branch 'tree-file-title' into 'master' Jacob Schatz2016-06-162-5/+6
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | Added title attribute to entries in tree view ## What does this MR do? Adds a title attribute to entries in the tree view. Moe useful when files have long names. ## What are the relevant issue numbers? Closes #18353 See merge request !4709
| * Added title attribute to enties in tree viewtree-file-titlePhil Hughes2016-06-162-5/+6
| | | | | | | | Closes #18353
* | Merge branch 'merge-request-default-source-branch-text' into 'master' Jacob Schatz2016-06-161-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added source branch text to dropdown toggle ## What does this MR do? Previously, the dropdown toggle would default to "Select source branch", this changes that so that it defaults to the branch name and if that doesn't exist, it defaults to "Select source branch" ## Screenshots (if relevant) ![Screen_Shot_2016-06-07_at_12.20.10](/uploads/40d31e21297a99300050cf9f23bd7371/Screen_Shot_2016-06-07_at_12.20.10.png) See merge request !4504
| * | Added source branch text to dropdown togglePhil Hughes2016-06-161-1/+1
| |/ | | | | | | | | | | Previously, the dropdown toggle would default to "Select source branch", this changes that so that it defaults to the branch name and if that doesn't exist, it defaults to "Select source branch"
* | Merge branch 'dz-fix-mr-widget-padding' into 'master' Jacob Schatz2016-06-161-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | Add bottom padding for merge request command line text Because without bottom padding text is too close to the UI tabs - hard to navigate See merge request !4681
| * | Add bottom padding for merge request command line textdz-fix-mr-widget-paddingDmitriy Zaporozhets2016-06-151-1/+1
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge branch 'mr-download-dropdown-alignment' into 'master' Jacob Schatz2016-06-161-2/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed alignment of download dropdown ## What does this MR do? Correctly aligns the download dropdown on merge requests ## Screenshots (if relevant) ![Screen_Shot_2016-06-14_at_14.47.06](/uploads/9381f25110e5573e56aa5c3f46786df5/Screen_Shot_2016-06-14_at_14.47.06.png) See merge request !4646
| * | | Fixed alignment of download dropdownmr-download-dropdown-alignmentPhil Hughes2016-06-141-2/+2
| | | |
* | | | Merge branch 'push-event-banner-container' into 'master' Jacob Schatz2016-06-161-11/+11
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed last push event banner not being in container ## What does this MR do? Adds the last push event content into a container with the correct class. ## What are the relevant issue numbers? Closes #18567 ## Screenshots (if relevant) ![Screen_Shot_2016-06-14_at_13.17.41](/uploads/4afa3d2c73e59c5ffbd53869e49baa92/Screen_Shot_2016-06-14_at_13.17.41.png) See merge request !4644
| * | | | Fixed last push event banner not being in containerpush-event-banner-containerPhil Hughes2016-06-141-11/+11
| |/ / / | | | | | | | | | | | | Closes #18567
* | | | Merge branch 'template_dropdown' into 'master' Jacob Schatz2016-06-161-6/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implements TemplateDropdown class to create custom template dropdowns ## What does this MR do? Refactorize template dropdowns. This MR creates a base TemplateSelector class so it can be reused for multiple types of templates. ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - [ ] Tests - [ ] Added for this feature/bug - [x] All builds are passing - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !4697
| * | | | Implements TemplateDropdown class to create custom template dropdownstemplate_dropdownAlfredo Sumaran2016-06-161-6/+4
| | |_|/ | |/| | | | | | | | | | | | | | Also License dropdown has been ported to use our GL dropdown instead of Select2. Fixes tests to make it work with current implementation
* | | | Merge branch 'build-scroll-controls-on-complete' into 'master' Jacob Schatz2016-06-161-5/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Shows build scroll buttons after build is complete ## What does this MR do? Shows the build scroll buttons whenever there is a build trace. Previously they were only shown when the build was active. ## What are the relevant issue numbers? Closes #18515 ## Screenshots (if relevant) ![Screen_Shot_2016-06-13_at_11.42.42](/uploads/6e0577f46a0cc7b4f2f13b17c85d97da/Screen_Shot_2016-06-13_at_11.42.42.png) See merge request !4621
| * | | | Shows build scroll buttons after build is completebuild-scroll-controls-on-completePhil Hughes2016-06-131-5/+5
| | | | | | | | | | | | | | | | | | | | Closes #18515
* | | | | Merge branch 'backport-view-condition-improvement-from-ee-460' into 'master' Douwe Maan2016-06-161-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix permission checks in member row (backport from gitlab-org/gitlab-ee!460) ## What does this MR do? It improves the check we use to display or not the members' access and controls in the members list. ## Are there points in the code the reviewer needs to double check? No, I replaced an helper with just a permission check so I think it's a better solution. ## Why was this MR needed? There were a spec failure in gitlab-org/gitlab-ee!460 because of the refactor done in the "request access" MR. ## What are the relevant issue numbers? None. ## Does this MR meet the acceptance criteria? - No CHANGELOG needed - [x] Tests - [x] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !4670
| * | | | Fix wrong partial path in JS viewRémy Coutable2016-06-151-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | Merge branch 'toggle-whitespace-button-for-compare-page' into 'master' Jacob Schatz2016-06-151-0/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Toggle whitespace button for compare page ## What does this MR do? Adds whitespace button to compare branches page. ## Are there points in the code the reviewer needs to double check? Ruby code. ## Why was this MR needed? Compare branches UX ## What are the relevant issue numbers? Closes #17881. ## Screenshots (if relevant) ![Screen_Shot_2016-06-09_at_18.39.48](/uploads/8995a7bc8bea7fa3ff19446ebe49fb88/Screen_Shot_2016-06-09_at_18.39.48.png) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - [ ] Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !4569
| * | | | | added whitespace toggle to diffs page and set it to return the project ↵Luke "Jared" Bennett2016-06-101-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | compare path with the selected whitespace params Updated CHANGELOG Moved CHANGELOG entry
* | | | | | Merge branch 'network-assets' into 'master' Jacob Schatz2016-06-151-10/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace raphael-rails with raphael.js and split it from the rest of the JS ## What does this MR do? Removes raphael.js and its related libraries from the default JS bundle. It also removes raphael-rails because the gem is unmaintained and – for whatever reason – didn't want to cooperate with the way I was trying to require it. This brings the default (compressed and minified) application.js from 354KB after the d3 MR (!4394) down to 324KB. ## Are there points in the code the reviewer needs to double check? That tests pass and that there aren't errors on any pages (especially the Network page). ## Why was this MR needed? It's only used on the Network page and was using way too much bandwidth for just one page. ## What are the relevant issue numbers? #14372 #13165 Follow-up to !4394 and !4516. cc: @jschatz1 See merge request !4519
| * | | | | | Fix failing test.Connor Shea2016-06-101-1/+1
| | | | | | |
| * | | | | | Replace raphael-rails with raphael.js so it can be split from the rest of ↵Connor Shea2016-06-101-10/+2
| |/ / / / / | | | | | | | | | | | | | | | | | | the JavaScript. The gem isn't maintained anymore anyway. Added a network folder with an application.js including raphael components, since that's the only page using it currently.
* | | | | | Merge branch 'milestone-date-clear' into 'master' Jacob Schatz2016-06-151-7/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due date can be removed from milestones ## What does this MR do? Adds a button to milestone form to allow user to remove due date ## What are the relevant issue numbers? Closes #15063 ## Screenshots (if relevant) ![Screen_Shot_2016-06-02_at_08.32.03](/uploads/8bd4446abde745dd5b1e140a887ec694/Screen_Shot_2016-06-02_at_08.32.03.png) See merge request !4428
| * | | | | | Due date can be removed from milestonesPhil Hughes2016-06-101-7/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #15063
* | | | | | | Merge branch '17804-pipeline-download-text' into 'master' Jacob Schatz2016-06-151-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | #17804 Pipeline download artifacts text ## What does this MR do? Improves wording to the pipeline artifacts download dropdown items. ## Are there points in the code the reviewer needs to double check? I couldn't test this very easily, any tips? ## Why was this MR needed? UX. ## What are the relevant issue numbers? Closes #17804. ## Screenshots (if relevant) See merge request !4391
| * | | | | | | Pipeline artifacts download button wording improvedLuke "Jared" Bennett2016-06-101-1/+1
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated CHANGELOG Removed CHANGELOG entry
* | | | | | | Merge branch 'commits-ui' into 'master' Jacob Schatz2016-06-154-33/+28
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated commits UI Closes #14633 See merge request !4271
| * | | | | | | Vertical alignment of buttons in commit rowPhil Hughes2016-06-081-1/+1
| | | | | | | |
| * | | | | | | Added short commit ID to mobilePhil Hughes2016-06-081-0/+3
| | | | | | | |
| * | | | | | | Sends correct parameter to commit_author_link for avatarPhil Hughes2016-06-081-1/+1
| | | | | | | |
| * | | | | | | Improved spacing on mobilePhil Hughes2016-06-081-2/+4
| | | | | | | |
| * | | | | | | Updated testsPhil Hughes2016-06-081-1/+1
| | | | | | | |
| * | | | | | | Updated some commit UI colorsPhil Hughes2016-06-081-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed issue with tree view styles
| * | | | | | | Updated commits UIPhil Hughes2016-06-084-31/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #14633
* | | | | | | | Merge branch 'issue_18575' into 'master' Jacob Schatz2016-06-151-4/+4
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve usability for prioritized labels ## What does this MR do? - Adds an icon next to prioritized label rows serving as a hint to the user that the labels can be sorted by dragging them. - Adds description about prioritized labels. - Restores empty message when removing all prioritized labels. ## Screenshots (if relevant) ![labels](/uploads/1da16c4c54a894fa45ccc47e3a5bdf7a/labels.gif) Closes #18575 See merge request !4652
| * | | | | | | | Add handler icon to prioritized labelsissue_18575Alfredo Sumaran2016-06-151-4/+4
| | | | | | | | |
* | | | | | | | | Move group creation text to below the 'Project owner' field.Connor Shea2016-06-151-5/+5
| | | | | | | | |
* | | | | | | | | Improve New Project page for mobile.Connor Shea2016-06-151-13/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Separate the New Project page's "Project path" grouped fields into separate fields. Fixes #18599.
* | | | | | | | | Merge branch 'mr-buttons-update' into 'master' Jacob Schatz2016-06-152-40/+23
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed issue with MR buttons being in a group ## What does this MR do? Fixes design issue with the buttons in the merge request widget ## Screenshots (if relevant) ![Screen_Shot_2016-06-09_at_14.13.32](/uploads/44ac4175f5a97a8d7baf97be6eebc684/Screen_Shot_2016-06-09_at_14.13.32.png) See merge request !4562
| * | | | | | | | | Fixed issue with MR buttons being in a groupmr-buttons-updatePhil Hughes2016-06-132-40/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also removed some inline code
* | | | | | | | | | Merge branch 'docker-registry-manifest-v1' into 'master' Rémy Coutable2016-06-151-4/+12
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for Docker Registry manifest v1 ## What does this MR do? Adds support for Manifest V1 generated by older versions of Docker (before 1.10). ## What are the relevant issue numbers? Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/18609 See merge request !4669
| * | | | | | | | | | Show created_at in table columndocker-registry-manifest-v1Kamil Trzcinski2016-06-151-5/+5
| | | | | | | | | | |
| * | | | | | | | | | Add support for Docker Registry manifest v1Kamil Trzcinski2016-06-151-3/+11
| | |_|_|_|_|/ / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'tooltip-change' into 'master' Jacob Schatz2016-06-151-1/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update project star/unstar tooltip ## What does this MR do? Fixes project toggle star button tooltip to show actual tooltip for its state. ## Are there points in the code the reviewer needs to double check? No. ## Why was this MR needed? - When you star a project tooltip wasn't changing. - When you star a project and refresh the page, tooltip was still showing `Star Project` ## What are the relevant issue numbers? Fixes #18143 ## Screenshots (if relevant) ### Before ![Screen_Shot_2016-06-15_at_15.31.57](/uploads/e005951c23eeed7c2761a0ec1911f3ce/Screen_Shot_2016-06-15_at_15.31.57.png) ### After ![tooltip-change](/uploads/4caec99eac6ffcc7331947fdfdb9e051/tooltip-change.gif) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - [ ] Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !4672
| * | | | | | | | | Fix project star tooltip in to show actual message.Fatih Acet2016-06-151-1/+1
| |/ / / / / / / /
* | | | | | | | | Merge branch 'stanhu/gitlab-ce-fix-error-500-false-binary-negative'Douwe Maan2016-06-152-0/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix Error 500 when viewing a blob with binary characters after the 1024-byte ↵Stan Hu2016-06-122-0/+3
| | |_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mark Here was the problem: 1. When determining whether a given blob is viewable text, gitlab_git reads the first 1024 bytes and checks with Linguist whether it is a text or binary file. 2. If the blob is text, GitLab will attempt to display it. 3. However, if the text has binary characters after the first 1024 bytes, then GitLab will attempt to load the entire contents, but the encoding will be ASCII-8BIT since there are binary characters. 4. The Error 500 results when GitLab attempts to display a mix UTF-8 and ASCII-8BIT. To fix this, we load as much data as we are willing to display so that the detection will work properly. Requires an update to gitlab_git: gitlab-org/gitlab_git!86 Closes #13826
* | | | | | | | | Merge branch 'list-items' into 'master' Jacob Schatz2016-06-153-6/+6
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove div between ul and li ## What does this MR do? Adds `container_class`to `ul` instead of `div` for valid HTML ## What are the relevant issue numbers? https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4592#note_12420843 See merge request !4633
| * | | | | | | | | Remove div between ul and lilist-itemsAnnabel Dunstone2016-06-133-6/+6
| | |_|_|_|_|_|/ / | |/| | | | | | |