summaryrefslogtreecommitdiff
path: root/app/views
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'calendar-tooltips' into 'master' Rémy Coutable2017-03-281-2/+2
|\ | | | | | | | | | | | | Add tooltip to user's calendar activities Closes #28925 See merge request !10123
| * Add tooltip to user's calendar activitiesalex argunov2017-03-221-2/+2
| |
* | Fixed labels icon being hidden in collapsed issuable sidebarPhil Hughes2017-03-281-1/+1
| |
* | Merge branch 'user-callout-refactor' into 'master' Filipa Lacerda2017-03-283-3/+19
|\ \ | | | | | | | | | | | | | | | | | | Refactored the user callout class Closes #29955 See merge request !10213
| * | Refactored the user callout classPhil Hughes2017-03-243-3/+19
| | | | | | | | | | | | | | | | | | | | | | | | Instead of the JS being in charge of the HTML, the HAML now handles it. The HAML can then check the cookie & show it needed. It also allows the HAML access to the paths so we don't have to pass that through. Closes #29955
* | | Fix sub-nav highlighting for `Environments` and `Jobs` pagesKushal Pandya2017-03-271-2/+2
| | |
* | | Merge branch 'rename_done_to_closed' into 'master' Sean McGivern2017-03-272-3/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Change Done column to Closed in issue boards Closes #29420 See merge request !10198
| * | | Change Done column to Closed in issue boardsblackst0ne2017-03-242-3/+3
| | | |
* | | | Merge branch 'sh-bring-back-option-to-be-notified-of-own-activity' into ↵Robert Speicher2017-03-271-0/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Bring back option to be notified of own activity See merge request !10032
| * \ \ \ Merge branch 'master' into sh-bring-back-option-to-be-notified-of-own-activityStan Hu2017-03-2461-172/+191
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into sh-bring-back-option-to-be-notified-of-own-activityStan Hu2017-03-2010-118/+45
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into sh-bring-back-option-to-be-notified-of-own-activityStan Hu2017-03-174-16/+6
| |\ \ \ \ \ \
| * | | | | | | Revert "Merge branch '8836-mr-revert' into 'master'Stan Hu2017-03-161-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 68e40bd49fde7b790bb31b9ac85a249bedd817d2, reversing changes made to 2d1f823b4c8b60cee525384cb52e547d2be8925a.
* | | | | | | | Merge branch '28187-project-name-cut-off-with-nested-groups' into 'master' Filipa Lacerda2017-03-272-7/+10
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Project name cut off with nested groups" Closes #28187 and #28179 See merge request !10065
| * | | | | | | | Activate group name toggle based on horizontal spaceSam Rose2017-03-252-7/+10
| | | | | | | | |
* | | | | | | | | Merge branch 'sh-remove-tags-from-explore' into 'master' Sean McGivern2017-03-271-21/+0
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove Tags filter from Projects Explore dropdown Closes #28992 See merge request !10242
| * | | | | | | | | Remove Tags filter from Projects Explore dropdownStan Hu2017-03-261-21/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Problems: 1. It's huge. 2. It's loaded on page load, which makes the page take 13 seconds. 3. It has a terrible UX. Closes #28992
* | | | | | | | | | Merge branch '29116-maxint-error' into 'master' Rémy Coutable2017-03-261-1/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix projects_limit RangeError on user create Closes #29116 See merge request !10209
| * | | | | | | | | Fix projects_limit RangeError on user createAlexander Randa2017-03-241-1/+1
| | | | | | | | | |
* | | | | | | | | | Merge branch '28634-todos-margin' into 'master' Alfredo Sumaran2017-03-241-2/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove extra margin at bottom of todos page Closes #28634 See merge request !10222
| * | | | | | | | | Remove extra margin at bottom of todos pageAnnabel Dunstone Gray2017-03-241-2/+1
| | | | | | | | | |
* | | | | | | | | | Adding non_archived scope for counting projectsNaveen Kumar2017-03-241-1/+1
| | | | | | | | | |
* | | | | | | | | | Resolve "Gitlab administrator cannot create projects in every group"George Andrinopoulos2017-03-241-1/+1
| | | | | | | | | |
* | | | | | | | | | Merge branch 'projects-list-line-breaks' into 'master' Annabel Dunstone Gray2017-03-242-31/+31
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes project list lines breaking Closes #29018 See merge request !10178
| * | | | | | | | | Fixes project list lines breakingPhil Hughes2017-03-232-31/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will only hapen in certain situations ie. when the star count is a lot. We were previously fixing it by hard coding a max-width. This changes it to use flexbox which allows the content to decide when it should be truncated. The rows don't always need truncating, so we shouldn't hard code a width. Closes #29018
* | | | | | | | | | Merge branch '29880-refactor-sidebar-hacks' into 'master' Annabel Dunstone Gray2017-03-246-6/+7
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Move sub_nav content above the content-wrapper class" Closes #29880 See merge request !10163
| * | | | | | | | | | adjust the affix breakpoint to match css top valueMike Greiling2017-03-223-3/+3
| | | | | | | | | | |
| * | | | | | | | | | remove jobs page hack to make subnav 100% widthMike Greiling2017-03-223-3/+4
| | | | | | | | | | |
| * | | | | | | | | | remove unnecessary string interpolationMike Greiling2017-03-221-1/+1
| | | | | | | | | | |
* | | | | | | | | | | Merge branch '29964-sidebar-js' into 'master' Filipa Lacerda2017-03-242-0/+6
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add sidebar class to build & wiki pages Closes #29964 See merge request !10196
| * | | | | | | | | | | Add sidebar class to build & wiki pagesAnnabel Dunstone Gray2017-03-232-0/+6
| | |_|/ / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'tc-pipeline-show-trigger-date' into 'master' Kamil Trzciński2017-03-241-4/+6
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Correctly show pipeline creator & created_at Closes #29255 See merge request !9936
| * | | | | | | | | | Move user_link to generic UsersHelperToon Claes2017-03-231-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make the user_link helper more generic to be used for objects other than pipelines.
| * | | | | | | | | | Add helpers for pipeline user link & user avatarToon Claes2017-03-221-2/+2
| | | | | | | | | | |
| * | | | | | | | | | Show pipeline creator & created_at in headingToon Claes2017-03-221-4/+6
| | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of showing the commit author & authored_date that triggered the pipeline, show the user and created_at in the heading of the pipeline show.
* | | | | | | | | | Merge branch 'refactor-templates-js' into 'master' Alfredo Sumaran2017-03-243-8/+5
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor template selector JavaScript See merge request !9792
| * | | | | | | | | | Lightly refactor js files related to file template selectors.Bryce Johnson2017-03-223-8/+5
| |/ / / / / / / / /
* | | | | | | | | | Merge branch '27574-pipelines-empty-state' into 'master' Alfredo Sumaran2017-03-244-47/+16
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pipelines empty state Closes #27574 See merge request !9978
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' into 27574-pipelines-empty-stateFilipa Lacerda2017-03-2135-150/+77
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (65 commits) Merge branch 'render-json-leak' into 'security' Merge branch 'ssrf' into 'security' Merge branch 'ssrf' into 'security' Merge branch 'fix-links-target-blank' into 'security' Merge branch '28058-hide-emails-in-atom-feeds' into 'security' Fix karma test Reset filters after click Handle Route#name being nil after an update Only add frontend code coverage instrumentation when generating coverage report fix recompile assets step in 9.0 upgrade guide to use yarn Undo explicit conversion to Integer Make level_value accept string integers Make feature spec more robust Removed d3.js from the main application.js bundle Update css to be nice and tidy. add an index to the ghost column Improve rename projects migration Add additional check for when inputContainer does not exist Make the v3_to_v4.md more consistent Fix input token spacing ...
| * | | | | | | | | | | Fix haml_lint errorFilipa Lacerda2017-03-201-1/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Adds tests to new empty and error statesFilipa Lacerda2017-03-202-4/+4
| | | | | | | | | | | |
| * | | | | | | | | | | Merge branch 'master' into 27574-pipelines-empty-stateFilipa Lacerda2017-03-174-16/+6
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (23 commits) Resolve "Extract logic of who should receive notification into separate classes" Remove UJS actions from pipelines tables Added Gitlab::Database.config Fix time-sensitive helper spec Updates realtime documentation for the Frontend Add ability to disable Merge Request URL on push Added labels to the issue web hook documentation blurb in issue template Add a new have_html_escaped_body_text that match an HTML-escaped text Stop CI notification showing when status is nil Refactor award emojis document Do not use Ruby Timeout module in GitLab QA Make sure alias email would never match: Make the test less time sensitive by extending 0.2 Restore sub-nav for empty project Fix Unicode 1.1 emojis Use "branch_name" instead "branch" on V3 branch creation API Fixed eslint Catches errors when generating lists Resolve GitLab QA cold boot problems on entry page ...
| * | | | | | | | | | | Merge branch 'master' into 27574-pipelines-empty-state27574-pipelines-empty-stateFilipa Lacerda2017-03-1755-218/+251
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (209 commits) Fix Slack link when on notify Use Enumerable#index_by where possible Protect against unknown emojis in frequently used list Fix config option to disable Prometheus Fix double click token name fix describe block to make the karma reporter happy removes n+1 query from tags and branches indexes Fix broken links limit lines to 80 chars Add prometheus memory requirements, include additional detail on disabling prometheus in docs. Add `requirements: { id: %r{[^/]+} }` for all projects and groups namespaced API routes Expand on the good changelog/bad changelog documentation examples Add policy for closing stale merge requests Fix spec Use code icon for Raw Fix spec Add copy button to blob header and use icon for Raw button Fix archive prefix bug for refs containing dots Include routes when loading user projects Fixed search not working in issue boards modal Document a New Branch feature for Bare Projects ...
| * | | | | | | | | | | Moves tabs into Vue ComponentFilipa Lacerda2017-03-151-50/+17
| | | | | | | | | | | |
| * | | | | | | | | | | Adds empty state for pipelines tableFilipa Lacerda2017-03-132-0/+2
| | | | | | | | | | | |
* | | | | | | | | | | | Add dropdown sort to project milestonesGeorge Andrinopoulos2017-03-243-2/+25
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch ↵Rémy Coutable2017-03-231-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '28772-remove-source-branch-button-sometimes-appears-even-if-remove-branch-checkbox-is-checked' into 'master' Resolve "`Remove source branch` button sometimes appears even if `remove branch` checkbox is checked" Closes #28772 See merge request !9948
| * | | | | | | | | | | | Check remove source branch when merge is in progressSam Rose2017-03-221-1/+2
| | | | | | | | | | | | |
* | | | | | | | | | | | | Add tooltip and accessibility label for profile cover buttonsKushal Pandya2017-03-231-2/+2
| | | | | | | | | | | | |
* | | | | | | | | | | | | Fix usercallout to only show on the current logged in user profileJose Ivan Vargas Lopez2017-03-231-1/+2
| |_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | |