Commit Graph
12840 Commits
Author SHA1 Message Date
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 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
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
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
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
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
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
Dmitriy Zaporozhets f447aed26a Merge branch 'improve-mobile-ui' into 'master'
Improve mobile UI pt2

Next UI elements were improved for mobile view

* comments
* comment form
* issues navigation
* removed duplicate MR sidebar btn
* tabs

Desktop improvements:

* increase comment author username font size
* dark colour for comment author name

Related to #1493

See merge request !1285
2014-12-02 12:22:26 +00:00
Dmitriy Zaporozhets 6532043697 Merge branch 'disable_arguments_logger' into 'master'
Disable Sidekiq arguments logging by default

Some of the arguments passed to Sidekiq jobs are secret. With this
change we avoid logging those secrets, by turning off 'argument
logging' altogether.

See merge request !1282
2014-12-02 10:47:40 +00:00
Dmitriy Zaporozhets bf39347970 Merge branch 'larger-avatar'
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
2014-12-02 12:44:18 +02:00
Dmitriy Zaporozhets 6eeaef6dc4 Smaller tabs for mobile view
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-12-02 11:47:12 +02:00
Sytse Sijbrandij 8f60144782 Change avatar file size to 200kb. 2014-12-02 10:32:24 +01:00
Dmitriy Zaporozhets 4cbe72d767 UI improvements mostly for mobile screens
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-12-02 11:31:57 +02:00
Dmitriy Zaporozhets 5b92ddb809 Mention mobile UI improvements in CHANGELOG
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-12-02 08:30:56 +02:00
Jacob Vosmaer 6491974554 Disable Sidekiq arguments logging by default 2014-12-01 18:58:37 +01:00
Sytse Sijbrandij 3ae51c3c51 Merge pull request #8420 from Razer6/change_twitter_handle
Change twitter handle from gitlabhq -> gitlab
2014-12-01 18:24:06 +01:00
Robert Schilling 86c55106a0 Change twitter handle from gitlabhq -> gitlab 2014-12-01 17:45:25 +01:00
Dmitriy Zaporozhets 9ddc6cf05e Merge branch 'username-in-comments' into 'master'
Username in comments

Its hard to mention person in comment if you don't know his username.
This patch show person username right after his name in comment row

See merge request !1281
2014-12-01 16:32:42 +00:00
Dmitriy Zaporozhets d7568727b9 Merge pull request #8283 from cardoe/hipchat-private-server
HipChat custom server support
2014-12-01 18:25:28 +02:00
Marin Jankovski 10d36475e6 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-12-01 16:55:26 +01:00
Marin Jankovski 7bf50c8e1d Merge pull request #8376 from bbodenmiller/7-6-upgrade-guide
add preliminary 7.6 upgrade guide
2014-12-01 16:55:18 +01:00
Marin Jankovski e38d4acd3c Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2014-12-01 16:51:34 +01:00
Dmitriy Zaporozhets f53e0fff47 Show username in comment header for easier mention
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-12-01 17:40:45 +02:00
Dmitriy Zaporozhets 7ff1c0e3f9 Merge branch 'fix-internal-api' into 'master'
Fix internal api

Fixes #1787

See merge request !1280
2014-12-01 15:31:23 +00:00
Dmitriy Zaporozhets 27077ab21e Merge branch 'remove_password_argument' into 'master'
Remove unused password argument

We no longer put a (random) password in the 'new user' email, so no need to pass it around in the code.

See merge request !1279
2014-12-01 14:58:55 +00:00
Dmitriy Zaporozhets 612b8806dd Fix internal API for missing project or key
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-12-01 16:55:33 +02:00
Dmitriy Zaporozhets 06b7907c2a Fix deploy keys permission check in internal api
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-12-01 16:25:10 +02:00
Jacob Vosmaer 25a566da0a Remove unused password argument from notification
We were still passing a 'password' argument around, but it is not used
anywhere because we send a password reset link in the welcome email
nowadays.
2014-12-01 15:11:26 +01:00
Sytse Sijbrandij 30e28a7e0c Merge branch 'security-release' into 'master'
Improve security release documentation

I think the MailChimp step is not needed anymore because we automated it.

See merge request !1271
2014-12-01 09:52:10 +00:00
Dmitriy Zaporozhets 3dc986cff1 Merge branch 'backup_restore' into 'master'
Properly fix wiki restore

My previous patch didn't fix the restore issue (!247).

ProjectWiki.new() creates a new wiki git repository, so any tries to bare clone a bundle fail. With this patch we remove the newly created wiki.git before restoring from the backup bundle.

\cc @jacobvosmaer @dzaporozhets are you ok with this solution/hack?

Relevant issues: #845

See merge request !248
2014-11-30 18:03:31 +00:00
Achilleas Pipinellis 191aa9712e Properly fix wiki restore.
ProjectWiki.new() creates a new wiki git repository, so any tries
to bare clone a bundle fail. With this patch we remove the newly
created wiki.git before restoring from the backup bundle.
2014-11-30 18:24:05 +02:00
Dmitriy Zaporozhets 05f40bbfc8 Merge branch 'definition-of-done'
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CONTRIBUTING.md
2014-11-30 16:06:40 +02:00
Dmitriy Zaporozhets 31f7560332 Update CHANGELOG
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-11-30 15:25:17 +02:00
Dmitriy Zaporozhets f4b9a65c05 Merge branch 'reactivate-hljs-autodetection' into 'master'
Reactivate highlight.js language autodetection

### What does this MR do?

This commit partly reverts commit 0d13abb1 to reactivate highlight.js language autodetection.

It does NOT revert the part that adds the `nohighlight` CSS-class for a predefined set of filenames (which was indeed the intended purpose of commit 0d13abb1).

### Are there points in the code the reviewer needs to double check?

Not particularly, the only effect of this blob_helper is to add a CSS class to the `<pre>` container of the blob, to control the way highlight.js performs its syntax highlighting. (see where this helper is called at https://gitlab.com/gitlab-org/gitlab-ce/blob/master/app/views/shared/_file_hljs.html.haml#L12).

However this merge request DOES change the way the syntax highlighting is done (by bringing it back to the situation before commit 0d13abb1 where highlight.js autodetected the language itself). So we can expect some new kind of syntax highlighting problems. However in this case, the issues should be forwarded to the upstream project (https://github.com/isagalaev/highlight.js).

### Why was this MR needed?

The main motivation behind this partial revert is that there is no point (IMHO) in using an "intelligent" syntax highlighter which is specifically designed to autodetect languages if it is to dictate (via the CSS class) the language to use solely based on the filename extension.

### What are the relevant issue numbers / Feature requests?

Issue #665 "HLJS language autodetection / syntax highlighting fails "

### Screenshots (If appropriate)

See screenshots in issue #665

See merge request !232
2014-11-30 13:22:48 +00:00
Dmitriy Zaporozhets c8a2d041e7 Merge branch 'master' into 'master'
Fixed an alignment issue, fixes #778

This merge request fixes issue #778. I have figured out the problem already here: https://gitlab.com/gitlab-org/gitlab-ce/issues/778#note_366548

See merge request !242
2014-11-30 12:15:49 +00:00
Dmitriy Zaporozhets 28a95f1292 Merge branch 'restore_wikis' into 'master'
Fix wiki restore

Seems 4a5044e302 only fixed git repos restore. This MR provides the same functionality that was introduced in the aforementioned commit, but for wikis.

See merge request !247
2014-11-30 12:11:11 +00:00
Dmitriy Zaporozhets b08a80fd26 Merge branch 'upgrader' into 'master'
Make clear that the upgrader script does not update gitlab-shell

There are many cases where people end up with a broken update because they don't update gitlab-shell.

For example: https://twitter.com/hgomez/status/537902038907363330

\cc @sytses

See merge request !246
2014-11-30 12:08:42 +00:00
Dmitriy Zaporozhets f6562be044 Merge branch 'sync-project-create' into 'master'
Create project & repository at the same time

* block project creation if repository cant be created
* show proper error message about failed to create repository
* dont use ajax for project creation any more - its fast enough
* if project repository does not exist - propose to create one or import
* move import functionality to separate resource

Fixes #1768

See merge request !1278
2014-11-30 09:38:34 +00:00
Dmitriy Zaporozhets 5c1496a4d8 Improve project factories
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-11-30 10:50:15 +02:00
Dmitriy Zaporozhets f7d8467af9 Update CHANGELOG
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-11-30 00:52:04 +02:00
Dmitriy Zaporozhets 9d93729313 Move projects import to separate resource. Add bare repo creation to repository controller
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-11-30 00:50:25 +02:00
Dmitriy Zaporozhets a8df4ee9e2 Separate web page for projects without repository
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-11-30 00:49:51 +02:00
Achilleas Pipinellis 880478b21e Proper wiki restore. Fixes #845 2014-11-29 22:01:52 +02:00