Commit Graph
6615 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 177c89b8b8 Merge branch 'ce-changes' into 'master'
CE changes from upstream

See merge request !266
2014-12-12 12:25:36 +00:00
Marin Jankovski d991e0b2e9 Merge branch 'fix/project_show_also_ldap_users' into 'master'
Fix/project show also ldap users

In 336b7b8 a feature was (silently) added which broke our use case of using LDAP synced groups as a common base for user <-> project mapping 😒

Although
>v 7.4.0
>  - [...]
>  - Do not show ldap users in dropdowns for groups with enabled ldap-sync
>  - [...]

indicates that the drop down boxes for groups have changed, it does not for projects in such a group. To be clear: It totally makes sense to not manually manage users for LDAP synced groups, on a project basis however it is very useful and an essential feature to allow self-service in organizations.

Please consider making the `skip_ldap` flag optional for the dropdown boxes.
[Also, make sure that the provider you're excluding actually is called `ldap`, which might not be the case for installations with multiple LDAP backends.](https://gitlab.com/subscribers/gitlab-ee/blob/master/lib/api/users.rb#L16)

This MR is a quick fix to disable this feature for projects.

See merge request !25
2014-12-12 08:12:52 +00:00
Dmitriy Zaporozhets 1c93d0df7a Merge branch 'master' into ce-changes
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	db/schema.rb
2014-12-11 18:12:45 +02:00
Dmitriy Zaporozhets 9a3ae331ad Merge branch 'dropdown_icon_not_clickable' into 'master'
Dropdown icon not clickable

Fixes #1642 by using `pointer-events` property supported by [modern browsers](http://caniuse.com/#search=pointer-events)

See merge request !1319
2014-12-11 15:02:01 +00:00
Marin Jankovski eceda17f09 Markdown dropzone image icon should not be clickable. 2014-12-10 17:24:11 +01:00
Dmitriy Zaporozhets 633fb8ab6b Prevent 500 error on ldap group links page
If group has links to ldap servers that are disabled or removed from
gitlab config.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-12-08 15:58:01 +02:00
Dmitriy Zaporozhets f5d3e47e39 Hide ldap group links if ldap is not enabled
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-12-08 15:45:55 +02:00
Valery Sizov 2f006f89a5 fix specs after merge CE -> EE 2014-12-08 13:11:33 +02:00
Vinnie Okada 742e6eeed2 Merge branch 'upstream-master' into markdown-preview
Conflicts:
	spec/routing/project_routing_spec.rb
2014-12-07 20:25:58 -07:00
Dmitriy Zaporozhets bbf9953b99 Merge branch 'attachment_url_shouldnot_be_overwritten' into 'master'
Attachment url should not be overwritten

Fixes #1786

See merge request !1308
2014-12-07 20:51:54 +00:00
Dmitriy Zaporozhets 1812c1d4de Merge branch 'improved-monokai' into 'master'
Improve Monokai highlight style to match original

The current monokai style is not very true to the original and lacks colors for certain syntactic items as mentioned in ticket https://github.com/gitlabhq/gitlabhq/issues/6855. This change's goal is to bring the monokai highlight style in line with the original design from http://www.monokai.nl/blog/2006/07/15/textmate-color-theme/

Before:
![monokai-old](https://gitlab.com/uploads/klowner/gitlab-ce/ce96c7d7c2/monokai-old.png)

After:
![monokai](https://gitlab.com/uploads/klowner/gitlab-ce/b257a8143a/monokai.png)

See merge request !238
2014-12-07 13:34:37 +00:00
Dmitriy Zaporozhets 94ea4f4296 Merge branch 'improve-activity-ui' into 'master'
Improve activity UI

See merge request !1311
2014-12-07 12:50:06 +00:00
Dmitriy Zaporozhets 8c727feea6 Merge branch 'small-fixes' into 'master'
Small fixes

Improve application stability over unexpected cases

See merge request !1310
2014-12-07 12:49:48 +00:00
Dmitriy Zaporozhets 0d5265bbec Execute project services asynchronously
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-12-07 12:29:37 +02:00
Dmitriy Zaporozhets 04fa03a7d8 Bolder event title and lighter color for event body
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-12-06 18:22:19 +02:00
Dmitriy Zaporozhets 7cefd9c6ef Prevent 500 on MR page if merge_event missing
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-12-05 18:10:25 +02:00
Dmitriy Zaporozhets e0f30c605b Add author filter for issues & merge requests pages
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-12-05 17:13:07 +02:00
Dmitriy Zaporozhets ed2eaf55c1 Move issues/mr filter to partial
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-12-05 16:59:17 +02:00
Marin Jankovski db585009be Revert "Merge pull request #7349 from srna/patch-1"
This reverts commit b37b71d887, reversing
changes made to 42a1d8083c.
2014-12-05 15:33:22 +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 3bd66989de Merge branch 'master' into ee-master
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	Gemfile
	Gemfile.lock
	VERSION
	app/models/project.rb
	app/models/user.rb
	db/schema.rb
	doc/install/installation.md
	doc/update/6.x-or-7.x-to-7.5.md
	doc/update/7.4-to-7.5.md
	lib/gitlab/git_access.rb
	spec/factories.rb
	spec/lib/gitlab/git_access_spec.rb
2014-12-05 13:28:32 +02: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
Jacob Vosmaer 017cb3fcce Fix Redis::InheritedError 2014-12-05 11:06:16 +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 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
Marin Jankovski cdc62cffcb Add rake task for google schema whitelisting. 2014-12-04 15:22:10 +01: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
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
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 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 6eb944e52b Merge branch 'rebase_on_merge_request' into 'master'
Rebase on merge request

Introduces merge request option to rebase before merging.

Issue #185

See merge request !254
2014-12-03 10:15:41 +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 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 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
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 bf39347970 Merge branch 'larger-avatar'
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
2014-12-02 12:44:18 +02:00