Commit Graph
20517 Commits
Author SHA1 Message Date
Marin Jankovski a2001eecc7 Backup LFS objects same as any upload. 2015-11-20 11:39:53 +01:00
Marin Jankovski 03442eb346 Lfs on by default. 2015-11-20 11:39:38 +01:00
Robert SpeicherandRobert Speicher 094bb6f8ef Merge branch 'rs-mr-reference-copy' into 'master'
Add clipboard button to merge request cross-project reference

See merge request !1847
2015-11-19 20:08:37 -05:00
Dmitriy ZaporozhetsandRobert Speicher 48e86ec610 Merge branch 'emoji_votes' into 'master'
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 "👍" and any other. You can post not only emoji that listed in the emoji picker.

See merge request !1825
2015-11-19 19:50:58 -05:00
Kamil TrzcińskiandRobert Speicher 978f0bac8a Merge branch 'ci-yaml-validation' into 'master'
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
2015-11-19 18:27:46 -05:00
Robert SpeicherandRobert Speicher 34207d1dfb Merge branch 'rs-safari-clipboard-fallback' into 'master'
Add a fallback for Safari copy-to-clipboard

Also, hide the tooltip in a less stupid way.

Closes #3547

See merge request !1844
2015-11-19 18:25:59 -05:00
Robert SpeicherandRobert Speicher 64e3cba941 Merge branch 'dbalexandre/gitlab-ce-fix-personal-snippet-access-workflow' into 'master'
Improve personal snippet access workflow.

Replaces !1709

Fixes #3258

See merge request !1817
2015-11-19 12:22:45 -05:00
Robert SpeicherandRobert Speicher 463a3cfe09 Merge branch 'dirceu/gitlab-ce-new-merge-request-from-file-edit' into 'master'
Add option to create merge request when editing/creating a file

Replaces !1611 

Fixes #3059

See merge request !1820
2015-11-19 11:46:24 -05:00
Robert SpeicherandRobert Speicher 5bf300f2b9 Merge branch 'new-tag-textarea' into 'master'
Fix 'Attach a file' link in new tag form

Also removed a little bit of code repetition :)

See merge request !1834
2015-11-19 10:40:38 -05:00
Robert SpeicherandRobert Speicher 9535d91e8d Merge branch 'update-gitlab-shell-doc' into 'master'
Update gitlab-shell documentation to 2.6.7



See merge request !1836
2015-11-19 10:10:00 -05:00
Job van der VoortandRobert Speicher 506e0be36b Merge branch 'lfs-client-doc' into 'master'
Add link to git-lfs client  [ci skip]



See merge request !1832
2015-11-19 09:57:04 -05:00
Dmitriy ZaporozhetsandRobert Speicher 61c6e96971 Merge branch 'check_if_it_should_be_archived_in_backup' into 'master'
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
2015-11-19 09:50:07 -05:00
Job van der VoortandRobert Speicher 32771f06f1 Merge branch 'add_lfs_doc' into 'master'
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
2015-11-19 09:48:38 -05:00
Dmitriy ZaporozhetsandRobert Speicher 71cb328b4a Merge branch 'update_nginx_deploy' into 'master'
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
2015-11-19 09:44:12 -05:00
Robert SpeicherandRobert Speicher 2dd4314fae Merge branch 'client-max-body-size' into 'master'
Do not limit workhorse POST/PUT size in NGINX

Limiting, if any, should happen in gitlab-workhorse.

See merge request !1831
2015-11-19 09:42:17 -05:00
Douwe MaanandRobert Speicher 371e8505f8 Merge branch 'ce-mirror-backport' into 'master'
Backport relevant changes from gitlab-org/gitlab-ee!51

To do:

- [x] Update gitlab-shell

See merge request !1822
2015-11-18 16:41:56 -05:00
Robert Speicher 8382fac7cc Update CHANGELOG
[ci skip]
2015-11-17 15:19:20 -05:00
Robert SpeicherandRobert Speicher ea5a10b065 Merge branch 'compare-first-commit' into 'master'
Correctly set comparison first commit when range includes a merge commit

Fixes #3207.

See merge request !1814
2015-11-17 13:52:09 -05:00
Robert Speicher 17a0cd46cc Merge branch 'contributor-graph-by-email' into 'master'
See merge request !1705
2015-11-17 13:49:48 -05:00
Robert SpeicherandRobert Speicher c9f0324701 Merge branch 'adamliesko/gitlab-ce-notification-upon-unassignment' into 'master'
Add notification to the former assignee upon unassignment

Replaces !1769

Fixes #3395

See merge request !1818
2015-11-17 13:28:58 -05:00
Robert SpeicherandRobert Speicher 8a1cafeb9d Merge branch 'james11/gitlab-ce-removable-group-owner' into 'master'
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
2015-11-17 13:24:15 -05:00
Robert Speicher 1ec7cea597 Merge branch 'param-view' into 'master'
See merge request !1816
2015-11-17 12:06:34 -05:00
Robert Speicher e55145b028 Merge branch 'master' into 8-2-stable 2015-11-17 11:07:05 -05:00
Robert Speicher 85102d094f Update CHANGELOG
[ci skip]
2015-11-17 11:03:02 -05:00
Robert Speicher 4597f8ef20 Update monthly release template
[ci skip]
2015-11-17 11:03:02 -05:00
Robert Speicher 475a5b5ab7 Merge pull request #9833 from huacnlee/fix/pr-9820-missings
Don't render note edit forms for visitors
2015-11-17 10:58:17 -05:00
Jason Lee 3ae1dee475 Avoid render edit_form when visitor can't edit them.
Reverted #9820, github/task_list need a form, textarea for update.
2015-11-17 23:21:03 +08:00
Robert Speicher df0110ba81 Merge branch 'rs-revert-gh-9820' into 'master'
Revert "Merge pull request #9820 from huacnlee/avoid-render-form-in-notes-list"

This reverts commit 63144cd062, reversing
changes made to 8ab5df9d87.

Reverts https://github.com/gitlabhq/gitlabhq/pull/9820

See merge request !1804
2015-11-17 15:09:22 +00:00
Dmitriy Zaporozhets 1c040b3f0a Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-11-17 13:23:31 +01:00
Robert Schilling 6379978cdf Merge pull request #9837 from Great-Antique/master
Fix md syntax in doc/api/commits.md
2015-11-17 12:27:18 +01:00
Den Girnyk 4de50a866e Fix md syntax in doc/api/commits.md 2015-11-17 13:08:11 +02:00
Douwe Maan 93262415e2 Merge branch 'issue/vars-need-eval' into 'master'
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
2015-11-17 08:55:42 +00:00
Douwe Maan c12d0b4d2a Merge branch 'rs-wiki-touches-project' into 'master'
Make ProjectWiki touch Project#last_activity_at after wiki actions

Closes #3026

See merge request !1803
2015-11-17 08:48:29 +00:00
Achilleas Pipinellis 03cb8edb34 Merge branch 'http-to-https' into 'master'
Rewrite HTTP links to force TLS, where possible

I got annoyed at the fact that the links on the profile page don't force the use of TLS, so I grepped through the entire source tree, tested all the links I found, and replaced them if possible.

See merge request !1806
2015-11-17 06:24:36 +00:00
Alex Jordan 3300db70ff Rewrite HTTP links to force TLS, where possible 2015-11-16 16:50:05 -08:00
Dmitriy Zaporozhets 0061143ccd Merge branch 'global-milestones' into 'master'
Create milestones in the group

When you work with groups its quite often you want to create same milestone in multiple projects. This MR allows you to do so

For #3488 

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

See merge request !1797
2015-11-16 20:41:27 +00:00
Dmitriy Zaporozhets b093f50986 Some code and doc improvements
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-16 19:55:58 +01:00
Robert Speicher 66c7605313 Merge branch 'rs-rc1-docs' into 'master'
8.2.rc1 documentation updates

[ci skip]

See merge request !1798
2015-11-16 18:24:16 +00:00
Robert Speicher ccb0c40c54 Make ProjectWiki touch Project#last_activity_at after wiki actions
Closes #3026
2015-11-16 13:08:25 -05:00
Robert Speicher c8e53d4467 Revert "Merge pull request #9820 from huacnlee/avoid-render-form-in-notes-list"
This reverts commit 63144cd062, reversing
changes made to 8ab5df9d87.
2015-11-16 13:08:08 -05:00
Robert Speicher b22feb9fc7 Version 8.2.0.rc1 v8.2.0.rc1 2015-11-16 11:47:31 -05:00
Dmitriy Zaporozhets 32f1a71968 Fix removing avatar for group
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-16 17:24:14 +01:00
Dmitriy Zaporozhets 43d5eca084 Merge branch 'add_index_uniq' into 'master'
Add index uniq

Added unique on oid index. Removed the second index since it is unnecessary. 

See merge request !1810
2015-11-16 16:16:36 +00:00
Dmitriy Zaporozhets 929ab909c8 Group masters should be able to create/close milestones
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-16 16:14:19 +01:00
Dmitriy Zaporozhets 9a3df9d5d0 Merge branch 'ci-runners-master-or-owner' into 'master'
Show specific runners from projects where user is master or owner

This fix for permission escalation when handling specific runners.

The users were allowed to assign runners from projects where they were guests.


See merge request !1809
2015-11-16 15:00:55 +00:00
Marin Jankovski 84c71e5d82 Add unique to oid index for lfs object. 2015-11-16 15:59:15 +01:00
Dmitriy Zaporozhets 78d542fcd8 Add milestones documentation to workflow
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-16 15:56:50 +01:00
Marin Jankovski f445d3d1f3 unique is for indexes. 2015-11-16 15:36:14 +01:00
Dmitriy Zaporozhets f16f315115 Few changes to Group Milestone feature:
* Group attachments are not supported so I removed attach file link
* Added changelog item
* Add markdown hint to project milestone form

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-16 15:07:16 +01:00
Dmitriy Zaporozhets 8630d476e4 Add header and page title to new milestone page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-11-16 14:45:20 +01:00