Commit Graph
22224 Commits
Author SHA1 Message Date
Rubén Dávila 2ed48df79a Remove accidentally added line. #3598
It should exist in EE only.
2015-11-20 16:50:48 -05:00
Stan Hu 94b90db547 Merge branch 'fix-scss-syntax-error' into 'master'
fix syntax error in common.scss

Fix a syntax error.

See merge request !1857
2015-11-20 20:41:54 +00:00
Greg Smethells d22435f3ff fix syntax error in common.scss 2015-11-20 14:15:01 -06:00
Stan Hu da0b9cb347 Merge branch 'fix-drone-service-hook' into 'master'
Fix Drone web hook URL not being updated

Fixes regression of !1774: fixes Drone Web hook for both service templates and project services.



See merge request !1856
2015-11-20 20:05:56 +00:00
Rubén Dávila 976cebe456 Little fix for Rubocop's complaints. #2296 2015-11-20 14:27:31 -05:00
Rubén Dávila 3aabed3456 Fix bug that happened when replacing the Task list. #2296
REF: https://gitlab.com/gitlab-org/gitlab-ce/issues/2296#note_2724697
2015-11-20 13:58:45 -05:00
Stan Hu ad1f451f24 Fix Drone web hook URL not being updated 2015-11-20 08:13:25 -08:00
Rubén Dávila fa9f2dec0e Monkey patching TaskList::Item is no longer required. #2296 2015-11-20 10:49:12 -05:00
Rubén Dávila fc18e96db3 Refactor creation of system notes for Issue/MR labels. #2296 2015-11-20 10:36:12 -05:00
Marin Jankovski 899807f604 Update required version of lfs client and separate the docs for users and admins. 2015-11-20 16:10:08 +01:00
Yorick Peterse fed059a12d Port GitLab EE ProjectsFinder changes
These changes were added in GitLab EE commit
d39de0ea91. The tests were a bit bugged
(they used a non existing group, thus not testing a crucial part) which
I only noticed when porting CE changes to EE.
2015-11-20 15:53:04 +01:00
Douwe Maan 5a4c56c38d Reduce method complexity in AutocompleteController 2015-11-20 13:49:24 +01:00
Jacob Vosmaer ba4dc176f8 Merge branch 'workhorse-version' into 'master'
Bump GitLab Workhorse version to 0.4.2



See merge request !1830
2015-11-20 12:41:26 +00:00
Marin Jankovski 807c1a993d Merge branch 'lfs-batch-download' into 'master'
Add support for batch download operation

- Drops Accept for all download requests,
- Allows to do batch download for public projects and non-authorized users
- Returns 501 for legacy API with message to upgrade the client

/cc @marin @jacobvosmaer @yorickpeterse 

See merge request !1842
2015-11-20 12:19:20 +00:00
Marin Jankovski dbc0be1b27 Error 501 when client is using deprecated API. 2015-11-20 12:45:30 +01:00
Kamil Trzcinski b8d8292bef Fix upload tests, reformat code and make rubocop happy 2015-11-20 12:21:41 +01:00
Kamil Trzcinski 14d95b0529 Part of tests done [ci skip] 2015-11-20 11:59:32 +01:00
Dmitriy Zaporozhets 261698f09b Merge branch 'notes_fix_stable' into 'master'
Fix for Emoji



See merge request !1849
2015-11-20 10:18:34 +00:00
Valery Sizov f31ee52507 Fix for Emoji 2015-11-20 11:13:43 +02:00
Dmitriy Zaporozhets b96fa3094a Merge branch 'lfs_default_and_backup' into 'master'
Lfs default and backup

Part of gitlab-org/gitlab-ce#2955

See merge request !1823
2015-11-20 09:10:27 +00:00
Achilleas Pipinellis a154c934eb Merge branch 'update-docs' into 'master'
More GitLab spellings. No dedicated CI in omnibus



See merge request !1838
2015-11-20 08:56:01 +00:00
Marin Jankovski 225bbf84ed Merge branch 'update-lfs-docs' into 'master'
Update LFS docs for cloning

Cloning the repo already downloads the LFS tracked files.

See merge request !1839
2015-11-20 08:06:06 +00:00
Ruben DavilaandRubén Dávila 97afb84b31 Generate system note after Task item has been updated on Issue or Merge Request. #2296
Everytime the User check or uncheck a Task Item from the Issue or
Merge Request description, a new update is going to be
added to the activity logs of the Issue or Merge Request.

Note that when using the edit form, you can only update the Task item
status or add/delete/modify existing ones. Doing both actions is not
fully supported.
2015-11-19 21:05:44 -05:00
Robert Speicher a8e7bee3a6 Merge branch 'rs-mr-reference-copy' into 'master'
Add clipboard button to merge request cross-project reference

See merge request !1847
2015-11-20 01:08:07 +00:00
Robert Speicher 2df492fd2f Add clipboard button to merge request cross-project reference 2015-11-19 19:25:22 -05:00
Tomasz Maczukin 85ad95be74 Merge branch 'master' into fix/visibility-level-setting-in-forked-projects
* master: (296 commits)
  fox tests
  Don't rescue Exception, but StandardError
  adressing comments
  Update gitlab-shell documentation [ci skip]
  Align hash literals in IssuesFinder spec
  Fix tests
  Fix 'Attach a file' link in new tag form
  Add link to git-lfs client  [ci skip]
  Do not limit workhorse POST/PUT size in NGINX
  added specs
  added spinach tests
  Since GitLab CI is enabled by default, remove enabling it by pushing .gitlab-ci.yml
  Fix tests
  Commits without .gitlab-ci.yml are marked as skipped
  Changelog entry for finding issues performance
  Use a JOIN in IssuableFinder#by_project
  Memoize IssuableFinder#projects
  Removed trailing whitespace from IssuableFinder
  Added benchmark for IssuesFinder
  Updated DB schema with new issues/projects indexes
  ...

Conflicts:
	app/models/project.rb
2015-11-20 00:29:04 +01:00
Robert Speicher b3cd7243e9 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 23:23:31 +00:00
Tomasz Maczukin 1144b70ab6 Change update_forks_visibility_level into after_update hook in Project model 2015-11-20 00:13:56 +01:00
Kamil Trzciński 0383f84d88 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 22:57:06 +00:00
Tomasz Maczukin 945e4293cb Prevent unnecessary forks iteration at parent update 2015-11-19 23:40:29 +01:00
Dmitriy Zaporozhets 68d4ab2381 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 21:34:38 +00:00
Dmitriy Zaporozhets ef1ed8f702 Merge branch 'missing_dot_confirm_modal' into 'master'
Add missing dot in confirm modal



See merge request !1645
2015-11-19 21:26:10 +00:00
Rubén Dávila 55c2a69f5f Update copy used in alert message when deleting branches or tags. #2993 2015-11-19 16:22:41 -05:00
Robert Speicher 2a3680219b Add a fallback for Safari copy-to-clipboard
Also, hide the tooltip in a less stupid way.

Closes #3547
2015-11-19 16:06:53 -05:00
Valery Sizov 22bbb379ae fox tests 2015-11-19 23:00:30 +02:00
Dmitriy Zaporozhets e1780825ee Merge branch 'finding-issues-by-labels-performance' into 'master'
Improve performance of finding issues with/without labels

The changes in this MR ultimately lead to finding issues with(out) labels being about 2x faster due to:

1. Newly added indexes on `issues.state` and `projects.visibility_level`
2. Adjusting the query so that finding issues for multiple projects is more efficient

See merge request !1787
2015-11-19 19:35:38 +00:00
Kamil Trzcinski 8248314bc9 Don't rescue Exception, but StandardError 2015-11-19 20:17:17 +01:00
Kamil Trzcinski 888821f9ff Add support for batch download operation 2015-11-19 19:28:14 +01:00
Robert Speicher 56476f1847 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 17:22:20 +00:00
Robert Speicher 3a85c93a7a 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 16:45:45 +00:00
Valery Sizov bdf4007cb7 adressing comments 2015-11-19 18:12:17 +02:00
Robert Schilling 91a76957e3 Update LFS docs for cloning [ci skip] 2015-11-19 17:05:30 +01:00
Robert Speicher 547240e11e 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 15:40:03 +00:00
Robert Schilling de440ee5e3 More GitLab spellings. No dedicated CI in omnibus [ci skip] 2015-11-19 16:25:17 +01:00
Achilleas Pipinellis 52bcfd037f Update public access documentation [ci skip] 2015-11-19 17:24:10 +02:00
Douwe Maan e1e67d383e Move Markdown filters and pipelines into folders. 2015-11-19 16:18:13 +01:00
Robert Speicher 6756f87f90 Merge branch 'update-gitlab-shell-doc' into 'master'
Update gitlab-shell documentation to 2.6.7



See merge request !1836
2015-11-19 15:09:28 +00:00
Robert Schilling aec4aac0c2 Update gitlab-shell documentation [ci skip] 2015-11-19 16:06:13 +01:00
Yorick Peterse 094e1cc01b Align hash literals in IssuesFinder spec 2015-11-19 16:02:21 +01:00
Robert Schilling cf61b8e22c Update gitlab-workhorse docs to 0.4.2 2015-11-19 16:01:55 +01:00