| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' into issue-title-vue | Regis | 2017-03-14 | 14 | -27/+32 |
| |\ | |||||
| | * | Merge branch 'issue-boards-new-search-bar' into 'master' | Filipa Lacerda | 2017-03-14 | 1 | -1/+3 |
| | |\ | | | | | | | | | | | | | | | | | | | Added filtered search bar to issue boards Closes #28312 See merge request !9757 | ||||
| | | * | Hides on mobile | Phil Hughes | 2017-03-08 | 1 | -1/+2 |
| | | | | |||||
| | | * | Added filtered search bar to issue boards | Phil Hughes | 2017-03-08 | 1 | -1/+2 |
| | | | | | | | | | | | | | Closes #28312 | ||||
| | * | | Merge branch 'nonewline-parser' into 'master' | Sean McGivern | 2017-03-14 | 2 | -3/+3 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Take nonewline context into account in diff parser Closes #28128 and #22636 See merge request !9705 | ||||
| | | * | | take nonewline context into account in diff parser | mhasbini | 2017-03-13 | 2 | -3/+3 |
| | | | | | |||||
| | * | | | Merge branch 'adam-count-badges-group-dashboard-milestones' into 'master' | Sean McGivern | 2017-03-14 | 1 | -5/+5 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add count badges to both dashboard and group milestones Closes #24421 See merge request !9836 | ||||
| | | * | | | Add count badges to both dashboard and group milestonesadam-count-badges-group-dashboard-milestones | Alex Braha Stoll | 2017-03-10 | 1 | -5/+5 |
| | | |/ / | |||||
| | * | | | Merge branch 'feature/custom-lfs' into 'master' | Douwe Maan | 2017-03-13 | 1 | -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 disabled | Christopher Bartz | 2017-03-13 | 1 | -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 Maan | 2017-03-13 | 1 | -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-tags | Adam Niedzielski | 2017-03-13 | 1 | -1/+3 |
| | | | | | | | |||||
| | * | | | | | Merge branch '19742-permalink-blame-button-line-number-hash-links' into ↵ | Alfredo Sumaran | 2017-03-13 | 1 | -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-links | Eric Eastwood | 2017-03-13 | 1 | -1/+1 |
| | | |/ / / / | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/19742 | ||||
| | * | | | | | Merge branch '25515-delegate-single-discussion-to-new-issue' into 'master' | Douwe Maan | 2017-03-13 | 3 | -2/+4 |
| | |\ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | Create a new issue for a single discussion See merge request !8266 | ||||
| | | * | | | | Rename variable | Bob Van Landuyt | 2017-03-13 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | merge_request_for_resolving_discussions -> merge_request_to_resolve_discussions_of | ||||
| | | * | | | | Pass the discussion to resolve after verifying captcha | Bob Van Landuyt | 2017-03-13 | 1 | -0/+1 |
| | | | | | | | |||||
| | | * | | | | Fit 'unresolved discussion widget together | Bob Van Landuyt | 2017-03-13 | 1 | -1/+1 |
| | | | | | | | |||||
| | | * | | | | Add a button to delegate all discussions in a merge request | Bob Van Landuyt | 2017-03-13 | 1 | -0/+1 |
| | | | |/ / | | |/| | | |||||
| | * | | | | Merge branch '24501-new-file-existing-branch' into 'master' | Sean McGivern | 2017-03-13 | 1 | -1/+1 |
| | |\ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | New file from interface on existing branch Closes #24501 See merge request !8427 | ||||
| | | * | | | New file from interface on existing branch | Jacopo | 2017-03-13 | 1 | -1/+1 |
| | | |/ / | | | | | | | | | | | | | | | | | | | | | 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 'fix_updated_field_in_atom_files' into 'master' | Rémy Coutable | 2017-03-13 | 1 | -1/+1 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix xml.updated field in rss/atom feeds Closes #19437 See merge request !9889 | ||||
| | | * | | | Fix xml.updated field in rss/atom feeds | blackst0ne | 2017-03-12 | 1 | -1/+1 |
| | | |/ / | |||||
| | * | | | Merge branch '29189-discussion-button' into 'master' | Filipa Lacerda | 2017-03-13 | 1 | -10/+9 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix alignment of resolve discussion button Closes #29189 See merge request !9865 | ||||
| | | * | | | Fix alignment of resolve discussion button29189-discussion-button | Annabel Dunstone Gray | 2017-03-10 | 1 | -10/+9 |
| | | |/ / | |||||
| | * | | | Merge branch 'mrchrisw-update-deploy-key' into 'master' | Filipa Lacerda | 2017-03-13 | 1 | -1/+1 |
| | |\ \ \ | | |/ / | |/| | | | | | | | | | | Fix inconsistent deploy key documentation in UI See merge request !9817 | ||||
| | | * | | Fix inconsistent deploy key documentation in UImrchrisw-update-deploy-key | Chris Wilson | 2017-03-08 | 1 | -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 | ||||
| * | | | | module exports - remove gl dep from VueRealtimeListener | Regis | 2017-03-09 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Merge branch 'master' into issue-title-vue | Regis | 2017-03-09 | 17 | -27/+79 |
| |\ \ \ \ | |/ / / | |||||
| | * | | | Check was in wrong part, the avatar container class should always be added ↵ | Phil Hughes | 2017-03-09 | 1 | -3/+2 |
| | | | | | | | | | | | | | | | | | on lines in the changes tab | ||||
| | * | | | Fixed bugs with diff comment avatars | Phil Hughes | 2017-03-09 | 2 | -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 '29185-environments-folder-links' into 'master' | Annabel Dunstone Gray | 2017-03-08 | 3 | -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-links | Filipa Lacerda | 2017-03-08 | 3 | -5/+4 |
| | | | | | | | | | | | | | | | | | as the ones in index table | ||||
| | * | | | Added discussion comments avatars to diff | Phil Hughes | 2017-03-08 | 3 | -17/+28 |
| | | | | | |||||
| | * | | | Merge branch 'dm-remove-double-project-nav-bar' into 'master' | Robert Speicher | 2017-03-08 | 2 | -1/+1 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't show double nav bar on project page when activity is the default project view Closes #29096 See merge request !9798 | ||||
| | | * | | | Don't show double nav bar on project page when activity is the default ↵dm-remove-double-project-nav-bar | Douwe Maan | 2017-03-07 | 2 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | project view | ||||
| | * | | | | Merge branch '26188-tag-creation-404-for-guests' into 'master' | Rémy Coutable | 2017-03-08 | 1 | -2/+3 |
| | |\ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | Don't show links to tag a commit for non permitted users Closes #26188 See merge request !8407 | ||||
| | | * | | | Don't show links to tag a commit for non permitted users | Mark Fletcher | 2017-03-07 | 1 | -2/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | * Show tag link for users that can push code * Don't show tag link for guests and non-authenticated users | ||||
| | * | | | | Fixed some typos inside the _project.html.haml partial | Jose Ivan Vargas | 2017-03-07 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Removed the settings gear button inside the Project to a tab | Jose Ivan Vargas | 2017-03-07 | 7 | -0/+40 |
| | | |_|/ | |/| | | |||||
| | * | | | Merge branch 'master' into orderable-issues | Douwe Maan | 2017-03-07 | 26 | -100/+198 |
| | |\ \ \ | | | |/ | | |/| | |||||
| | * | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into orderable-issues | Valery Sizov | 2017-03-07 | 13 | -67/+76 |
| | |\ \ \ | |||||
| | * \ \ \ | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into orderable-issues | Valery Sizov | 2017-03-06 | 15 | -14/+20 |
| | |\ \ \ \ | |||||
| | * | | | | | Fixed issue when dragging a issue to the bottom when count element is visible | Phil Hughes | 2017-03-06 | 1 | -1/+2 |
| | | | | | | | |||||
| | * | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into orderable-issues | Valery Sizov | 2017-03-03 | 39 | -254/+197 |
| | |\ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into orderable-issues | Valery Sizov | 2017-02-28 | 4 | -97/+8 |
| | |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into orderable-issues | Valery Sizov | 2017-02-27 | 7 | -19/+16 |
| | |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into orderable-issues | Valery Sizov | 2017-02-24 | 14 | -40/+48 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Frontend updates to positioning the issue in lists | Phil Hughes | 2017-02-17 | 1 | -1/+1 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Merge branch 'master' into issue-title-vue | Regis | 2017-03-07 | 17 | -77/+107 |
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | | | |||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |