delta/gitlab/gitlab-ce.git/spec/support, branch commit-limits

Merge branch 'feature/jschatz1/sidebar-sizing' into 'master'

2016-02-24T23:09:29+00:00


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

Set window_size to 1366*768

2016-02-23T20:29:55+00:00

Add newline

2016-02-17T14:22:33+00:00

Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into git-archive-refactor

2016-02-17T10:30:42+00:00

Merge branch 'bugagazavr/gitlab-ce-extend-hooks' into 'master'

2016-02-16T13:08:36+00:00


Add new data to project in push, issue, merge-request and note webhooks data

_Originally opened at !2738 by @bugagazavr._

- - -

**What does this MR do?**

Adds more data to hooks, makes repository data in all hook more dry ( use one hook_attrs method for repository data in all hooks )

**Are there points in the code the reviewer needs to double check?**

1. https://gitlab.com/bugagazavr/gitlab-ce/blob/extend-hooks/app/models/project.rb#L738
2. https://gitlab.com/bugagazavr/gitlab-ce/blob/extend-hooks/app/models/concerns/issuable.rb#L132
3. https://gitlab.com/bugagazavr/gitlab-ce/blob/extend-hooks/lib/gitlab/push_data_builder.rb#L52
4. https://gitlab.com/bugagazavr/gitlab-ce/blob/extend-hooks/lib/gitlab/note_data_builder.rb#L56

**Why was this MR needed?**

More information about user for push events, and more data about repositiry ( project )

**What are the relevant issue numbers?**

No

**Screenshots (if relevant)**

No

See merge request !2788

Fix API

2016-02-11T17:10:14+00:00

Add new data to project in push, issue, merge-request and note webhooks data

2016-02-11T16:22:11+00:00

- Add `avatar_url`, `description`, `git_ssh_url`, `git_http_url`,
  `path_with_namespace` and `default_branch` in `project` in push, issue,
  merge-request and note webhooks data
- Deprecate the `ssh_url` in favor of `git_ssh_url` and `http_url` in
  favor of `git_http_url` in `project` for push, issue, merge-request and
  note webhooks data
- Deprecate the `repository` key in push, issue, merge-request and
  note webhooks data, use `project` instead

Validate email addresses using Devise.email_regexp

2016-02-09T17:15:35+00:00

Also:
- Get rid of legacy :strict_mode
- Get rid of custom :email validator
- Add some shared examples to spec emails validation

Increase the minimum length for commit SHA matching to 7

2016-01-30T00:52:29+00:00

This is the git default and will help to prevent false positive matches.

Closes #12706

Prevent transient Capybara timeouts during feature tests

2016-01-29T01:56:49+00:00

The problem occurred because asset compilation takes a long time, so
when the asset cache didn't exist and the first test ran, it would often
(randomly) time out during the generation before the actual test even
had a chance to run.

Now we check if the cache exists before the suite runs, and if not, we
manually fire a request to the root URL in order to generate it. This
should allow subsequent tests to use the cached assets.