summaryrefslogtreecommitdiff
path: root/app/views
Commit message (Collapse)AuthorAgeFilesLines
* Update show.html.haml to allow guests to see the Files tab as per ↵AJ ONeal2017-04-121-1/+1
| | | | https://gitlab.com/gitlab-org/gitlab-ce/issues/30199
* Merge branch 'dm-outdated-diff-link' into 'master' Sean McGivern2017-04-114-14/+16
|\ | | | | | | | | | | | | Link to outdated diff in older MR version from outdated diff discussion Closes #27865 See merge request !10572
| * Statisfy Robertcop and Seancopdm-outdated-diff-linkDouwe Maan2017-04-111-1/+1
| |
| * Some code tweaksDouwe Maan2017-04-082-2/+4
| |
| * Fix views after rebaseDouwe Maan2017-04-081-1/+1
| |
| * Fix specs and make tweaksDouwe Maan2017-04-082-5/+6
| |
| * Change discussion headline to 'a now outdated portion of the diff'Douwe Maan2017-04-081-4/+3
| |
| * Add link to diff header tooDouwe Maan2017-04-081-11/+6
| |
| * Link to outdated diff in older MR version from outdated diff discussionDouwe Maan2017-04-084-9/+14
| |
* | Merge branch '30636-fix-blame-edit-blob-without-repo-permissions' into 'master' Annabel Dunstone Gray2017-04-112-7/+7
|\ \ | | | | | | | | | | | | | | | | | | Fix "Edit" button on blame page without repo permissions Closes #30636 See merge request !10598
| * | Fix edit button on blame page without repo perms30636-fix-blame-edit-blob-without-repo-permissionsEric Eastwood2017-04-102-7/+7
| | | | | | | | | | | | | | | | | | | | | Without repo permissions, pressing the "Edit" button on the blame page will now prompt to Fork/Cancel. Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/30636
* | | Merge branch 'signed-out-menu-shortcuts' into 'master' Jacob Schatz2017-04-111-3/+16
|\ \ \ | | | | | | | | | | | | | | | | Added keyboard shortcuts to signed out menu See merge request !10526
| * | | Added keyboard shortcuts to signed out menusigned-out-menu-shortcutsPhil Hughes2017-04-101-3/+16
| | | |
* | | | Merge branch 'mr-widget-bug-fix' into 'master' Stan Hu2017-04-111-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the MR widget that merged any MR when choosing the option "Merge when pipeline succeeds" from the dropdown Closes #29568 See merge request !10611
| * | | | Added tests and fixed a typoJose Ivan Vargas2017-04-101-1/+1
| | | | |
| * | | | Fix typo on the class merge-when-pipeline_succeedsJose Ivan Vargas2017-04-101-1/+1
| | |/ / | |/| |
* | | | Merge branch 'fix/gb/improve-container-registry-clipboard-links' into 'master' Kamil Trzciński2017-04-112-2/+2
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Fix container repository/tag location text copied into the clipboard Closes #30695 See merge request !10587
| * | | Add container registry repositories view specsfix/gb/improve-container-registry-clipboard-linksGrzegorz Bizon2017-04-102-2/+2
| | |/ | |/|
* | | Don't show 'Copy content' button on text files that are not rendered as textDouwe Maan2017-04-107-35/+29
| | |
* | | Merge branch 'document-polling-interval' into 'master' Stan Hu2017-04-101-0/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Document how polling interval multiplier is used Closes #30686 See merge request !10592
| * | | Document how polling interval is useddocument-polling-intervalAdam Niedzielski2017-04-101-0/+1
| | | |
* | | | Merge branch 'file-view-container' into 'master' Jacob Schatz2017-04-101-3/+3
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | Remove limited container on file view See merge request !10542
| * | | Remove limited container on file viewfile-view-containerAnnabel Dunstone Gray2017-04-071-3/+3
| | | |
* | | | Merge branch '30676-project-export-email' into 'master' Sean McGivern2017-04-101-1/+1
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | Fix email not being sent after project export Closes #30676 See merge request !10578
| * | | Fix email not being sent after project exportmhasbini2017-04-091-1/+1
| | |/ | |/|
* | | Merge branch 'remove_is_admin' into 'master' Robert Speicher2017-04-091-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Remove the `User#is_admin?` method Closes #30584 See merge request !10520
| * | | Remove the User#is_admin? methodblackst0ne2017-04-091-1/+1
| |/ /
* | | Add a name field to the group edit formadd-field-for-group-nameDouglas Lovell2017-04-091-7/+11
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enables user specification of group name vs. name inferred from group path. Cause new group form to copy name from path Adds some new page-specific javascript that copies entry from the group path field to the group name field when the group name field is initially empty. Remove duplicate group name entry field on group edit form This corrects the duplicated name entry field and tests that the JavaScript does not update the group name field if the user edits the group path. (Editing the group path is not recommended in any case, but it is possible.) Address eslint errors in group.js Enable group name copy with dispatch and explore group creation The dispatch and explore group creation forms require the group.js asset, and their tests now require testing against poltergeist Update workflow new group instruction Update the gitlab basics group creation document Add a change log entry Remove unused variable for eslint
* | Merge branch 'master' into new-resolvable-discussionDouwe Maan2017-04-076-3/+8
|\ \
| * \ Merge branch 'dm-remove-copy-link-on-blame-page' into 'master' Douwe Maan2017-04-082-3/+4
| |\ \ | | |/ | |/| | | | | | | Don't show Copy contents button on Blame page See merge request !10560
| | * Rename displaying_blame to blamedm-remove-copy-link-on-blame-pageDouwe Maan2017-04-072-4/+4
| | |
| | * Don't show Copy contents button on Blame pageDouwe Maan2017-04-072-3/+4
| | |
| * | Put back usernames in activity and profile feedAnnabel Dunstone Gray2017-04-074-0/+4
| |/
* | Merge branch 'master' into new-resolvable-discussionLuke "Jared" Bennett2017-04-0716-7/+199
|\ \ | |/
| * Merge branch ↵Sean McGivern2017-04-073-0/+30
| |\ | | | | | | | | | | | | | | | | | | | | | 'dosuken123/gitlab-ce-2989-run-cicd-pipelines-on-a-schedule-idea1-basic-backend-implementation-with-quick-ui' into 'master' Add "engineering" UI for Pipeline Schedule See merge request !10533
| | * Fix test failuresKamil Trzcinski2017-04-072-2/+2
| | |
| | * Simplify ifKamil Trzcinski2017-04-071-1/+1
| | |
| | * Update code to remove no longer needed changesKamil Trzcinski2017-04-071-6/+0
| | |
| | * Update tests to cover trigger scheduleKamil Trzcinski2017-04-071-11/+6
| | |
| | * Fix ref referenceKamil Trzcinski2017-04-072-21/+36
| | |
| | * N/A to None. Revert validates from validates_presence_of.Shinya Maeda2017-04-071-1/+1
| | |
| | * Add def trigger_schedule in Trigger. Use persisted? for checling existanceShinya Maeda2017-04-071-1/+1
| | |
| | * Use allow_destroy. Remove condtion from form.haml.Shinya Maeda2017-04-071-5/+2
| | |
| | * Add form for scheduled triggerShinya Maeda2017-04-073-1/+30
| | |
| * | Merge branch '18471-restrict-tag-pushes-protected-tags' into 'master' Douwe Maan2017-04-0713-7/+169
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Protected Tags Closes #18471 See merge request !10356
| | * | Show Flash message above Tags list18471-restrict-tag-pushes-protected-tagsKushal Pandya2017-04-071-1/+3
| | | |
| | * | Documentation for protected tagsJames Edwards-Jones2017-04-071-3/+3
| | | |
| | * | Merge branch 'master' into '18471-restrict-tag-pushes-protected-tags'Kushal Pandya2017-04-0646-171/+241
| | |\ \ | | | | | | | | | | | | | | | # Conflicts: # spec/lib/gitlab/import_export/all_models.yml
| | * \ \ Merge branch 'last-green-master' into 18471-restrict-tag-pushes-protected-tagsJames Edwards-Jones2017-04-0615-17/+95
| | |\ \ \
| | * | | | Fixes as per feedbackKushal Pandya2017-04-061-1/+1
| | | | | |