Commit Graph
22224 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 27b75b2b2d Refactor commit/build tests and fix CI cancel
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-10-06 20:36:22 +02:00
Stan Hu 9ccd8e2617 Verify repository is valid 2015-10-06 11:21:45 -07:00
Dmitriy Zaporozhets 04c7dc2a9e Cleanup CI code after refactoring and fix several 500 errors
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-10-06 20:15:06 +02:00
Dmitriy Zaporozhets f6223ffb31 Move CI build page to CE project
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-10-06 19:34:21 +02:00
Dmitriy Zaporozhets ad627e40dc Merge branch 'ci-commit-page' into 'master'
Render CI statuses on commit page

This MR merges CI commit page into CE commit page.

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

See merge request !1519
2015-10-06 17:31:54 +00:00
Yorick Peterse 4841e88302 Added changelog entry for trending projects tweaks 2015-10-06 17:32:22 +02:00
Yorick Peterse 7adf9a52ba Added benchmarks for finding trending projects 2015-10-06 17:26:32 +02:00
Yorick Peterse b7abba0ca0 Revamp trending projects query
This changes the query to use a COUNT nested in an INNER JOIN, instead
of a COUNT plus a GROUP BY. There are two reasons for this:

1. Using a COUNT in an INNER JOIN can be quite a bit faster.
2. The use of a GROUP BY means that method calls such as "any?"
   (and everything else that calls "count") operate on a Hash that
   counts the amount of notes on a per project basis, instead of just
   counting the total amount of projects.

The query has been moved into Project.trending as its logic is simple
enough. As a result of this testing the TrendingProjectsFinder class
simply involves testing if the right methods are called, removing the
need for setting up database records.
2015-10-06 17:26:32 +02:00
Yorick Peterse d15eec6460 Use >= instead of > in TrendingProjectsFinder
By using >= we can ensure we actually get all comments of the past
month, instead of the comments of the past month minus the first day in
the range.
2015-10-06 17:26:32 +02:00
Yorick Peterse 1f14e689e5 Added specs for TrendingProjectsFinder 2015-10-06 17:26:32 +02:00
Dmitriy Zaporozhets fcc39d5519 Merge branch 'fix_search_in_file_tree' into 'master'
Fix search in Files

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

See merge request !1511
2015-10-06 15:25:05 +00:00
Kamil Trzcinski 17de909a42 Fix broken grouping sql clause when rendering commits for CI 2015-10-06 16:25:27 +02:00
Dmitriy Zaporozhets f509e3afeb Link ci_status_path to new ci commit page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-10-06 16:21:19 +02:00
Jacob Vosmaer b847baf8c4 One more backup spec fix
Stop the 'uploads' part from actually running.
2015-10-06 16:11:59 +02:00
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
Jacob Vosmaer 852526e07f Spec fixes for new backup contents 2015-10-06 16:10:14 +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
Jacob Vosmaer 901f544578 Remove superfluous mkdir -p 2015-10-06 15:38:21 +02:00
Jacob Vosmaer 7d58489fd9 Remove unused variable 2015-10-06 15:22:08 +02:00
Jacob Vosmaer e789644783 Keep old path: db/database.sql.gz
Documentation elsewhere refers to this internal path, let's keep
it.
2015-10-06 15:21:15 +02:00
Jacob Vosmaer 7b71727c56 Remove old "files" tarball explicitly 2015-10-06 15:10:13 +02:00
Jacob Vosmaer 90ddf140b9 Reduce disk IO during SQL backup
By using light gzip compression we can save a lot of disk IO during
the backup.
2015-10-06 15:06:15 +02:00
Jacob Vosmaer d3734fbd89 Use tar for intermediate backup storage
During the backup we create an intermediate copy of two directories:
builds and uploads. Instead of creating many small files with 'cp
-r', we now use tar (and fast gzip) to create single intermediate
files. This saves on disk IO and disk space while creating a backup.
2015-10-06 14:43:19 +02: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
Jacob Vosmaer ad37f58ebd Add explanation about parallel-rsync-repos 2015-10-06 12:42:05 +02: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
Valery Sizov 1a86a00ca3 Fix search in Files 2015-10-06 11:43:32 +03: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
Stan Hu 01fe901e47 Fixes GDK issue where repos would not be imported properly
Seed-Fu runs this entire fixture in a transaction, so the `after_commit`
hook won't run until after the fixture is loaded. That is too late
since the Sidekiq::Testing block has already exited. Force clearing
the `after_commit` queue to ensure the job is run now.

See: gitlab-org/gitlab-development-kit#58
2015-10-05 09:59:02 -07: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
Jacob Vosmaer e0ef09d9a3 Some more text in the doc 2015-10-05 18:02:32 +02:00
Jacob Vosmaer 6479b821eb Add RSYNC variable to parallel-rsync-repos 2015-10-05 18:02:12 +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