summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'cycle-analytics-commit-icon' into 'master' Annabel Dunstone Gray2017-03-161-6/+4
|\ | | | | | | | | | | | | Fixed commit icon size in cycle analyitcs Closes #29536 See merge request !9994
| * Fixed commit icon size in cycle analyitcscycle-analytics-commit-iconPhil Hughes2017-03-161-6/+4
| | | | | | | | Closes #29536
* | Merge branch '29228-update-award-emoji-native-unicode-alignment' into 'master' Annabel Dunstone Gray2017-03-161-6/+10
|\ \ | | | | | | | | | | | | | | | | | | Update award emoji button native emoji alignment Closes #29228 See merge request !9985
| * | Update award emoji button native emoji alignment29228-update-award-emoji-native-unicode-alignmentEric Eastwood2017-03-161-6/+10
| | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/29228
* | | Merge branch 'fixed-issue-boards-modal-not-searching' into 'master' Filipa Lacerda2017-03-161-1/+1
|\ \ \ | | | | | | | | | | | | | | | | Fixed search not working in issue boards modal See merge request !10010
| * | | Fixed search not working in issue boards modalfixed-issue-boards-modal-not-searchingPhil Hughes2017-03-161-1/+1
| | | |
* | | | Merge branch '29534-todos-performance' into 'master' Sean McGivern2017-03-161-2/+1
|\ \ \ \ | |/ / / |/| | | | | | | | | | | Improve TODOs performance See merge request !10004
| * | | Include routes when loading user projectsJarka Kadlecova2017-03-161-2/+1
| | | |
* | | | Merge branch '28991-viewing-old-wiki-page-version-edit-button-exists' into ↵29565-name-of-the-uncompressed-folder-of-a-tag-archive-changedRémy Coutable2017-03-162-1/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' [#28991] Resolve "Viewing old wiki page version, "Edit" button exists, brings up latest markup" Closes #28991 See merge request !9966
| * | | | [#28991] Wiki page edit button only appears on the current commit pageTM Lee2017-03-162-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Added method to check if the current Page version is the current latest version - Conditionally checks for current version when showing Edit button - Added feature specs for viewing project wiki page and expect edit button - Added Changelog
* | | | | Merge branch '27376-cache-default-branch-pipeline-on-project' into 'master' Yorick Peterse2017-03-168-8/+136
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Speed up several project lists See merge request !9903
| * | | | | Build project cache key in a helper27376-cache-default-branch-pipeline-on-projectBob Van Landuyt2017-03-163-2/+12
| | | | | |
| * | | | | Eager load route & namespace in `Explore::ProjectsController`Bob Van Landuyt2017-03-161-3/+11
| | | | | |
| * | | | | Update the cache key to only include what is requiredBob Van Landuyt2017-03-161-2/+2
| | | | | |
| * | | | | Don't try to load status when there is no commitBob Van Landuyt2017-03-161-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This could happen when the repository is missing. In which case cache needs to be cleared
| * | | | | Eager load route for project & namespaceBob Van Landuyt2017-03-161-1/+1
| | | | | |
| * | | | | Render cached pipeline status on project dashboardBob Van Landuyt2017-03-163-3/+21
| | | | | |
| * | | | | Update the pipeline cache when updating a pipeline-statusBob Van Landuyt2017-03-161-0/+6
| | | | | |
| * | | | | Add a wrapper for pipeline statusesBob Van Landuyt2017-03-161-0/+84
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reads status from redis & stores it in redis if it was missing. If the project has no HEAD, the cache is deleted
* | | | | | Merge branch 'fix_visibility_level' into 'master' Sean McGivern2017-03-161-1/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix visibility level on new project page Closes #19253 See merge request !9885
| * | | | | | Use digblackst0ne2017-03-141-1/+1
| | | | | | |
| * | | | | | Fix specsblackst0ne2017-03-121-2/+2
| | | | | | |
| * | | | | | Merge remote-tracking branch 'upstream/master' into fix_visibility_levelblackst0ne2017-03-1134-538/+581
| |\ \ \ \ \ \
| * | | | | | | Fix visibility level on new project pageblackst0ne2017-03-111-1/+2
| | | | | | | |
* | | | | | | | Issue milestone remaining time tooltipMichael2017-03-161-4/+5
| | | | | | | |
* | | | | | | | Merge branch '27114-add-undo-mark-all-as-done-to-todos' into 'master' Filipa Lacerda2017-03-165-40/+72
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add 'Undo mark all as done' to Todos Closes #27114 See merge request !9890
| * | | | | | | Add 'Undo mark all as done' to TodosJacopo2017-03-165-40/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added the ability to 'Undo mark all as done' todos marked as complete with 'Mark all as done' in the 'Todo' tab of the Todo dashboard. The operation undos only the todo previously marked as done with the 'Mark al as done' button.
* | | | | | | | Merge branch 'duplicate-pagination-group-explore' into 'master' Filipa Lacerda2017-03-161-2/+0
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed duplicate pagination on explore#groups Closes #29531 See merge request !9988
| * | | | | | | | Fixed duplicate pagination on explore#groupsduplicate-pagination-group-explorePhil Hughes2017-03-161-2/+0
| | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | Closes #29531
* | | | | | | | Merge branch 'issue-boards-modal-filter-bar' into 'master' Filipa Lacerda2017-03-1619-352/+132
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | Added filter bar into add issues modal See merge request !9856
| * | | | | | | Fixed eslintissue-boards-modal-filter-barPhil Hughes2017-03-162-18/+18
| | | | | | | |
| * | | | | | | Moved reduce function to a utilPhil Hughes2017-03-166-45/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed issue with modal window including main search bars tokens
| * | | | | | | Updated specs to check that the token is correctly addedPhil Hughes2017-03-161-2/+1
| | | | | | | |
| * | | | | | | Fixed search specsPhil Hughes2017-03-162-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clean up the events when the modal window is closed
| * | | | | | | Fixed eslint errorsPhil Hughes2017-03-1610-38/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated modal filter spec
| * | | | | | | Created a container class for filtered searchPhil Hughes2017-03-169-28/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This class returns the correct container the filtered search should be run in At the moment it doesn't allow for multiple to be used at once, need to look at a way to fix this [ci skip]
| * | | | | | | Added filter bar into add issues modalPhil Hughes2017-03-1613-309/+60
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | Merge branch 'fix-project-without-repo-and-wiki' into 'master' Rémy Coutable2017-03-161-2/+3
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix projects without repo and wiki Closes #29542 See merge request !9956
| * | | | | | Fix projects without repo and wikiLin Jen-Shin2017-03-151-2/+3
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When repo and wiki are disabled for a project, we're showing issues so we'll need to set @issuable_meta_data otherwise it would be giving nil errors. See: https://sentry.gitlap.com/gitlab/staginggitlabcom/issues/23106/
* | | | | | Merge branch 'pipeline-tooltips-overflow' into 'master' Filipa Lacerda2017-03-161-0/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed pipeline action tooltips being cut off Closes #29314 See merge request !9960
| * | | | | | Fixed pipeline action tooltips being cut offpipeline-tooltips-overflowPhil Hughes2017-03-151-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed the container for the tooltip to be the body so that the tooltip does not get cut off with the overflow area. This change affects both merge request pipelines table & the pipelines page Closes #29314
* | | | | | | Adds pipeline mini-graph to system information box in Commit ViewFilipa Lacerda2017-03-164-8/+47
| | | | | | |
* | | | | | | Merge branch 'group-gear-setting-dropdown-to-tab' into 'master' Douwe Maan2017-03-165-20/+21
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moved the gear settings dropdown in the group view to a tab Closes #23304 See merge request !9882
| * | | | | | | Changed "Edit Group" subtab to "General" and moved itgroup-gear-setting-dropdown-to-tabJose Ivan Vargas2017-03-152-11/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to the first option inside said subtab. Also code cleanup
| * | | | | | | Fixed some missing permission conditionsJose Ivan Vargas2017-03-142-11/+12
| | | | | | | |
| * | | | | | | Fixed haml_lint warning for the settings_head partialJose Ivan Vargas2017-03-142-2/+1
| | | | | | | |
| * | | | | | | Moved the gear settings dropdown in the group view to a tabJose Ivan Vargas2017-03-145-19/+24
| | | | | | | |
* | | | | | | | Merge branch '8836-mr-revert' into 'master' Robert Speicher2017-03-154-13/+6
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Merge branch 'option-to-be-notified-of-own-activity' into 'master' See merge request !9974
| * | | | | | | | Revert "Merge branch 'option-to-be-notified-of-own-activity' into 'master'Stan Hu2017-03-154-13/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 5e9666880376b3f53edb95cba77b5642d3cc1810, reversing changes made to b35378a938e22f745b6c6ea32b53cb50f9b6c627.
* | | | | | | | | Merge branch 'add_quick_submit_for_snippet_forms' into 'master' Clement Ho2017-03-151-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add quick submit for snippet forms Closes #27534 See merge request !9911