Robert Speicher and Robert Speicher
eea8a6d062
Merge branch 'remove-satellites' into 'master'
...
Add migration to remove the contents of the satellites dir
See merge request !1681
2015-10-26 11:41:10 +01:00
Kamil Trzcinski
940a7fc106
Fail builds that also have empty string
2015-10-23 16:25:23 +02:00
Robert Speicher and Robert Speicher
e8d5582729
Merge branch 'fix-mysql-ci-limits-migration' into 'master'
...
Ensure MySQL CI limits DB migrations occur after the fields have been created
Closes https://github.com/gitlabhq/gitlabhq/issues/9753
See merge request !1653
2015-10-21 09:30:04 +02:00
Robert Speicher and Robert Speicher
def48f0ad3
Merge branch 'add-missing-migrations' into 'master'
...
Add missing migrations
See merge request !1652
2015-10-21 09:04:14 +02:00
Robert Speicher and Robert Speicher
955f424834
Merge branch 'jrochkind/gitlab-ce-fix_2839_send_abuse_report_notify' into 'master'
...
Send an email to admin email when a user is reported for spam
Replaces !1547 .
Fixes #2839 .
See merge request !1634
2015-10-19 14:07:34 +02:00
Robert Speicher and Robert Speicher
c4a20e61ba
Merge branch 'index-milestone-title-label' into 'master'
...
Improve performance when filtering on milestone on labels
Also some minor refactoring in the seeding.
See merge request !1587
2015-10-19 13:52:49 +02:00
Yorick Peterse and Robert Speicher
cc0978df41
Merge branch 'friday-meltdown-indexes' into 'master'
...
See merge request !1623
2015-10-17 17:47:27 -04:00
Yorick Peterse and Robert Speicher
3234e800a0
Merge branch 'ci-commits-gl-project-id-index' into 'master'
...
Add index on ci_commits.gl_project_id
See merge request !1616
2015-10-16 16:05:53 -04:00
Yorick Peterse
72f428c7d2
Improve performance of User.by_login
...
Performance is improved in two steps:
1. On PostgreSQL an expression index is used for checking lower(email)
and lower(username).
2. The check to determine if we're searching for a username or Email is
moved to Ruby. Thanks to @haynes for suggesting and writing the
initial implementation of this.
Moving the check to Ruby makes this method an additional 1.5 times
faster compared to doing the check in the SQL query.
With performance being improved I've now also tweaked the amount of
iterations required by the User.by_login benchmark. This method now runs
between 900 and 1000 iterations per second.
2015-10-15 11:58:25 +02:00
Kamil Trzcinski
914cfbd2f1
Implement Commit Status API
2015-10-12 11:53:49 +02:00
Douwe Maan
6db238dee9
Merge branch 'workaround-seed-fu-issue' into 'master'
...
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
See merge request !1513
2015-10-08 16:10:14 +00:00
Yorick Peterse
03417456f0
Revamp finding projects by namespaces
...
By using a JOIN we can remove the need for using 2 separate queries to
find a project by its namespace. Combined with an index (only needed for
PostgreSQL) this reduces the query time from ~245 ms (~520 ms for the
first call) down to roughly 10 ms (~15 ms for the first call).
2015-10-08 14:35:32 +02:00
Stan Hu
9ccd8e2617
Verify repository is valid
2015-10-06 11:21:45 -07: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
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
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
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
Peter Göbel
291e1fa930
improved code style and layout option naming
2015-10-05 18:09:05 +02:00
Peter Göbel
e2c5d08e7e
added user preference to change layout width
2015-10-05 17:22:47 +02:00
Kamil Trzcinski
198f4b703d
Fix db/schema.rb
2015-10-05 14:37:42 +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
Dmitriy Zaporozhets
6ca5a258ca
Update db schema
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2015-10-01 11:33:46 +02:00
Valery Sizov
05fdd12fd9
Improve error message when merging fails
2015-10-01 09:45:47 +03:00
Kamil Trzcinski
5a401523eb
Fix migration
2015-09-30 19:43:29 +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
Kamil Trzcinski
9498a40052
Fix migrations
2015-09-29 10:47:04 +02:00
Kamil Trzcinski
3031209b07
Fix db/schema.rb
2015-09-29 10:47:03 +02:00
Kamil Trzcinski
f88d9cee0f
Fix migrations
2015-09-29 10:47:03 +02:00
Kamil Trzcinski
30c78e70cb
WIP
2015-09-29 10:47:03 +02:00
Kamil Trzcinski
1530f68c98
WIP
2015-09-29 10:47:03 +02:00
Stan Hu
24a0e86dd3
Remove deleted milestones from merge requests
...
Closes https://github.com/gitlabhq/gitlabhq/issues/9643
2015-09-21 12:05:01 -07:00
Douwe Maan
3377808193
Fix reply by email for comments on a specific line in a diff/commit.
2015-09-20 18:18:39 +02:00
Douwe Maan
2c0704fabc
Merge branch 'rs-bump-two-factor' into 'master'
...
Bump devise-two-factor to 2.0.0
Addresses internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2605
See https://github.com/tinfoil/devise-two-factor/pull/43
See merge request !1363
2015-09-20 15:07:58 +00:00
Robert Speicher
259851c0d6
Bump devise-two-factor to 2.0.0
...
Addresses internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2605
See https://github.com/tinfoil/devise-two-factor/pull/43
2015-09-19 21:16:18 -04:00
Robert Speicher
69723d2002
Devise 3.5.x deprecates confirm! in favor of confirm
2015-09-19 21:15:13 -04:00
Hannes Rosenögger
a22b6c591f
fix failing migration on mysql
...
We didn't specify that the db user needs the right to create
temporary tables before.
That's why the migration will fail on most installations.
This commits removes the "TEMPORARY" from the migration
and changes the documentation to include the necessary rights for the future.
2015-09-18 19:49:04 +02:00
Kamil Trzcinski
e41a29b0c3
Allow to disable GitLab CI
2015-09-18 12:46:47 +02:00
Jeroen van Baarsen
fe17a236e3
Allow custom info to be added to Help page
...
Fixes #2536
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com >
2015-09-18 10:15:40 +02:00
Kamil Trzcinski
eb1444ee11
Fix schema downgrade introduced by: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/1299
2015-09-17 10:31:08 +02:00
Valery Sizov and Valery Sizov
ce4defaf2f
enable SSL by default
2015-09-17 09:51:24 +03:00
Kamil Trzcinski
912f470497
Fix ordering issue
2015-09-16 16:59:54 +02:00
Kamil Trzcinski
9a3d0f1d92
Add rake task to migrate CI tags
2015-09-15 00:29:20 +02:00
Dmitriy Zaporozhets
ec8e2463db
Remove db/ci
2015-09-11 14:38:34 +02:00
Dmitriy Zaporozhets
81f9ee48b1
Fix mysql migration
2015-09-09 16:08:09 +02:00
Dmitriy Zaporozhets
0b5d627cd4
Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g
2015-09-09 14:56:02 +02:00
Dmitriy Zaporozhets
76c6aeb9bc
Merge CI factories and CI spec/support with GitLab
2015-09-09 13:37:50 +02:00
Valery Sizov
6bd3d72bbd
added spinach for glabal labels
2015-09-03 19:02:14 +03:00