Commit Graph
2799 Commits
Author SHA1 Message Date
Dirceu Pereira Tiegs d7bcfe4fc0 Fix issue #3055 (project search with unmatched parentheses) 2015-10-21 10:20:40 -02:00
Robert Speicher 976400c1e6 Merge branch 'incoming-email-config' into 'master'
Make Reply by email easier to configure

Builds on !1566.

Omnibus companion MR: gitlab-org/omnibus-gitlab!510 (cc @marin)

See merge request !1580
2015-10-14 20:38:36 +00:00
Robert Speicher 123669a551 Merge branch 'simplify-cross-references' into 'master'
Simplify code around (cross)-references

See merge request !1568
2015-10-14 20:10:34 +00:00
Valery Sizov 8f584d5f2c Fix: Images cannot show when projects' path was changed 2015-10-14 18:50:35 +03:00
Valery Sizov a2f0a3650b Merge remote-tracking branch 'origin/cernvcs_hide_passwrd' 2015-10-14 18:40:58 +03:00
Valery Sizov 6c1faf4b33 Merge remote-tracking branch 'origin/inified_404_error' 2015-10-14 18:21:27 +03:00
Valery Sizov 4117d9b310 Merge branch 'feature/api_hide_service_password' of gitlab.com:cernvcs/gitlab-ce 2015-10-14 14:15:34 +03:00
Valery Sizov 8346dde052 Only render 404 page from /public 2015-10-13 20:12:34 +03:00
sue445 a092d27025 [ci skip] Fix wrong comment
According to `attributes_for_keys` and API doc, `POST /projects/:id/merge_requests`
is received `target_project_id` (NOT `target_project`)
2015-10-14 00:36:54 +09:00
Douwe Maan 712d17684b Make Reply by email easier to configure 2015-10-13 13:10:49 +02:00
Kamil Trzcinski daca1c6511 Fix broken tests 2015-10-12 22:32:29 +02:00
Kamil Trzcinski c61dc13150 Fix some changes 2015-10-12 16:41:36 +02:00
Kamil Trzcinski 789fe7b489 Update rendering 2015-10-12 16:32:58 +02:00
Kamil Trzcinski 69c04498ef Small bug fixes 2015-10-12 15:55:12 +02:00
Alex Lossent 024e34e94d Hide passwords to non-admin users in the services API
In order to be consistent with !1490 doing it for the web interface
2015-10-12 15:24:00 +02:00
Kamil Trzcinski 0aefeeb882 Add Commit Status documentation 2015-10-12 12:42:27 +02:00
Kamil Trzcinski 7ef156a242 Add author to statuses 2015-10-12 12:16:55 +02:00
Kamil Trzcinski 887494761e Fix commit status POST URL 2015-10-12 12:15:35 +02:00
Douwe Maan b0164771ec Simplify code around (cross)-references 2015-10-12 11:54:46 +02:00
Kamil Trzcinski 914cfbd2f1 Implement Commit Status API 2015-10-12 11:53:49 +02:00
Robert Speicher 42603af326 Merge branch 'fix_email_downcasing' into 'master'
LDAP email address downcasing

Fixes #2960

In the event we cannot match an LDAP user by DN we attempt to find an identity by email address and then update the DN. In this case the identity is matched by email address. 

If the user's email address in LDAP has an upper case character we cannot find a match in the GitLab database. GitLab downcases emails before the user object is saved.

This merge request downcases the email from LDAP before we lookup by email. I also added a test to prevent a regression.

See merge request !1550
2015-10-11 22:53:11 +00:00
Douwe Maan df3ae4ef13 Merge branch 'rs-issue-2970' into 'master'
Normalize space-like characters in keys before output to gitlab-shell

gitlab-shell expects only one tab separator per key, and an SSH key with
a tab character in the comment, for example, would break things.

Closes #2970

See merge request !1552
2015-10-09 11:38:59 +00:00
Jacob Vosmaer 6e1ec3b9af Merge branch 'rs-2fa-task' into 'master'
Add task to disable 2FA for all users

Addresses #2971 

See merge request !1532
2015-10-09 08:04:34 +00:00
Robert Speicher cd46f4c367 Add output and confirmation to gitlab:two_factor:disable_for_all_users 2015-10-08 23:19:56 -04:00
Robert Speicher 69b41ba043 Normalize space-like characters in keys before output to gitlab-shell
gitlab-shell expects only one tab separator per key, and an SSH key with
a tab character in the comment, for example, would break things.

Closes #2970
2015-10-08 20:34:50 -04:00
Drew Blessing b7def88c02 Fix ldap email downcasing bug 2015-10-08 14:59:46 -05:00
Yorick Peterse c8f18fc562 Added dedicated Rake task for setting up Postgres
This ensures any PostgreSQL specific schema changes (e.g. expression
indexes) are created when setting up the database.
2015-10-08 14:35:36 +02:00
Yorick Peterse 85c6a3743a Added methods for detecting MySQL/PostgreSQL
These two methods remove the need for manually going into
ActiveRecord::Base.connection all over the place.
2015-10-07 23:32:14 +02:00
Robert Speicher c3d9c55b23 Add gitlab:two_factor:disable_for_all_users task 2015-10-07 15:46:18 -04:00
Kamil Trzcinski f088ffe8f7 Merge branch 'rs-remove-ci-disable'
See merge request !1512
2015-10-05 20:06:31 +02:00
Kamil Trzciński 3eef0e18e0 Merge branch 'refactor-build-service' into 'master'
Refactor Ci::Commit and Ci::Build to have all builds for same :sha on single page

This makes Ci::Commit to have only :sha and simplifies routing to have only :sha in path. The :ref and :push_data is now parameter of Ci::Build.

All commit related data (git author, message and .gitlab-ci.yml) is read directly from repository.

All code related for creating builds is moved to CreateBuildsService.

Status deduction is rewritten to make if more efficient and easier to integrate with Commit Status API.

This is partially working, tests are not yet touched.

This slightly changes view of Commit:
![Screen_Shot_2015-10-02_at_15.21.47](https://gitlab.com/gitlab-org/gitlab-ce/uploads/ad3f1ccdcc87659ea437d8db6c5b9f94/Screen_Shot_2015-10-02_at_15.21.47.png)

@dzaporozhets What do you think?


See merge request !1502
2015-10-05 17:42:50 +00:00
Robert Speicher fc59c45d58 Remove the option to disable CI
This option only existed to ease the CI-to-CE/EE migration process.

This commit partially reverts 8b05abe816
2015-10-05 12:23:38 -04:00
Yorick Peterse 8a78c4ea06 Exclude benchmarks from the spec Rake task 2015-10-05 18:01:28 +02:00
Yorick Peterse b6808f437d Merge branch 'benchmark-suite' into 'master'
Basic RSpec/benchmark-ips powered benchmark suite

Corresponding issue: #2909, see the commit messages for more details.

A few things to note:

1. The current use of `subject` isn't exactly easy on the eyes due to them having to return a Proc, I'm not sure yet how (and if) we can work around this.
2. The maximum amount of iterations in the current `User.by_login` benchmark is arbitrary, we might have to adjust it once said method's performance has been improved.
3. Benchmarks currently take 2 seconds to warm up and 5 seconds to run (benchmark-ips defaults). 
4. The custom RSpec matcher file (`benchmark_matchers.rb`) is a bit messy, any feedback on this would be appreciated

Any comments/feedback on this would be greatly appreciated.

See merge request !1503
2015-10-05 12:56:52 +00:00
Kamil Trzcinski d2d2df0738 Fix next round of tests 2015-10-05 13:12:00 +02:00
Kamil Trzcinski 317a746954 Make commit_spec run 2015-10-05 12:02:26 +02:00
Kamil Trzcinski e3d870d7fc Add user to Ci::Build to have pusher email address 2015-10-05 10:15:40 +02:00
Kamil Trzcinski 546a3c6561 Refactor commit and build 2015-10-05 09:52:35 +02:00
Guilherme Garnier 59d0263bc8 Fix rubocop warnings in lib 2015-10-03 01:29:58 -05:00
Yorick Peterse 19893a1c10 Basic setup for an RSpec based benchmark suite
This benchmark suite uses benchmark-ips
(https://github.com/evanphx/benchmark-ips) behind the scenes. Specs can
be turned into benchmark specs by setting "benchmark" to "true" in the
top-level describe block like so:

    describe SomeClass, benchmark: true do

    end

Writing benchmarks can be done using custom RSpec matchers, for example:

    describe MaruTheCat, benchmark: true do
      describe '#jump_in_box' do
        it 'should run 1000 iterations per second' do
          maru = described_class.new

          expect { maru.jump_in_box }.to iterate_per_second(1000)
        end
      end
    end

By default the "iterate_per_second" expectation requires a standard
deviation under 30% (this is just an arbitrary default for now). You can
change this by chaining "with_maximum_stddev" on the expectation:

    expect { maru.jump_in_box }.to iterate_per_second(1000)
      .with_maximum_stddev(10)

This will change the expectation to require a maximum deviation of 10%.

Alternatively you can use the it block style to write specs:

    describe MaruTheCat, benchmark: true do
      describe '#jump_in_box' do
        subject { -> { described_class.new } }

        it { is_expected.to iterate_per_second(1000) }
      end
    end

Because "iterate_per_second" operates on a block, opposed to a static
value, the "subject" method must return a Proc. This looks a bit goofy
but I have been unable to find a nice way around this.
2015-10-02 17:00:23 +02:00
Dmitriy Zaporozhets e0609a7800 Merge branch 'show-diff-stats-for-mr' 2015-10-01 17:02:53 +02:00
Dmitriy Zaporozhets a5d258e233 Merge branch 'fix-work-with-multibyte-chars-in-ldap-uid' into 'master'
Add support of multibyte characters in LDAP UID



See merge request !1472
2015-10-01 14:33:18 +00:00
Dmitriy Zaporozhets 0d967bce57 Show additions/deletions stats on merge request diff
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-10-01 13:52:08 +02:00
Kamil Trzcinski b9ccc79cb5 Delegate ci_project parameters to projects
- It delegates name, path, gitlab_url, ssh_url_to_repo
- Remove ability to set this parameters using CI API

This fixes GitLab project rename, namespace change, repository rename, etc.
2015-09-30 12:48:40 +02:00
Петров Роман e82b37a653 Add support of multibyte characters in LDAP UID 2015-09-30 13:47:50 +03:00
Jacob Vosmaer 958af6f5c2 Merge branch 'master' into 'master'
Add support for AWS S3 Server-Side Encryption support

This adds support for AWS S3 SSE with S3 managed keys, this means the
data is encrypted at rest and the encryption is handled transparently to
the end user as well as in the AWS Console.

## Points to double check
I'm unsure on the best way to the handle the default. I've followed the `multipart_upload` de facto in the app. I'm happy to change this if required or if it will impact elsewhere e.g. omnibus packages

I also think I've managed to catch all of the documentation for this change as well.

### Why is this required
Many enterprises require good backup support but also for this to be encrypted. By default backups aren't encrypted, this allows at rest encryption to be supported in GitLab backups providing a layer of security should the physical media not be properly disposed of.

Relates to issue #2478.


See merge request !1280
2015-09-29 10:31:42 +00:00
Douwe Maan 084e35527c Merge branch 'orphaned-repo-cleanup' into 'master'
Improve repo cleanup task

I accidentally wrote a new script, not seeing we already had one.
But the old one did not do enough (it only handled global namespace orhpans) so I figured I should just drop in the new script.

See merge request !1298
2015-09-29 07:35:59 +00:00
Stan Hu 4957415e00 Merge pull request #9650 from szechyjs/fb-close-comment
FogBugz Import: Include closed comments since they may contain user data
2015-09-25 16:46:50 -07:00
Paul Beattie 253d2320ab Add support for AWS S3 Server-Side Encryption support
This adds support for AWS S3 SSE with S3 managed keys, this means the
data is encrypted at rest and the encryption is handled transparently to
the end user as well as in the AWS Console. This is optional and not
required to make S3 uploads work.
2015-09-25 17:06:31 +01:00
Ben Boeckel eb912a534b api: add enable_ssl_verification to PUT/POST hooks 2015-09-24 12:34:16 -04:00