summaryrefslogtreecommitdiff
path: root/app/views
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | Add count badges to both dashboard and group milestonesadam-count-badges-group-dashboard-milestonesAlex Braha Stoll2017-03-104-20/+14
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Fix 'ExecJS disabled' error on issues index 28743-actionview-template-error-execjs-disabled-_issuable_meta_dataJames Edwards-Jones2017-03-141-1/+1
| | | | | | | | | | | | | | | | | | | | | Occurred in production when an issue had an associated MR
* | | | | | | Merge branch 'feature/custom-lfs' into 'master' Douwe Maan2017-03-131-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not show LFS object when LFS is disabled Closes #28817 See merge request !9779
| * | | | | | | Do not show LFS object when LFS is disabledChristopher Bartz2017-03-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not display a 404, when a user tries to retrieve the raw content of an LFS file (pointer) if the config option "lfs_enabled" is set to false. Instead, display the LFS pointer file directly.
* | | | | | | | Merge branch 'handle-failure-when-deleting-tags' into 'master' Douwe Maan2017-03-131-1/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Display error message when deleting tag in web UI fails See merge request !9906
| * | | | | | | | Display error message when deleting tag in web UI failshandle-failure-when-deleting-tagsAdam Niedzielski2017-03-131-1/+3
| | | | | | | | |
* | | | | | | | | Merge branch '19742-permalink-blame-button-line-number-hash-links' into ↵Alfredo Sumaran2017-03-131-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Update permalink/blame buttons with line number fragment hash Closes #19742 See merge request !9461
| * | | | | | | | | Update permalink/blame buttons with line number fragment hash19742-permalink-blame-button-line-number-hash-linksEric Eastwood2017-03-131-1/+1
| | |_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/19742
* | | | | | | | | Merge branch '25515-delegate-single-discussion-to-new-issue' into 'master' Douwe Maan2017-03-138-14/+38
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Create a new issue for a single discussion See merge request !8266
| * | | | | | | | Rename variableBob Van Landuyt2017-03-135-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | merge_request_for_resolving_discussions -> merge_request_to_resolve_discussions_of
| * | | | | | | | Pass the discussion to resolve after verifying captchaBob Van Landuyt2017-03-131-0/+1
| | | | | | | | |
| * | | | | | | | Show correct message when user cannot resolve discussionsBob Van Landuyt2017-03-131-2/+5
| | | | | | | | |
| * | | | | | | | Replace the warning with an info iconBob Van Landuyt2017-03-131-1/+1
| | | | | | | | |
| * | | | | | | | Fit 'unresolved discussion widget togetherBob Van Landuyt2017-03-131-1/+1
| | | | | | | | |
| * | | | | | | | Build link to discussions to resolve in a helperBob Van Landuyt2017-03-131-3/+2
| | | | | | | | |
| * | | | | | | | Update copyBob Van Landuyt2017-03-131-2/+2
| | | | | | | | |
| * | | | | | | | Update copy for warning on new issue formBob Van Landuyt2017-03-131-6/+5
| | | | | | | | |
| * | | | | | | | Add a button to delegate all discussions in a merge requestBob Van Landuyt2017-03-132-0/+7
| | | | | | | | |
| * | | | | | | | Always require MR-iid for resolving discussionsBob Van Landuyt2017-03-133-20/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | And deduplicate the finding of MR's & discussions. Now the searching is done in the service, istead of the controller & the API.
| * | | | | | | | Delegate a single discussion to a new issueBob Van Landuyt2017-03-134-3/+28
| | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Delegate a discussion in a merge request into a new issue. The discussion wil be marked as resolved and a system note will be added linking to the newly created issue.
* | | | | | | | Merge branch '24501-new-file-existing-branch' into 'master'Sean McGivern2017-03-135-2/+28
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New file from interface on existing branch Closes #24501 See merge request !8427
| * | | | | | | New file from interface on existing branchJacopo2017-03-135-2/+28
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now you can create a new file and select a target_branch != source_branch. If the file that you want to create already exists on the target branch an error message is shown A glDropdown is used to select and create a new branch instead of a text field.
* | | | | | | Merge branch '27114-add-undo-to-todos-in-the-done-tab' into 'master' Sean McGivern2017-03-131-0/+5
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add 'Undo' to Todos in the Done tab Closes #27114 See merge request !8782
| * | | | | | Add 'Undo' to Todos in the Done tabJacopo2017-03-101-0/+5
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Added the ability to 'Undo' the todos marked complete in the 'Done' tab of the Todo dashboard. Added the ability to 'Undo mark all as done' todos marked complete with 'Mark all as done' in the 'Todo' tab of the Todo dashboard.
* | | | | | Merge branch 'refactor/global-permissions-for-internal-users' into 'master' Sean McGivern2017-03-131-1/+3
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | Refactor/global permissions for internal users See merge request !9598
| * | | | | mark internal users in the admin panelhttp://jneen.net/2017-03-091-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | and don't offer to impersonate them
* | | | | | Merge branch 'fix_updated_field_in_atom_files' into 'master' Rémy Coutable2017-03-135-5/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix xml.updated field in rss/atom feeds Closes #19437 See merge request !9889
| * | | | | | Fix xml.updated field in rss/atom feedsblackst0ne2017-03-125-5/+5
| | |_|/ / / | |/| | | |
* | | | | | Merge branch '29189-discussion-button' into 'master' Filipa Lacerda2017-03-131-10/+9
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix alignment of resolve discussion button Closes #29189 See merge request !9865
| * | | | | | Fix alignment of resolve discussion button29189-discussion-buttonAnnabel Dunstone Gray2017-03-101-10/+9
| |/ / / / /
* | | | | | Merge branch 'mrchrisw-update-deploy-key' into 'master' Filipa Lacerda2017-03-131-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | Fix inconsistent deploy key documentation in UI See merge request !9817
| * | | | | Fix inconsistent deploy key documentation in UImrchrisw-update-deploy-keyChris Wilson2017-03-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Deploy keys were added with write access to https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7383 - We still state " Deploy keys allow read-only access to your repository." in the UI. This updates the deploy key UI information to reflect the docs https://docs.gitlab.com/ce/ssh/README.html#deploy-keys
* | | | | | Change label for name on sign up form29209-sign-up-form-nametauriedavis2017-03-091-1/+1
| |_|_|/ / |/| | | |
* | | | | Merge branch 'convert-data-attr-search-bar' into 'master' Alfredo Sumaran2017-03-091-17/+17
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | Convert data attributes in search_bar.html.haml Closes #29082 See merge request !9819
| * | | | Convert data attributes in search_bar.html.hamlClement Ho2017-03-091-17/+17
| | | | |
* | | | | Order milestone issues by position ascending in apiGeorge Andrinopoulos2017-03-091-1/+1
|/ / / /
* | | | Merge branch '29048-user-wrap-firefox' into 'master' Clement Ho2017-03-091-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove inline-block styling from dropdown avatars Closes #29048 See merge request !9840
| * | | | Remove inline-block styling from dropdown avatars29048-user-wrap-firefoxAnnabel Dunstone Gray2017-03-091-2/+2
| | |/ / | |/| |
* | | | Merge branch '29014-create-issue-form-buttons-misaligned-on-mobile' into ↵Filipa Lacerda2017-03-091-13/+14
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' [#29014] Create issue form buttons are misaligned on mobile Closes #29014 See merge request !9706
| * | | | [#29014] Create issue form buttons are misaligned on mobileTM Lee2017-03-091-13/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Ensure Save/Create button is aligned with Cancel - Move the cancel button above but float to the right using pull-right - Allows responsive css to flow
* | | | | Check was in wrong part, the avatar container class should always be added ↵Phil Hughes2017-03-091-3/+2
| | | | | | | | | | | | | | | | | | | | on lines in the changes tab
* | | | | Fixed bugs with diff comment avatarsPhil Hughes2017-03-092-4/+5
| |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The comment button on commit view was way out to the left side because the element that renders the diff avatars was rendering when it shouldnt be When commenting on a discussion on the discussions tab it would try to render the avatar & in some cases work correctly even though it shouldnt be possible for this to happen. Changed the if statement to take this into account Closes #29237, #29238, #29243
* | | | Merge branch 'move-u2f-bundle' into 'master' Alfredo Sumaran2017-03-092-3/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Move u2f javascript library to webpack config See merge request !9755
| * | | | move u2f library to webpackmove-u2f-bundleMike Greiling2017-03-072-3/+2
| | | | |
* | | | | Fix wrong message on starred projects filteringGeorge Andrinopoulos2017-03-091-1/+1
| |/ / / |/| | |
* | | | Remove hidden text from subscribe buttonAnnabel Dunstone Gray2017-03-081-3/+1
| |/ / |/| |
* | | Merge branch '29185-environments-folder-links' into 'master' Annabel Dunstone Gray2017-03-083-5/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Style action buttons in show environments view to match index view Closes #29185 See merge request !9804
| * | | Apply same html and css to the action buttons in environment show view table ↵29185-environments-folder-linksFilipa Lacerda2017-03-083-5/+4
| | | | | | | | | | | | | | | | as the ones in index table
* | | | Added discussion comments avatars to diffPhil Hughes2017-03-085-18/+30
| | | |
* | | | Merge branch 'dm-remove-double-project-nav-bar' into 'master' Robert Speicher2017-03-082-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't show double nav bar on project page when activity is the default project view Closes #29096 See merge request !9798
View Lorry Controller Status