summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Version 8.2.0.rc2v8.2.0.rc2Robert Speicher2015-11-201-1/+1
|
* Merge branch 'workhorse-version' into 'master' Jacob Vosmaer2015-11-204-5/+4
| | | | | | | Bump GitLab Workhorse version to 0.4.2 See merge request !1830
* Merge branch 'lfs-batch-download-to-stable' into '8-2-stable' Dmitriy Zaporozhets2015-11-203-283/+419
|\ | | | | | | | | | | | | Lfs batch download to stable !1842 for stable See merge request !1853
| * Error 501 when client is using deprecated API.lfs-batch-download-to-stableMarin Jankovski2015-11-203-195/+49
| |
| * Fix upload tests, reformat code and make rubocop happyKamil Trzcinski2015-11-202-122/+110
| |
| * Part of tests done [ci skip]Kamil Trzcinski2015-11-202-104/+338
| |
| * Add support for batch download operationKamil Trzcinski2015-11-203-36/+96
| |
* | Merge branch 'lfs_on_by_default_and_backup' into '8-2-stable' Dmitriy Zaporozhets2015-11-207-9/+47
|\ \ | |/ |/| | | | | | | | | Lfs on by default and backup See merge request !1852
| * Add lfs to backup specs.Marin Jankovski2015-11-201-5/+9
| |
| * Backup LFS objects same as any upload.Marin Jankovski2015-11-204-2/+36
| |
| * Lfs on by default.Marin Jankovski2015-11-202-2/+2
| |
* | Merge branch 'notes_fix_to_stable' into '8-2-stable' Valery Sizov2015-11-204-4/+6
|\ \ | | | | | | | | | | | | | | | | | | Fix for Emoji (to stable) See merge request !1850
| * | Fix for EmojiValery Sizov2015-11-204-4/+6
| |/
* | Merge branch 'merge-1790-to-8-2-stable' into '8-2-stable' Yorick Peterse2015-11-2031-215/+700
|\ \ | | | | | | See merge request !1851
| * | Merge branch 'atom-feed-latest-update' into 'master' Yorick Peterse2015-11-2031-215/+700
| |/ | | | | | | | | | | | | | | | | | | | | | | | | Improve performance of user profiles, finding groups, and finding projects This MR improves the following: * Rendering of profile pages and Atom feeds * Finding groups (using GroupsFinder & friends) * Finding projects (using ProjectsFinder & friends) Initially this MR was intended to only improve rendering of Atom feeds, but over time other fixes were introduced as well as the same code was the cause of all these problems. See merge request !1790
* | Update LFS docs for cloning [ci skip]Robert Schilling2015-11-201-3/+2
| |
* | Fix huge line height for diff files listDmitriy Zaporozhets2015-11-201-0/+1
|/ | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch 'rs-mr-reference-copy' into 'master' Robert Speicher2015-11-191-2/+4
| | | | | Add clipboard button to merge request cross-project reference See merge request !1847
* Merge branch 'emoji_votes' into 'master' Dmitriy Zaporozhets2015-11-1933-438/+431
| | | | | | | | | | Award Emoji This it first iteration of award emoji feature. We have plan to extend emoji picker by the next release. For now, you can add award by clicking to the emoji picker or posting a regular comment with emoji like ":+1:" and any other. You can post not only emoji that listed in the emoji picker. See merge request !1825
* Merge branch 'ci-yaml-validation' into 'master' Kamil Trzciński2015-11-196-22/+36
| | | | | | | | | | | | | Commits without .gitlab-ci.yml are marked as skipped - Commits without .gitlab-ci.yml are marked as skipped - Save detailed error when YAML syntax This also fixes: #3521 #3546 /cc @jacobvosmaer See merge request !1827
* Merge branch 'rs-safari-clipboard-fallback' into 'master' Robert Speicher2015-11-191-5/+16
| | | | | | | | | Add a fallback for Safari copy-to-clipboard Also, hide the tooltip in a less stupid way. Closes #3547 See merge request !1844
* Merge branch 'dbalexandre/gitlab-ce-fix-personal-snippet-access-workflow' ↵Robert Speicher2015-11-195-23/+199
| | | | | | | | | | | | into 'master' Improve personal snippet access workflow. Replaces !1709 Fixes #3258 See merge request !1817
* Merge branch 'dirceu/gitlab-ce-new-merge-request-from-file-edit' into 'master' Robert Speicher2015-11-1919-144/+184
| | | | | | | | | Add option to create merge request when editing/creating a file Replaces !1611 Fixes #3059 See merge request !1820
* Merge branch 'new-tag-textarea' into 'master' Robert Speicher2015-11-193-16/+9
| | | | | | | Fix 'Attach a file' link in new tag form Also removed a little bit of code repetition :) See merge request !1834
* Merge branch 'update-gitlab-shell-doc' into 'master' Robert Speicher2015-11-192-2/+2
| | | | | | | Update gitlab-shell documentation to 2.6.7 See merge request !1836
* Merge branch 'lfs-client-doc' into 'master' Job van der Voort2015-11-191-1/+1
| | | | | | | Add link to git-lfs client [ci skip] See merge request !1832
* Merge branch 'check_if_it_should_be_archived_in_backup' into 'master' Dmitriy Zaporozhets2015-11-192-9/+8
| | | | | | | | | | Check which folders and archives should be packed before passing to tar command. If user uses backup task with SKIP and skips one of the archives listed(uploads, builds, artifacts) backup create will give an error: `Cannot stat: No such file or directory`. This MR fixes that by checking for skipped items. Additionally, compact everything to avoid `TypeError: no implicit conversion of nil into String` errors. See merge request !1824
* Merge branch 'add_lfs_doc' into 'master' Job van der Voort2015-11-191-0/+136
| | | | | | | Documentation for Git LFS Doc explaining how to use Git LFS, how to use Git LFS with GitLab, known issues and troubleshooting tips. See merge request !1813
* Merge branch 'update_nginx_deploy' into 'master' Dmitriy Zaporozhets2015-11-192-2/+2
| | | | | | | | | Deploy page should be shown for all pages not just root Related to change already merged to Omnibus - gitlab-org/omnibus-gitlab!540 This change makes it so the deploy page is shown on all GitLab pages if the page exists. Users will no longer receive the 502 when deploys are happening. See merge request !1828
* Merge branch 'client-max-body-size' into 'master' Robert Speicher2015-11-192-6/+2
| | | | | | | Do not limit workhorse POST/PUT size in NGINX Limiting, if any, should happen in gitlab-workhorse. See merge request !1831
* Merge branch 'ce-mirror-backport' into 'master' Douwe Maan2015-11-1826-145/+176
| | | | | | | | | Backport relevant changes from gitlab-org/gitlab-ee!51 To do: - [x] Update gitlab-shell See merge request !1822
* Update CHANGELOGRobert Speicher2015-11-171-2/+1
| | | | [ci skip]
* Merge branch 'compare-first-commit' into 'master' Robert Speicher2015-11-172-3/+3
| | | | | | | Correctly set comparison first commit when range includes a merge commit Fixes #3207. See merge request !1814
* Merge branch 'contributor-graph-by-email' into 'master'Robert Speicher2015-11-172-4/+5
| | | | See merge request !1705
* Merge branch 'adamliesko/gitlab-ce-notification-upon-unassignment' into ↵Robert Speicher2015-11-174-12/+24
| | | | | | | | | | | | 'master' Add notification to the former assignee upon unassignment Replaces !1769 Fixes #3395 See merge request !1818
* Merge branch 'james11/gitlab-ce-removable-group-owner' into 'master' Robert Speicher2015-11-1714-77/+149
| | | | | | | | | | Prevent the last owner of a group from being able to delete themselves by 'adding' themselves as a master Replaces !1708. Fixes #1111. See merge request !1815
* Merge branch 'param-view' into 'master'Robert Speicher2015-11-176-9/+12
| | | | See merge request !1816
* Merge branch 'master' into 8-2-stableRobert Speicher2015-11-1775-366/+567
|\
| * Update CHANGELOGRobert Speicher2015-11-171-1/+3
| | | | | | | | [ci skip]
| * Update monthly release templateRobert Speicher2015-11-171-12/+16
| | | | | | | | [ci skip]
| * Merge pull request #9833 from huacnlee/fix/pr-9820-missingsRobert Speicher2015-11-171-2/+1
| |\ | | | | | | Don't render note edit forms for visitors
| | * Avoid render edit_form when visitor can't edit them.Jason Lee2015-11-171-2/+1
| |/ | | | | | | Reverted #9820, github/task_list need a form, textarea for update.
| * Merge branch 'rs-revert-gh-9820' into 'master' Robert Speicher2015-11-179-18/+24
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Merge pull request #9820 from huacnlee/avoid-render-form-in-notes-list" This reverts commit 63144cd062f6d259f1f30b6e06eb92a16caa8dec, reversing changes made to 8ab5df9d872414b2cca3ebd16d57b89e2f19e06a. Reverts https://github.com/gitlabhq/gitlabhq/pull/9820 See merge request !1804
| | * Revert "Merge pull request #9820 from huacnlee/avoid-render-form-in-notes-list"rs-revert-gh-9820Robert Speicher2015-11-169-18/+24
| | | | | | | | | | | | | | | This reverts commit 63144cd062f6d259f1f30b6e06eb92a16caa8dec, reversing changes made to 8ab5df9d872414b2cca3ebd16d57b89e2f19e06a.
| * | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-11-173-1/+29
| |\ \
| | * \ Merge branch 'issue/vars-need-eval' into 'master' Douwe Maan2015-11-171-1/+1
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure variable in mail is evalled I received this snippet in the mail: ``` Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Project #{@old_path_with_namespace} was moved to another location The project is now located under ``` This MR fixes it. Notes: * I did a quick grep on other 'text.erb' files, but this was the only one with this type of error * I made no changes to the specs. The only [spec](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/spec/mailers/notify_spec.rb#L412) I could find passes because (I assume) the correct value is in the html-part See merge request !1706
| | | * | Ensure variable is evalledGert Goet2015-10-291-1/+1
| | | | |
| | * | | Merge branch 'rs-wiki-touches-project' into 'master' Douwe Maan2015-11-172-0/+28
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make ProjectWiki touch Project#last_activity_at after wiki actions Closes #3026 See merge request !1803
| | | * | | Make ProjectWiki touch Project#last_activity_at after wiki actionsrs-wiki-touches-projectRobert Speicher2015-11-162-0/+28
| | | | |/ | | | |/| | | | | | | | | | | Closes #3026
| * | | | Merge pull request #9837 from Great-Antique/masterRobert Schilling2015-11-171-2/+2
| |\ \ \ \ | | |/ / / | |/| | | Fix md syntax in doc/api/commits.md