home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-18 00:56:41 +10:00
Code Issues Packages Projects Releases Wiki Activity
12,909 Commits 48 Branches 340 Tags
eb12e3ab56eecb05ea2847b414554266cfb2947c
Commit Graph
12909 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitriy Zaporozhets eb12e3ab56 Merge branch 'mr-lock-problem' into 'master' 
Fix merge request lock problem

Merge Request lock problem
MR can be stuck in lock state if satelitte timeout >= unicorn timeout.

Issue explanation:

* Person press Accept button
* unicorn worker starts, lock MR and trigger satellite
* satellite does merge but very long (30 seconds)
* unicorn timeout reaches earlier then satellite timeout
* unicorn kills worker because of timeout leaving MR in lock state.

Fix:

* set locked_at date
* if MR was locked for too long - close it automatically

- - -

Fixes #1674

See merge request !1306
 2014-12-05 14:52:19 +00:00
Sytse Sijbrandij 805e61cee5 Merge branch 'doc/snapshot_backups' into 'master' 
Add snapshot backup tips

See merge request !1307
 2014-12-05 14:44:07 +00:00
Jacob Vosmaer 8f0b558aaa Add snapshot backup tips 2014-12-05 15:29:45 +01:00
Dmitriy Zaporozhets 6487419364 Automatically close merge requests that were locker for 1 day 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-05 16:02:08 +02:00
Dmitriy Zaporozhets b23f71ec4d Set/unset merge request locked_at timestamp after transition 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-05 15:49:25 +02:00
Dmitriy Zaporozhets 1961b59070 Add locked_at to merge request 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-05 15:42:26 +02:00
Dmitriy Zaporozhets 1521867219 Merge branch 'release_docs_improvements' into 'master' 
Release docs improvements

Fixes #1734

See merge request !1305
 2014-12-05 13:32:07 +00:00
Sytse Sijbrandij 54d32f565e Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2014-12-05 13:40:40 +01:00
Sytse Sijbrandij 3a3471cc2e Update favorites to the new link. 2014-12-05 13:40:11 +01:00
Marin Jankovski 69e8b0e9fd Merge branch '512mb-memory-description' into 'master' 
512mb memory description

See merge request !1297
 2014-12-05 11:37:37 +00:00
Marin Jankovski 90a308ea00 Update release docs to deploy to GitLab.com before publishing. 2014-12-05 12:34:18 +01:00
Dmitriy Zaporozhets e6c5a8b161 Merge branch 'rake_task_for_google_email_schema_verfication' into 'master' 
Rake task for google email schema verfication

#1607

See merge request !1300
 2014-12-05 10:19:10 +00:00
Dmitriy Zaporozhets 9ce9814ee3 Merge branch 'dev-rake-task-docs' into 'master' 
Dev rake task docs

As discussed in #1184

See merge request !1301
 2014-12-04 21:03:46 +00:00
Dmitriy Zaporozhets 9932f9e423 Merge branch 'refactor-atom-code' into 'master' 
Refactor atom code

See merge request !1304
 2014-12-04 21:01:56 +00:00
Dmitriy Zaporozhets 82a8bc4498 Merge branch 'atom-feed-for-user' into 'master' 
Atom feed for user

This feature allows to subscribe for users activity via atom feed.

See merge request !1303
 2014-12-04 21:00:44 +00:00
Sytse Sijbrandij 3dc25ba331 Remove warning from db seed since it is called by db setup. 2014-12-04 21:22:21 +01:00
Dmitriy Zaporozhets d31d711a70 DRY and refactor atom code 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-04 22:14:20 +02:00
Dmitriy Zaporozhets a46fe875c6 Feature: atom feed for user activity 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-04 21:49:19 +02:00
Dmitriy Zaporozhets 05d713be19 Merge branch 'sidekiq-2.17.8' into 'master' 
Sidekiq 2.17.8

See merge request !1277
 2014-12-04 19:11:02 +00:00
Sytse Sijbrandij 288df41c0a Seed is not seed dump. 2014-12-04 18:14:54 +01:00
Jacob Vosmaer 18164afbcc Update Sidekiq to 2.17.8 2014-12-04 18:11:49 +01:00
Dmitriy Zaporozhets d7fa9952ef Merge branch 'prevent-500-test-webhook' into 'master' 
Prevent 500 test webhook

Fixes #1803

See merge request !1299
 2014-12-04 16:03:42 +00:00
Dmitriy Zaporozhets e1f1e062a8 Merge branch 'multi_provider' into 'master' 
Supporting for multiple omniauth provider for the same user

fixes https://dev.gitlab.org/gitlab/gitlabhq/issues/1721

and https://dev.gitlab.org/gitlab/gitlabhq/issues/1760

See merge request !1296
 2014-12-04 16:03:04 +00:00
Sytse Sijbrandij 704b7237e6 Fix notifications for developers that don't read the documentation. 2014-12-04 16:54:08 +01:00
Marin Jankovski cdc62cffcb Add rake task for google schema whitelisting. 2014-12-04 15:22:10 +01:00
Valery Sizov f9a730ebb4 fix specs 2014-12-04 15:53:26 +02:00
Dmitriy Zaporozhets db2edff937 Handle web hook exception 
Write to log if web hook cant be executed. This prevents 500 error when
test web hook with invalid URL and prevent exceptions and retries in
sidekiq

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-04 15:07:01 +02:00
Sytse Sijbrandij 490ae737c7 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2014-12-04 12:29:55 +01:00
Sytse Sijbrandij a3e9046ad5 Fix spelling error in dockerfile, thanks Vincent for noting it. 2014-12-04 12:29:30 +01:00
Sytse Sijbrandij 4b552edb1b Merge branch 'sort-wording' into 'master' 
Improve english wording in UI filters

Fixes #1664

See merge request !1298
 2014-12-04 11:27:37 +00:00
Sytse Sijbrandij c59b5e4e68 Merge branch 'docker-version-upgrades' into 'master' 
Docker version upgrades

See merge request !251
 2014-12-04 11:15:26 +00:00
Valery Sizov b56b96d438 added helper 2014-12-04 13:03:55 +02:00
Valery Sizov 3a5ed5260b Supporting for multiple omniauth provider for the same user 2014-12-04 13:03:55 +02:00
Valery Sizov 1a80d13a39 Multi-provider auth. LDAP is not reworked 2014-12-04 13:01:50 +02:00
Dmitriy Zaporozhets 6670c99487 Set proper filter words 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-04 12:12:51 +02:00
Dmitriy Zaporozhets d80a59c7b1 Create helper for sort drowdown option names 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-04 12:10:38 +02:00
Sytse Sijbrandij 14a1c1b4e6 Add some comments about updating the Omnibus package download location for the docker image. 2014-12-04 11:03:40 +01:00
Sytse Sijbrandij 236741008e Merge branch 'update-docker' into 'master' 
Update Docker configuration to 7.5.2 + minor improvements

- Update to 7.5.2
- logs are now readable with `docker logs`
- recommend an interactive command line for configuration

See merge request !250
 2014-12-04 09:41:33 +00:00
Vincent Robert 176105eca6 Reword configuration to recommend an interactive command line 2014-12-04 10:38:35 +01:00
Vincent Robert 58b58fe44b gitlab-ctl can now be followed with docker logs 2014-12-04 10:38:04 +01:00
Vincent Robert d7aff11876 Move to 7.5.2 2014-12-04 10:30:10 +01:00
Sytse Sijbrandij 372cb87f05 Reword the 512 memmory advise. 2014-12-04 09:47:27 +01:00
Dmitriy Zaporozhets d45b25304c Merge branch 'small-ui-improvement' into 'master' 
Small UI improvement

Move issue/mr iid in the list to second row.

Because title is more important part when looking at the list of issues. Also different amount numbers in ids make title shifted which is bad from UI perspective

See merge request !1295
 2014-12-03 16:31:37 +00:00
Dmitriy Zaporozhets 439c812f4f Merge branch 'release/monthly-what-did-we-learn' into 'master' 
Release/monthly: what did we learn

Updating the release documentation based on what we learned from the 7.5 release.

See merge request !1294
 2014-12-03 15:52:59 +00:00
Jacob Vosmaer 1aca371880 Add changes suggested by Sytse 2014-12-03 16:50:03 +01:00
Jacob Vosmaer cdabe73025 Fix EE RC1 tag name 2014-12-03 16:30:57 +01:00
Dmitriy Zaporozhets 279952bb78 Show issue/mr id in the list below title 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-03 17:29:52 +02:00
Dmitriy Zaporozhets 88326858a4 Merge branch 'add-docker-to-changelog' into 'master' 
Add docker to changelog

See merge request !1293
 2014-12-03 15:20:17 +00:00
Jacob Vosmaer a8ce1d88b5 Release CI at the same time as CE and EE 2014-12-03 15:40:12 +01:00
Jacob Vosmaer 4ce27042f9 The second gitlab.com deploy should be easy 2014-12-03 14:41:39 +01:00