Commit Graph
19522 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 697b34d786 Render CI statuses on commit page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-10-06 16:10:17 +02:00
Kamil Trzciński 59058a2543 Merge branch 'fix-ci-bugs' into 'master'
Fix CI regressions introduced by ci_commit changes

/cc @dzaporozhets 

See merge request !1518
2015-10-06 13:59:28 +00:00
Dmitriy Zaporozhets 4b8101dc47 Merge branch 'closer-ci-integration' into 'master'
Use CI commit status for merge request widget

For temporary compatibility with other services like Jenkins we ask for
CI status via AJAX request if there is no commit status in GitLab
database

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>


cc @ayufan 

See merge request !1517
2015-10-06 11:56:22 +00:00
Kamil Trzcinski 065fe557f7 Fixed failure reading .gitlab-ci.yml 2015-10-06 12:00:15 +02:00
Kamil Trzcinski a266752821 Latest builds always include builds with unique name and unique ref 2015-10-06 11:59:55 +02:00
Dmitriy Zaporozhets e6ab50a754 Use CI commit status for merge request widget
For temporary compatibility with other services like Jenkins we ask for
CI status via AJAX request if there is no commit status in GitLab
database

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-10-06 10:34:36 +02:00
Robert Speicher 10d7c367b0 Merge branch 'master' into 'master'
Remove tmp/.gitkeep

This file is obsolete since 5b4aba5f as it exists
solely for the directory to exist.

See merge request !1506
2015-10-06 01:46:13 +00:00
Kamil Trzcinski fc795d6ee2 Fix graphical glitches 2015-10-05 21:20:54 +02:00
Kamil Trzcinski e5e6c846ea Fix builds view 2015-10-05 20:21:08 +02:00
Robert Speicher a2af080a06 Update CHANGELOG for 8.0.4
[ci skip]
2015-10-05 14:19:46 -04:00
Dmitriy Zaporozhets b2803a5e05 Merge branch 'master' of github.com:gitlabhq/gitlabhq
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-10-05 20:15:43 +02:00
Dmitriy Zaporozhets 34d79c9c52 Merge branch 'gopeter-user-preferences-layout-option' 2015-10-05 20:14:41 +02:00
Dmitriy Zaporozhets 3d90560c1e Merge branch 'user-preferences-layout-option' of https://github.com/gopeter/gitlabhq into gopeter-user-preferences-layout-option
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-10-05 20:14:32 +02: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
Patricio Cano 97f7edf37a Merge branch 'fix-referer-origin' into 'master'
Fix referals for :back and relative URL installs.

`app/views/layouts/_head.html.haml` currently sets the referrer policy to "origin". This disables the use of `{ redirect_to :back }`, which is used frequently throughout GitLab, and also breaks relative URL installs for browsers that obey this policy (e.g., Chrome).

For example, using the "origin" policy the "Save Changes" button on the profile screen will (a) dump you at the GitLab home screen (which I can confirm on GitLab.com) or (b) dump you out of GitLab entirely for a relative URL install (which I can confirm on my local install).

The right policy is "origin-when-cross-origin", which disables HTTP_REFERER when coming from other sites but enables it internally. (https://w3c.github.io/webappsec-referrer-policy/) I can confirm that this fixes the problems with ":back" on my install.

See merge request !1505
2015-10-05 16:45:35 +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
Patricio Cano 1bd4604ae5 Added CHANGELOG item about fixed user identities API. 2015-10-05 11:15:52 -05:00
Peter Göbel 291e1fa930 improved code style and layout option naming 2015-10-05 18:09:05 +02:00
Yorick Peterse 8a78c4ea06 Exclude benchmarks from the spec Rake task 2015-10-05 18:01:28 +02:00
Robert Speicher 471671f80d Merge branch 'reply-by-email-known-issue' into 'master'
Document known issue with Reply by email and multiple application servers.

See merge request !1499
2015-10-05 15:54:04 +00:00
Peter Göbel e2c5d08e7e added user preference to change layout width 2015-10-05 17:22:47 +02:00
Kamil Trzcinski 97a11136d3 Fix create_trigger_request_service_spec 2015-10-05 17:06:31 +02:00
Dmitriy Zaporozhets 94dc0224e2 Merge branch 'revert-layout-changes' into 'master'
Revert "Merge branch 'projects' into 'master'"

This reverts commit 2b493695a3, reversing
changes made to b5c12f742a.

This reverts !1487 MR because it cause bugs on mobile devices 


cc @skyruler 

See merge request !1509
2015-10-05 15:05:16 +00:00
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
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