Commit Graph
12879 Commits
Author SHA1 Message Date
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
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
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
Jacob Vosmaer 106de470c9 Use clickable checkboxes in issue template 2014-12-03 14:21:00 +01:00
Sytse Sijbrandij 2a0ee91f7c Remove docker file maintainer at his request. https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/245#note_647506 2014-12-03 14:07:18 +01:00
Sytse Sijbrandij c0a0d46c97 Add docker container to changelog. 2014-12-03 12:51:17 +01:00
Sytse Sijbrandij 6c68db6091 Merge branch 'user-agnostic-docker-example' into 'master'
User agnostic docker example

See merge request !245
2014-12-03 11:44:46 +00:00
Sytse Sijbrandij 3838b168b3 Add password hint. 2014-12-03 12:43:26 +01:00
Sytse Sijbrandij 9e4d39c051 Move commands to the readme, rename gitlab to gitlab_app, add PostgreSQL tweaks to gitlab.rb. 2014-12-03 12:41:47 +01:00
Dmitriy Zaporozhets ac04665a8c Merge branch 'show-cross-project-ref' into 'master'
Show cross project ref

Fixes #1661

See merge request !1292
2014-12-03 11:02:34 +00:00
Dmitriy Zaporozhets 03d1ee17eb Merge branch 'reintroduce_minimum_gitlab_resources' into 'master'
Reintroduce minimum gitlab system requirement

As per https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/1249#note_29946

See merge request !1286
2014-12-03 10:22:25 +00:00
Dmitriy Zaporozhets ed1c22568a Add cross-project reference tooltip for merge request
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-12-03 11:40:04 +02:00
Dmitriy Zaporozhets ba51a1dd32 Render cross reference in issue title
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-12-03 11:15:00 +02:00
Dmitriy Zaporozhets a70e7d61ac Merge branch 'improve-form-links-ux' into 'master'
Improve issuable form links UX

> The create new label / milestone links should open in a new window / popup to avoid losing information already filled in for a new issue.

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/855

See merge request !1291
2014-12-02 21:36:38 +00:00
Dmitriy Zaporozhets 300311f395 Merge branch 'improve-search-ux' into 'master'
Improve search ux

When I use search from merge requests page I usually want to see merge requests results. If I do search from wiki pages -> I want to see wiki results first.

With this patch search scope is set to issues if you are on issues controller and same for merge requests and wikis

See merge request !1290
2014-12-02 21:36:10 +00:00
Dmitriy Zaporozhets 1242e0393b Merge branch 'fix-safari-ui-bug' into 'master'
Fix safari ui bug

See merge request !1289
2014-12-02 21:35:37 +00:00
Dmitriy Zaporozhets c5bdc7e13a New label/milestone link from issue form opens in new window
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-12-02 22:47:19 +02:00
Dmitriy Zaporozhets 5f15ed04fc Respect current controller scope when using search from project area
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-12-02 22:38:45 +02:00
Dmitriy Zaporozhets 12f8699296 Fix safari 8 ui issue
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-12-02 22:30:06 +02:00
Sytse Sijbrandij ed7760b1d7 Add command to limit Postgres memory allocation, thanks Jacob. 2014-12-02 19:25:04 +01:00
Dmitriy Zaporozhets c2e5343849 Merge branch 'improve-mr-reloading' into 'master'
Improve MR reloading

## Theory

Every time you pushed to master it updates merge requests that has master
as target branch. So if you have 50 open merge requests point to master
it will reload all of them every time you push a single commit to
master. The funny thing is that after reloading diff of most merge
requests looks the same.

After this patch we update diff only if we push commit to master that
includes in MR commits list.

For example we have next repository:

    feature: A - B - C
    master: A

We create merge request with code from feature to master.

    MR: B - C

If we push to master commit D - MR will not be reloaded. So picture will
look next:

    feature: A - B - C
    master: A - D
    MR: B - C

And if we push to master commit B - MR will be reloaded. So picture will
look next:

    feature: A - B - C
    master: A - B
    MR: C

## Benchmark

For project with 45 open merge requests to master

Before

```
Benchmark post-receive | Cache and size:   0.060000   0.040000   0.100000 (  0.379720)
Benchmark post-receive | Push commits selection:   0.130000   0.020000   0.150000 (  0.149299)
Benchmark post-receive | Update merge requests:   9.180000   2.030000  11.210000 ( 11.971747)
Benchmark post-receive | Process commit messages:   0.140000   0.010000   0.150000 (  0.168810)
Benchmark post-receive | Push data:   0.020000   0.000000   0.020000 (  0.016363)
Benchmark post-receive | Push event and services:   0.030000   0.000000   0.030000 (  0.088062)
```

After

```
Benchmark post-receive | Cache and size:   0.070000   0.030000   0.100000 (  0.106676)
Benchmark post-receive | Push commits selection:   0.130000   0.020000   0.150000 (  0.143081)
Benchmark post-receive | Update merge requests:   0.660000   0.210000   0.870000 (  0.892663)
Benchmark post-receive | Process commit messages:   0.030000   0.000000   0.030000 (  0.029263)
Benchmark post-receive | Push data:   0.020000   0.000000   0.020000 (  0.018479)
Benchmark post-receive | Push event and services:   0.030000   0.000000   0.030000 (  0.038230)
```
- - -

## References

Discussion in gitlab/gitlabhq#1796

See merge request !1288
2014-12-02 16:20:50 +00:00
Sytse Sijbrandij 3b643bc87b Move build to first step and add interactive commands. 2014-12-02 17:16:46 +01:00
Dmitriy Zaporozhets 1587c36b04 Merge branch 'update-libv8' into 'master'
Update libv8

For some reason I could no longer install the previous version of libv8 on my development machine; this version bump fixes that.

I do not know if/how this change affects production environments.

See merge request !1287
2014-12-02 16:14:23 +00:00
Sytse Sijbrandij 6f9d9ea09e Postgres log location is a directory. 2014-12-02 16:57:52 +01:00
Dmitriy Zaporozhets 835cbc06d8 Reload mr code on force push too
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-12-02 17:42:56 +02:00
Sytse Sijbrandij a33cb85530 Add interactive commands. 2014-12-02 16:28:12 +01:00
Sytse Sijbrandij 8dd3a16227 Change vim command. 2014-12-02 16:24:55 +01:00
Sytse Sijbrandij 40e80dbeb5 Remove vim since it is of no use to running GitLab. 2014-12-02 16:18:32 +01:00
Dmitriy Zaporozhets 9211b541d3 Improve MR code reloading when push code
Every time you pushed to master it updates merge requests that has master
as target branch. So if you have 50 open merge requests point to master
it will reload all of them every time you push a single commit to
master. The funny thing is that after reloading diff of most merge
requests looks the same.

After this patch we update diff only if we push commit to master that
includes in MR commits list.

For example we have next repository:

feature: A - B - C
master: A

We create merge requests #1 with code from feature to master.

MR #1: B - C

If we push to master commit D - MR will not be reloaded. So picture will
look next:

feature: A - B - C
master: A - D
MR #1: B - C

And if we push to master commit B - MR will be reloaded. So picture will
look next:

feature: A - B - C
master: A - B
MR #1: C

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-12-02 16:22:23 +02:00
Sytse Sijbrandij 0afa07f7f0 Add troubleshooting section to the docker documentation. 2014-12-02 15:19:43 +01:00
Jacob Vosmaer 0ec4685837 Update libv8 from 3.16.14.3 to 3.16.14.7
This selfish change fixes 'bundle install' on my (OS X) development
machine.
2014-12-02 14:48:42 +01:00
Marin Jankovski 79912d6870 System with 512MB of RAM can be used but swap size must be increased. 2014-12-02 14:46:16 +01:00
Marin Jankovski bff0034584 Revert "Remove the lowest memory requirement of 512MB."
This reverts commit 5cf6d5949d.
2014-12-02 14:39:58 +01:00