Commit Graph
22224 Commits
Author SHA1 Message Date
Marin Jankovski 144eef3850 Update ci to ce doc to make it clearer when you are done if you don't want to keep your data. 2015-10-05 16:39:58 +02:00
Yorick Peterse 2fa4e2fb6a Evaluate benchmark blocks in the proper context
This ensures that blocks defines using "benchmark_subject" have access
to methods defined using let/subject & friends.
2015-10-05 16:27:41 +02:00
Kamil Trzcinski 517815f40f Fix gitlab_ci_yaml_processor specs 2015-10-05 16:07:50 +02:00
Kamil Trzcinski 29a7c6796e Fix GitLabCiService and remove ci_yaml_file from CI push data 2015-10-05 16:06:35 +02:00
Jan Bruckner a5f6af007a don't set LATEST_TAG automatically in patch update guide 2015-10-05 16:01:39 +02:00
Kamil Trzcinski c985389722 Add stage tests 2015-10-05 15:59:31 +02:00
Dmitriy Zaporozhets 39772f0116 Merge branch 'ci-web-hooks' 2015-10-05 15:01:40 +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 fb12b81b42 Make rubocop happy 2015-10-05 14:39:56 +02:00
Kamil Trzcinski 198f4b703d Fix db/schema.rb 2015-10-05 14:37:42 +02:00
Kamil Trzcinski f42078f7c1 Fix rest of tests 2015-10-05 14:31:51 +02:00
Dmitriy Zaporozhets 3137d155ca Merge branch 'fix_scroll_on_diff_tab' into 'master'
Fix anchors to comments in diffs

https://gitlab.com/gitlab-org/gitlab-ce/issues/2218

See merge request !1508
2015-10-05 12:23:23 +00:00
Kamil Trzcinski 0367dbf043 Fix build pipelining 2015-10-05 14:15:15 +02:00
Achilleas Pipinellis 66fa6070e8 Merge branch 'golang-i386' into 'master'
Golang download instructions assume amd64



See merge request !1488
2015-10-05 12:00:07 +00:00
Dmitriy Zaporozhets 813c0ead2e Revert "Merge branch 'projects' into 'master' "
This reverts commit 2b493695a3, reversing
changes made to b5c12f742a.
2015-10-05 13:59:01 +02:00
Kamil Trzcinski 5064c9038c Fix next bunch of tests 2015-10-05 13:51:28 +02:00
Kamil Trzcinski 782c8f9aa0 Fix triggers spec 2015-10-05 13:37:50 +02:00
Kamil Trzcinski d2d2df0738 Fix next round of tests 2015-10-05 13:12:00 +02:00
Valery Sizov 31330e4a3c Fix anchors to comments in diffs 2015-10-05 14:00:41 +03:00
Kamil Trzcinski 361dc3641d Fix builds_without_retry 2015-10-05 12:38:00 +02:00
Kamil Trzcinski 317a746954 Make commit_spec run 2015-10-05 12:02:26 +02:00
Yorick Peterse 0bef64911b Added documentation for writing benchmarks 2015-10-05 11:32:22 +02:00
Yorick Peterse 89920ca819 Allow benchmark failures for the time being
This will be disallowed again once the existing benchmarks pass (which
relies on #2341).
2015-10-05 11:08:52 +02:00
Dmitriy Zaporozhets ecbe393b8d CI web hooks menu active state and consitent title
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-10-05 10:51:25 +02:00
Yorick Peterse 22506ddc50 Added benchmark_subject method for benchmarks
This class method can be used in "describe" blocks to specify the
subject of a benchmark. This lets you write:

    benchmark_subject { Foo }

instead of:

    benchmark_subject { -> { Foo } }
2015-10-05 10:51:24 +02:00
Dmitriy Zaporozhets c293cc9152 Move CI web hooks page to project settings area
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-10-05 10:47:23 +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
Ben Bodenmiller abf18abb52 allow crawling of commit page but not patch/diffs
Commit page has valuable information that search engines should be allowed to crawl however the .patch and .diff pages have no new information that is not on commit page
2015-10-04 23:39:24 -07:00
Lasse Schuirmann 5e18a922e4 Remove tmp/.gitkeep
This file is obsolete since 5b4aba5f as it exists
solely for the directory to exist.
2015-10-04 13:49:48 +00:00
Dmitriy Zaporozhets 0de7c83a78 Merge pull request #9673 from fscherwi/patch-1
change build status image to svg
2015-10-04 15:26:52 +02:00
Dmitriy Zaporozhets ffadefb331 Merge pull request #9690 from ggarnier/master
Fix "useless assignment" Rubocop warnings
2015-10-04 15:26:23 +02:00
Guilherme Garnier 963e6366be Fix rubocop warnings in features 2015-10-03 19:59:54 -05:00
Guilherme Garnier aed145a9c6 Fix rubocop warnings in spec/lib and spec/tasks 2015-10-03 16:02:21 -05:00
Guilherme Garnier 1cfb48ddd0 Merge remote-tracking branch 'upstream/master' 2015-10-03 11:46:29 -05:00
Geoffrey Challen 5792eb9544 Fix referals for :back and relative URL installs. 2015-10-03 08:58:31 -04:00
Dmitriy Zaporozhets 662f8af497 Merge branch 'fix-cache-key-expiration-for-commits' into 'master'
Fix bug where transferring a project would result in stale commit links

Transferring a project to another namespace updates the project's updated_at
field, but since the cache key did not depend on the object, the page fragments
were not invalidated. This resulted in stale links to the commits. Changing
the cache key to use the project pathname solves this issue.

Closes gitlab-org/omnibus-gitlab#843

See merge request !1497
2015-10-03 08:45:27 +00:00
Dmitriy Zaporozhets 2b493695a3 Merge branch 'projects' into 'master'
Improve project page height

old thing. Grey block not aligned to the bottom. It was a scroll even with short project description.

![Screen_Shot_2015-10-01_at_16.03.24](https://gitlab.com/gitlab-org/gitlab-ce/uploads/b412eeaa40c79861191d1a432d95951d/Screen_Shot_2015-10-01_at_16.03.24.png)

New awesome stuff, no scroll, grey block aligned to the bottom. 

![Screen_Shot_2015-10-01_at_16.04.08](https://gitlab.com/gitlab-org/gitlab-ce/uploads/823cdb6bfb8caec892ed001448f731e5/Screen_Shot_2015-10-01_at_16.04.08.png)

See merge request !1487
2015-10-03 08:44:06 +00:00
Guilherme Garnier 848d7b2a2b Fix rubocop warnings in spec/models 2015-10-03 01:48:54 -05:00
Guilherme Garnier 59d0263bc8 Fix rubocop warnings in lib 2015-10-03 01:29:58 -05:00
Guilherme Garnier 2b075f16c7 Fix rubocop warnings in app 2015-10-03 00:56:37 -05:00
Guilherme Garnier 0406455c8a Enable "UselessAssignment" rubocop lint 2015-10-03 00:56:16 -05:00
Stan Hu 3fbcc51102 Update README cache key to use full project namespace 2015-10-02 13:26:42 -07:00
Stan Hu dbc85bfa01 Fix bug where transferring a project would result in stale commit links
Transferring a project to another namespace updates the project's updated_at
field, but since the cache key did not depend on the object, the page fragments
were not invalidated. This resulted in stale links to the commits. Changing
the cache key to use the object pathname solves this issue.

Closes gitlab-org/omnibus-gitlab#843
2015-10-02 11:24:17 -07:00
Ricardo BandandRicardo (XenGi) Band 42be5ee1cd hooks: Add full project namespace to payload
Payload of "project_member, :create" and "project_member, :destroy" now also
have a field project_path_with_namespace.
2015-10-02 19:44:33 +02:00
Andrey 75c03530f8 removed max-heght from project.scss 2015-10-02 17:08:12 +02: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 b5c12f742a Merge remote-tracking branch 'public/hide_services_password' 2015-10-02 16:48:38 +02:00
Douwe Maan 4a157e50a2 Add link to mail_room issue.
[ci skip]
2015-10-02 14:40:40 +00:00
Dmitriy Zaporozhets 0e7b96bf48 Merge branch 'access_level_badge_bug' into 'master'
Fix: Wrong access level badge on MR comments

https://gitlab.com/gitlab-org/gitlab-ce/issues/2654

See merge request !1501
2015-10-02 14:39:58 +00:00