Commit Graph
4208 Commits
Author SHA1 Message Date
Douwe Maan 386d442a18 Merge branch 'fix/deprecated-ci-badge-permissions' into 'master'
Fix permissions for deprecated CI build status badge

This fixes permissions for deprecated status badge, being unavailable even if project is public.

Closes #13324

See merge request !3030
2016-03-02 11:00:25 +00:00
Douwe Maan ca8a44be82 Merge branch 'issue_13716' into 'master'
Check for conflicts before creating new revert branch

Fixes #13716 

See merge request !2953
2016-03-02 10:51:43 +00:00
Douwe Maan 8eadb373ec Merge branch 'rs-filter-array' into 'master'
Add FilterArray class to Banzai



See merge request !3053
2016-03-02 10:46:23 +00:00
Douwe Maan 8ec49e47ec Merge branch 'mail-room-config-without-rails' into 'master'
Don't load all of GitLab in mail_room

Fixes #12731

cc @jacobvosmaer 

See merge request !3005
2016-03-02 10:43:57 +00:00
Rubén Dávila d9e0191592 Add some specs for Repository#revert. 2016-03-01 19:16:27 -05:00
Robert Speicher c9b1132217 Add FilterArray class to Banzai 2016-03-01 15:54:35 -05:00
Grzegorz Bizon 8b02d962ab Do not require authentication for CI status badge
This changes only deprecated CI badge that we keep for backwards
compatibility. See !3030#note_4041498.
2016-03-01 20:32:30 +01:00
Douwe Maan 9b3c1a8c4f Merge branch 'fix/commit-status-api-improvement' into 'master'
Return empty array when commit has no statuses in API

This makes API endpoint for Commit Statuses return empty array instead
of 404 when commit exists, but has no statuses.

Closes #3080

See merge request !3010
2016-03-01 16:50:23 +00:00
Douwe Maan 3d1de5ba35 Merge branch 'rs-wiki-toc' into 'master'
Replace Gollum `[[_TOC_]]` tag with result of TableOfContentsFilter

Closes #2494

See merge request !2952
2016-03-01 16:06:40 +00:00
Douwe Maan ad9137a785 Merge branch 'rs-avatar-validation' into 'master'
Only validate avatar cropping values when avatar is present AND changed

Closes #13905

See merge request !3018
2016-03-01 16:03:38 +00:00
Douwe Maan 204a989533 Merge branch 'rs-improve-grace-period' into 'master'
Don't show any "2FA required" message if it's not actually required

Prior, if the user had enabled and then disabled 2FA, they would be
shown a "You must enable Two-factor Authentication for your account."
message when going back to re-activate it, even if 2FA enforcement was
disabled.

See merge request !3014
2016-03-01 16:01:18 +00:00
Grzegorz Bizon 6be22dbbe3 Fix specs for deprecated CI build status badge 2016-03-01 14:42:52 +01:00
Grzegorz Bizon 814d853a1a Fix deprecated CI build status badge permissions 2016-03-01 13:59:19 +01:00
Grzegorz Bizon 278f4423d1 Improve commit status API specs 2016-03-01 12:33:25 +01:00
Douwe Maan dc6099a5fa Merge branch 'fix/contributions-forked-projects' into 'master'
include contributions from forked projects on profile calendar

Shows contributions from forked projects in the calendar

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/3612

See merge request !2918
2016-03-01 10:06:56 +00:00
Robert Speicher 58a8d6e9ba Only validate avatar cropping values when avatar is present AND changed
Closes #13905
2016-02-29 17:19:53 -05:00
Robert Speicher 3334c3fc70 Reset otp_grace_period_started_at after disabling 2FA
Prior, if the user enabled 2FA, then disabled it and came back some time
after the grace period expired, they would be forced to enable 2FA
immediately.
2016-02-29 13:56:40 -05:00
Robert Speicher edf5e9eb05 Merge branch 'fix/project-wiki-ending' into 'master'
Fix for project paths ending in .wiki

This prevents `Git operation was rejected by pre-receive hook` when
an actual project ending with .wiki is thought to be a wiki by the
`Internal` API.

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/13742

See merge request !2960
2016-02-29 17:50:40 +00:00
James Lopez 8fe72af3dc Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/contributions-forked-projects 2016-02-29 15:49:00 +01:00
Douwe Maan cd391b66e9 Merge branch 'rs-data-links' into 'master'
Sanitize `data` and `vbscript` links

Closes #13625 

Closes https://dev.gitlab.org/gitlab/gitlabhq/issues/2660

See merge request !2905
2016-02-29 13:22:38 +00:00
Grzegorz Bizon 433b4581ff Improve commit status API specs (refactoring) 2016-02-29 14:20:11 +01:00
Douwe Maan 2ea8f71bb4 Merge branch '11489-branded-appearance-to-ce' into 'master'
Branded appearance to CE

Closes #11489 

The difference with the EE version is only that there is no distinction between light and dark logos, though this wasn't used anyway. If this is fine, I'll create a MR on EE too.

TODO:
- [x] Copy docs
- [x] Make new screenshots
- [ ] Remove Custom Welcome message feature?

@rymai: I was unsure what labels to add to ping you, so I just ping you like this 😉 

/cc @DouweM

See merge request !2927
2016-02-29 13:18:29 +00:00
Grzegorz Bizon dcc67ac1fd Return empty array when commit has no statuses in API
This makes API endpoint for Commit Statuses return empty array instead
of 404 when commit exists, but has no statuses.

Closes #3080
2016-02-29 13:54:33 +01:00
Douwe Maan 84473c7513 Merge branch 'master' into mail-room-config-without-rails 2016-02-29 11:10:03 +01:00
James Lopez 3ac202c30f fixed merge conflict and refactored specs 2016-02-29 10:59:16 +01:00
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 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
Douwe Maan bbdb9ba036 Don't load all of GitLab in mail_room
Fixes #12731
2016-02-26 18:48:13 -08: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
Zeger-Jan van de Weg 9a2869ab46 Branded login page also in CE
The only major difference with the EE version is the change from a light and dark logo to only a header logo
The dark logo wasn't used anyway, so it seemed to make sense to me to rename the field to the actual function of it
2016-02-26 15:50:51 +01:00
Alfredo Sumaran 08ec838ed5 Merge branch 'master' into avatar-cropping 2016-02-26 09:32:07 -05: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 c401e8338b updated internal.rb and spec based on MR feedback 2016-02-26 10:40:30 +01: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
Yorick Peterse a10678e7eb Added specs for the various Repository hooks 2016-02-25 12:56:04 +01: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
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
Robert Speicher 93e6282657 Add :with_avatar trait to User factory 2016-02-24 13:50:03 -05:00
James Lopez d377948931 fix for projects ending in .wiki 2016-02-24 15:54:36 +01:00
Robert Speicher 989946f337 Sanitize vbscript: links
Closes https://dev.gitlab.org/gitlab/gitlabhq/issues/2660
2016-02-23 20:42:03 -05:00
Robert Speicher bc43ad71ef Replace Gollum [[_TOC_]] tag with result of TableOfContentsFilter
Closes #2494
2016-02-23 18:25:40 -05:00
Alfredo Sumaran 78bf02e93d Set window_size to 1366*768 2016-02-23 15:29:55 -05:00
Douglas Barbosa Alexandre 28097398c5 Does not raise an error when Todo is already marked as done 2016-02-23 10:43:29 -03:00
Kamil Trzciński 884094a77e Merge branch 'ci/extend-summary-status-specs' into 'master'
Extend specs for summary build status

Additional specs cover a case when one of the builds is running but
allowed to fail. Previous implementation returned `running` status,
which is wrong. This behavior has been changed in 8.5, this commit adds
missing specs.

See merge request !2904
2016-02-23 10:07:55 +00:00