Commit Graph
24457 Commits
Author SHA1 Message Date
James Lopez 6b27b9f91c Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/project-wiki-ending 2016-02-29 10:46:05 +01:00
Robert Speicher f838dbe4d1 Update CHANGELOG
[ci skip]
2016-02-27 19:27:57 -05:00
Achilleas Pipinellis 47ae0c370b Merge branch '13679-fix' into 'master'
Adjust documentation of permissions

## What does this MR do?
This MR improves the documentation of the permissions by mentioning that internal projects do not enforce the Guest role.
## Are there points in the code the reviewer needs to double check?
No code was touched - only the documentation was adjusted.
## Why was this MR needed?
Without this adjustment it might not be clear how you can set up an internal project to be pullable by everyone whilst having the issue tracker and labels managed by permitted people only.
## What are the relevant issue numbers?
#13679 

See merge request !2925
2016-02-27 23:26:33 +00:00
Thomas Schmidt d324c67db3 Adjust documentation of permissions
[ci skip]
2016-02-27 23:26:04 +01:00
Robert Speicher 65040978db Merge branch 'rs-fix-issue-filter-spec' into 'master'
Fix issue milestone filter spec

See merge request !2990
2016-02-27 21:38:13 +00:00
Robert Speicher 20ac35e924 Merge branch 'evuez/gitlab-ce-webhook-url-spaces' into 'master'
Strip leading and trailing spaces in URL validator

_Originally opened at !2914 by @evuez._

It makes URLs in webhooks valid even if they contain leading and/or trailing spaces.

Spaces are hard to notice in input fields, this helps users by accepting leading and trailing spaces in webhooks URLs.

Fixes #13652

See merge request !2939
2016-02-26 23:35:43 +00:00
Robert Speicher 4fcaa7a474 Fix issue milestone filter spec 2016-02-26 18:14:49 -05:00
Robert Speicher 2c6e34bc16 Merge branch 'repository-caching-refactor' into 'master'
Refactor Repository Caching

Related issue: https://gitlab.com/gitlab-org/gitlab-ce/issues/13515

See merge request !2936
2016-02-26 22:07:50 +00:00
evuezandRobert Speicher 4d0e2979b9 Allow webhooks URL to have leading and trailing spaces 2016-02-26 14:34:06 -05:00
Jacob Schatz 01160fc061 Merge branch 'avatar-cropping' into 'master'
Fix avatar stretching by providing a cropping feature

Originally by @nesk at https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2773

Fixes #7959

See merge request !2951
2016-02-26 17:56:24 +00:00
Alfredo Sumaran dead4f2906 Update CHANGELOG 2016-02-26 12:30:40 -05:00
Rémy Coutable 4bff9daf8b Merge branch 'sidebar-hide-class' into 'master'
Created helper class to hide content in issue sidebar when collapsed

![Screen_Shot_2016-02-25_at_10.38.39](/uploads/ca49cc230edf7e71b7726e905f523092/Screen_Shot_2016-02-25_at_10.38.39.png)

Closes #13764

See merge request !2968
2016-02-26 16:42:25 +00:00
Kamil Trzciński baa5f7fc25 Merge branch 'feature/slacky-builds-v2' into 'master'
Add builds URL to gitlab-ci script

Add builds URL to gitlab-ci script

Related to: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2681

See merge request !2962
2016-02-26 15:00:15 +00:00
Dmitriy Zaporozhets cc8b08722d Merge branch 'refactor-lists' into 'master'
Refactor html/css for lists and improve help UI page

* dry lists html/css removing a lot of style duplicates
* fix snippets list to match common style
* fix extra bottom margin for groups list
* improve help page ui so it looks clean

Fixes #11873 

See merge request !2977
2016-02-26 14:59:32 +00:00
Alfredo Sumaran 08ec838ed5 Merge branch 'master' into avatar-cropping 2016-02-26 09:32:07 -05:00
Dmitriy Zaporozhets 421aa858e1 Improve help UI page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-02-26 15:17:13 +01:00
Jacob Schatz f150b8a5b9 Merge branch 'coffeescript_syntax_error' into 'master'
Fix syntax error in autosave coffeescript.

According to http://coffeescript.org/#try , `catch` needs to have an argument.

Otherwise, `Error: Parse error on line 19: Unexpected 'INDENT'` error is raised when converting to JS by coffee-script.

Fixes gitlab-org/gitlab-ce#3302


See merge request !2985
2016-02-26 14:06:00 +00:00
Dmitriy Zaporozhets 012ea64d00 Fix description margin for groups list
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-02-26 15:02:34 +01:00
Dmitriy Zaporozhets d51f3b7b35 Refactor styles for merge requests list
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-02-26 14:48:25 +01:00
Dmitriy Zaporozhets 2b5a6487ba Refactor styles for issues list
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-02-26 14:44:39 +01:00
Dmitriy Zaporozhets 2e2b96a40d Refactor css for groups list
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-02-26 14:44:39 +01:00
Dmitriy Zaporozhets 82064a7c1a Refactor css for snippets list
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-02-26 14:44:39 +01:00
Dmitriy Zaporozhets 5a1afb48fe Cleanup css for projects list
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-02-26 14:44:39 +01:00
Marin Jankovski b2c641de21 Fix syntax error in autosave coffeescript. 2016-02-26 13:22:35 +01:00
Rémy Coutable bb3563b5cd Merge branch 'rs-crowd-form-view-spec' into 'master'
Move "I should see Crowd login form" feature to a view spec

We were doing all kinds of code gymnastics to "enable" Crowd in the
feature spec and this would sometimes cause a transient failure.

Really what it's testing is if the Crowd login form shows when Crowd's
enabled, so this is much better suited to a view spec.

See merge request !2963
2016-02-26 11:27:27 +00:00
James Lopez cc42867612 update gitlab-ci script syntax 2016-02-26 11:22:34 +01:00
James Lopez 3bc77371ba Merge remote-tracking branch 'origin/feature/slacky-builds-v2' into feature/slacky-builds-v2
# Conflicts:
#	.gitlab-ci.yml
2016-02-26 11:21:32 +01:00
James Lopez 7eacb70c15 update gitlab-ci script syntax 2016-02-26 11:20:39 +01:00
James Lopez c401e8338b updated internal.rb and spec based on MR feedback 2016-02-26 10:40:30 +01:00
Achilleas Pipinellis 3f83d1dc3a Merge branch 'patch-1' into 'master'
Reformats confusing '[named here]' section for 3rd party code attribution

Weird formatting originally. Which of the following is the proper format for attribution?

1. Submitted on behalf of a third-party: [David Alexander]
1. Submitted on behalf of a third-party: [[] David Alexander]
1. Submitted on behalf of a third-party: [] David Alexander
1. Submitted on behalf of a third-party: [[ David Alexander ]]
1. ... _etc._

With this change, it allows for either of the following formats:

1. Submitted on behalf of a third-party: [David Alexander]
1. Submitted on behalf of a third-party: David Alexander

See merge request !2861
2016-02-26 09:28:22 +00:00
Achilleas Pipinellis f37e031bc9 Merge branch 'master' into 'master'
Add instructions for pushing tags as well as branches

Current instructions will push the svn branches but not tags  - add missing line to tags


See merge request !2778
2016-02-26 09:27:05 +00:00
Robert Speicher 37e5b94499 Merge branch 'fix-todos' into 'master'
Does not create a Todo when commenting on commit or project snippet

Closes #13733

See merge request !2964
2016-02-25 18:54:06 +00:00
Dmitriy Zaporozhets 820d227b9e Merge remote-tracking branch 'origin/Baertierchen/gitlab-ce-showTestCoverage' 2016-02-25 19:02:57 +01:00
Robert Speicher 8d3e5cf0db Merge branch 'fix-gemfile-lock' into 'master'
Fix order in Gemfile.lock

See merge request !2969
2016-02-25 16:10:48 +00:00
Robert Speicher 3973ce0fb4 Update CHANGELOG
[ci skip]
2016-02-25 11:04:00 -05:00
Yorick Peterse a10678e7eb Added specs for the various Repository hooks 2016-02-25 12:56:04 +01:00
Yorick Peterse 3b520efdc7 Moved exists condition in Repository#before_delete
This is only needed when calling the "expire_cache" method as the other
expiration methods don't depend on Git data.
2016-02-25 12:55:37 +01:00
Jacob Vosmaer 77603c3ec2 Fix order in Gemfile.lock 2016-02-25 12:46:06 +01:00
Phil Hughes 0bfb71248c Created helper class to hide content in issue sidebar when collapsed
Closes #13764
2016-02-25 10:35:52 +00:00
James Lopez 5c271ee95f fix changelog [ci skip] 2016-02-25 10:38:17 +01:00
James Lopez cc934128f9 Update URL syntax 2016-02-25 08:00:02 +00:00
Alfredo Sumaran b2dcfc4db3 Merge branch 'rs-crowd-form-view-spec' into avatar-cropping 2016-02-24 19:10:50 -05:00
Douglas Barbosa Alexandre c1482943c4 Does not create a todo when commenting on commit or project snippet 2016-02-24 21:09:40 -03:00
Jacob Schatz 856153d712 Merge branch 'feature/jschatz1/sidebar-sizing' into 'master'
Sidebar overlaps content when screen is below 1200px.

When screen is below 1200px, the sidebar overlaps.
When screen is above 1200px, the sidebar pushes content out.
z-index change to make sure hamburger stays on top.
Fixes #12717 
![screensize](/uploads/9a21fa06d583a49d6ebbf1ada34c6792/screensize.gif)

![screensize-small](/uploads/7c25f46e962248a40840562a01c83f8f/screensize-small.gif)

Also sorry I couldn't get the collapse button in the screen cap. It's there. 


See merge request !2620
2016-02-24 23:09:29 +00:00
Jacob Schatz 34ba39b948 Merge branch 'bugfix/jschatz/sidebar-issues/minimize-on-diff' into 'master'
Shrink on diff view

* Shrinks when navigating to diff view.
* Shrinks when refreshing on diff view.
* Expandable at anytime.

![diff](/uploads/ec3ff1e7be7571a3af251e9ec9f704c1/diff.gif)


See merge request !2735
2016-02-24 22:59:36 +00:00
Robert Speicher b95ef77e23 Move "I should see Crowd login form" feature to a view spec
We were doing all kinds of code gymnastics to "enable" Crowd in the
feature spec and this would sometimes cause a transient failure.

Really what it's testing is if the Crowd login form shows when Crowd's
enabled, so this is much better suited to a view spec.
2016-02-24 17:38:13 -05:00
James Lopez dd533abc59 gemfile random update 2016-02-24 23:05:35 +01:00
James Lopez 1f7006c59c Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into feature/slacky-builds-v2 2016-02-24 23:02:14 +01:00
James Lopez 6466e330c9 updated gitlab-ci script to include builds URL 2016-02-24 22:53:13 +01:00
James Lopez 1df2c1b2e7 test 2016-02-24 22:28:32 +01:00