Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Update show.html.haml to allow guests to see the Files tab as per ↵ | AJ ONeal | 2017-04-12 | 1 | -1/+1 |
| | | | | https://gitlab.com/gitlab-org/gitlab-ce/issues/30199 | ||||
* | Merge branch 'dm-outdated-diff-link' into 'master' | Sean McGivern | 2017-04-11 | 4 | -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-link | Douwe Maan | 2017-04-11 | 1 | -1/+1 |
| | | |||||
| * | Some code tweaks | Douwe Maan | 2017-04-08 | 2 | -2/+4 |
| | | |||||
| * | Fix views after rebase | Douwe Maan | 2017-04-08 | 1 | -1/+1 |
| | | |||||
| * | Fix specs and make tweaks | Douwe Maan | 2017-04-08 | 2 | -5/+6 |
| | | |||||
| * | Change discussion headline to 'a now outdated portion of the diff' | Douwe Maan | 2017-04-08 | 1 | -4/+3 |
| | | |||||
| * | Add link to diff header too | Douwe Maan | 2017-04-08 | 1 | -11/+6 |
| | | |||||
| * | Link to outdated diff in older MR version from outdated diff discussion | Douwe Maan | 2017-04-08 | 4 | -9/+14 |
| | | |||||
* | | Merge branch '30636-fix-blame-edit-blob-without-repo-permissions' into 'master' | Annabel Dunstone Gray | 2017-04-11 | 2 | -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-permissions | Eric Eastwood | 2017-04-10 | 2 | -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 Schatz | 2017-04-11 | 1 | -3/+16 |
|\ \ \ | | | | | | | | | | | | | | | | | Added keyboard shortcuts to signed out menu See merge request !10526 | ||||
| * | | | Added keyboard shortcuts to signed out menusigned-out-menu-shortcuts | Phil Hughes | 2017-04-10 | 1 | -3/+16 |
| | | | | |||||
* | | | | Merge branch 'mr-widget-bug-fix' into 'master' | Stan Hu | 2017-04-11 | 1 | -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 typo | Jose Ivan Vargas | 2017-04-10 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Fix typo on the class merge-when-pipeline_succeeds | Jose Ivan Vargas | 2017-04-10 | 1 | -1/+1 |
| | |/ / | |/| | | |||||
* | | | | Merge branch 'fix/gb/improve-container-registry-clipboard-links' into 'master' | Kamil Trzciński | 2017-04-11 | 2 | -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-links | Grzegorz Bizon | 2017-04-10 | 2 | -2/+2 |
| | |/ | |/| | |||||
* | | | Don't show 'Copy content' button on text files that are not rendered as text | Douwe Maan | 2017-04-10 | 7 | -35/+29 |
| | | | |||||
* | | | Merge branch 'document-polling-interval' into 'master' | Stan Hu | 2017-04-10 | 1 | -0/+1 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Document how polling interval multiplier is used Closes #30686 See merge request !10592 | ||||
| * | | | Document how polling interval is useddocument-polling-interval | Adam Niedzielski | 2017-04-10 | 1 | -0/+1 |
| | | | | |||||
* | | | | Merge branch 'file-view-container' into 'master' | Jacob Schatz | 2017-04-10 | 1 | -3/+3 |
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | Remove limited container on file view See merge request !10542 | ||||
| * | | | Remove limited container on file viewfile-view-container | Annabel Dunstone Gray | 2017-04-07 | 1 | -3/+3 |
| | | | | |||||
* | | | | Merge branch '30676-project-export-email' into 'master' | Sean McGivern | 2017-04-10 | 1 | -1/+1 |
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | Fix email not being sent after project export Closes #30676 See merge request !10578 | ||||
| * | | | Fix email not being sent after project export | mhasbini | 2017-04-09 | 1 | -1/+1 |
| | |/ | |/| | |||||
* | | | Merge branch 'remove_is_admin' into 'master' | Robert Speicher | 2017-04-09 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Remove the `User#is_admin?` method Closes #30584 See merge request !10520 | ||||
| * | | | Remove the User#is_admin? method | blackst0ne | 2017-04-09 | 1 | -1/+1 |
| |/ / | |||||
* | | | Add a name field to the group edit formadd-field-for-group-name | Douglas Lovell | 2017-04-09 | 1 | -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-discussion | Douwe Maan | 2017-04-07 | 6 | -3/+8 |
|\ \ | |||||
| * \ | Merge branch 'dm-remove-copy-link-on-blame-page' into 'master' | Douwe Maan | 2017-04-08 | 2 | -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-page | Douwe Maan | 2017-04-07 | 2 | -4/+4 |
| | | | |||||
| | * | Don't show Copy contents button on Blame page | Douwe Maan | 2017-04-07 | 2 | -3/+4 |
| | | | |||||
| * | | Put back usernames in activity and profile feed | Annabel Dunstone Gray | 2017-04-07 | 4 | -0/+4 |
| |/ | |||||
* | | Merge branch 'master' into new-resolvable-discussion | Luke "Jared" Bennett | 2017-04-07 | 16 | -7/+199 |
|\ \ | |/ | |||||
| * | Merge branch ↵ | Sean McGivern | 2017-04-07 | 3 | -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 failures | Kamil Trzcinski | 2017-04-07 | 2 | -2/+2 |
| | | | |||||
| | * | Simplify if | Kamil Trzcinski | 2017-04-07 | 1 | -1/+1 |
| | | | |||||
| | * | Update code to remove no longer needed changes | Kamil Trzcinski | 2017-04-07 | 1 | -6/+0 |
| | | | |||||
| | * | Update tests to cover trigger schedule | Kamil Trzcinski | 2017-04-07 | 1 | -11/+6 |
| | | | |||||
| | * | Fix ref reference | Kamil Trzcinski | 2017-04-07 | 2 | -21/+36 |
| | | | |||||
| | * | N/A to None. Revert validates from validates_presence_of. | Shinya Maeda | 2017-04-07 | 1 | -1/+1 |
| | | | |||||
| | * | Add def trigger_schedule in Trigger. Use persisted? for checling existance | Shinya Maeda | 2017-04-07 | 1 | -1/+1 |
| | | | |||||
| | * | Use allow_destroy. Remove condtion from form.haml. | Shinya Maeda | 2017-04-07 | 1 | -5/+2 |
| | | | |||||
| | * | Add form for scheduled trigger | Shinya Maeda | 2017-04-07 | 3 | -1/+30 |
| | | | |||||
| * | | Merge branch '18471-restrict-tag-pushes-protected-tags' into 'master' | Douwe Maan | 2017-04-07 | 13 | -7/+169 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Protected Tags Closes #18471 See merge request !10356 | ||||
| | * | | Show Flash message above Tags list18471-restrict-tag-pushes-protected-tags | Kushal Pandya | 2017-04-07 | 1 | -1/+3 |
| | | | | |||||
| | * | | Documentation for protected tags | James Edwards-Jones | 2017-04-07 | 1 | -3/+3 |
| | | | | |||||
| | * | | Merge branch 'master' into '18471-restrict-tag-pushes-protected-tags' | Kushal Pandya | 2017-04-06 | 46 | -171/+241 |
| | |\ \ | | | | | | | | | | | | | | | | # Conflicts: # spec/lib/gitlab/import_export/all_models.yml | ||||
| | * \ \ | Merge branch 'last-green-master' into 18471-restrict-tag-pushes-protected-tags | James Edwards-Jones | 2017-04-06 | 15 | -17/+95 |
| | |\ \ \ | |||||
| | * | | | | Fixes as per feedback | Kushal Pandya | 2017-04-06 | 1 | -1/+1 |
| | | | | | |