Commit Graph
12884 Commits
Author SHA1 Message Date
Arinde Eniola 49f2a4e3a6 fix bug causing dropdown to get cut off in project page 2016-03-16 23:30:01 +01:00
Phil Hughes 6f9bda6b2d Fixes issue with dropdown caret being incorrect color 2016-03-16 19:29:53 +00:00
Jacob Schatz 3b95d59b35 Merge branch 'css-hex-format' into 'master'
Follow the CSS Style Guide rules for HEX colors.

Use lowercase letters and shorthand values for HEX colors where possible, in accordance with the CSS Style Guide.

Discussed in #14299.

\cc @jschatz1 @rspeicher

See merge request !3238
2016-03-16 15:13:23 +00:00
Douwe Maan c9c14584b7 Merge branch 'support-utf8-wiki-page-title' into 'master'
Support Wiki with UTF-8 page name

## What does this MR do?

Support Wiki with UTF-8 page name.

See https://github.com/gollum/gollum/pull/929

## Why was this MR needed?

Relax constraints for wiki slug in aac6598482.

It allows to create a wiki with UTF-8 name, but creating a wiki with UTF-8 name causes 500 error.

Creating a wiki with UTF-8 name once, then creating or updating wiki with ascii name also cause 500 error i.e. no one can create and update any wiki pages in the project.

## Workaround

1. Go to `https://DOMAIN/repo/wikis/git_access` -> this page display the link to git clone
2. Clone the wiki repo
3. Find the page with UTF-8 name
4. Rename or Delete these files
5. Commit and push

## What are the relevant issue numbers?

- #13979
- #13891
- #13698
- #13603
- #13317
- #12906
- #12825
- #10945 

## Todo

- [x] Waiting for 'gollum-rugged_adapter' that support rugged v0.24.0 release

'gollum-rugged_adapter' gem doesn't allow to install rugged v0.24.0 (it's still beta version),
but 'gitlab_git' gem depends on rugged v0.24.0b13.

So it can't install both 'gollum-rugged_adapter' and 'gitlab_git' now.


See merge request !2999
2016-03-16 01:21:34 +00:00
Douwe Maan f83a596db3 Merge branch 'worker-for-user-deletion' into 'master'
A worker deletes a user, so the request doesn't time out

Fixes #13261


See merge request !2855
2016-03-16 01:18:46 +00:00
Robert Speicher a80b49ba1a Merge branch 'issue_14301' into 'master'
Fixes label on "Assignee" dropdown

Fixes #14301 

See merge request !3239
2016-03-15 20:41:54 +00:00
Jacob Schatz 495ae51353 Merge branch 'dropdown-vertical-spacing' into 'master'
Fixed overflow on users name in dropdowns

Closes #14289

![Screen_Shot_2016-03-15_at_17.38.09](/uploads/803341031c468069709afd99a6c540be/Screen_Shot_2016-03-15_at_17.38.09.png)

See merge request !3235
2016-03-15 20:18:56 +00:00
Alfredo Sumaran aff7c92596 Typo 2016-03-15 15:09:55 -05:00
Zeger-Jan van de Weg 8077a5f958 Clearify who deletes the user 2016-03-15 21:09:25 +01:00
Zeger-Jan van de Weg a09323c9f5 Fix broken specs 2016-03-15 21:09:25 +01:00
Zeger-Jan van de Weg d249da1c16 Specs on force deleting of a user 2016-03-15 21:09:25 +01:00
Zeger-Jan van de Weg b221d11a25 Add ability to delete a user with force 2016-03-15 21:09:25 +01:00
Zeger-Jan van de Weg 4bcc097750 A worker deletes a user, so the request doesn't time out
Fixes #13261
2016-03-15 21:09:25 +01:00
connorshea e03d0b2892 Follow the CSS Style Guide rules for HEX colors.
Use lowercase letters and shorthand values for HEX colors where
possible.

Discussed in #14299.
2016-03-15 13:56:28 -06:00
Rémy Coutable bc590ce63b Merge branch '12743-subscribe-to-label' into 'master'
Allow subscribing to labels

This implement #12743 and supersedes !2799 (thanks @timothyandrew!).

- Subscribe (and unsubscribe) for labels
- When an issue/merge request is created, notify all subscribers of all its labels
- When an issue/merge request is edited, notify all subscribers of all its newly-added labels

## Done

- [x] Verify that a user is signed in to subscribe/unsubscribe from a label.
- [x] Merge conflicts
- [x] Integration tests
- [x] `issuable.subscribed?` should check subscribers and participants
- [x] When an issuable is relabeled, notify subscribers of the *newly added* labels only
- [x] Screenshots:

### Labels page

![Screen_Shot_2016-03-07_at_19.05.44](/uploads/3e69064e9e1a06ee2e27c778776c1407/Screen_Shot_2016-03-07_at_19.05.44.png)

### HTML email

![Screen_Shot_2016-03-07_at_19.07.36](/uploads/e484e06366a738385f1f6d71b52eecf7/Screen_Shot_2016-03-07_at_19.07.36.png)

### Plain text email

![Screen_Shot_2016-03-07_at_19.07.50](/uploads/dc05f710a8f7ab5eae9f72aa2110e741/Screen_Shot_2016-03-07_at_19.07.50.png)

PS: I've set the milestone to 8.6 since it's getting late for 8.5...

See merge request !3115
2016-03-15 18:08:45 +00:00
Phil Hughes b24f9d66bc Fixed overflow on users name in dropdowns
Closes #14289
2016-03-15 17:38:45 +00:00
Rémy Coutable e90d6ec1d8 Create a SentNotification record for #relabeled_issue_email / #relabeled_merge_request_email 2016-03-15 18:36:54 +01:00
Rémy Coutable c98089b2b2 Move the #toggle_subscription controller method to a concern 2016-03-15 18:22:03 +01:00
Rémy Coutable 54ec7e9599 Improving the original label-subscribing implementation
1. Make the "subscribed" text in Issuable sidebar reflect the labels
   subscription status

2. Current user mut be logged-in to toggle issue/MR/label subscription
2016-03-15 18:22:02 +01:00
Hiroyuki Sato 8acad49fe0 Support Wiki with UTF-8 page name 2016-03-16 02:17:07 +09:00
connorshea 0129f346ee Remove parentheses from if statement
Otherwise Rubocop will give a warning.

As mentioned in !3197.
2016-03-15 10:42:16 -06:00
Timothy AndrewandRémy Coutable 0444fa560a Original implementation to allow users to subscribe to labels
1. Allow subscribing (the current user) to a label

- Refactor the `Subscription` coffeescript class
  - The main change is that it accepts a container, and conducts all
    DOM queries within its scope. We need this because the labels
    page has multiple instances of `Subscription` on the same page.

2. Creating an issue or MR with labels notifies users subscribed to those labels

- Label `has_many` subscribers through subscriptions.

3. Adding a label to an issue or MR notifies users subscribed to those labels

- This only applies to subscribers of the label that has just been
  added, not all labels for the issue.
2016-03-15 17:25:37 +01:00
Robert Speicher 178c80a561 Merge branch 'fix-activerecord-join-stupidity' into 'master'
Ignore eager loading in Project.search UNION

This fixes issues such as filtering groups by names on pages such as
https://gitlab.com/dashboard/groups.

See merge request !3229
2016-03-15 16:25:02 +00:00
Robert Speicher 09494ff413 Merge branch 'todos-title-attr' into 'master'
Set link title for todos. Closes #14042

See merge request !3161
2016-03-15 16:23:15 +00:00
Yorick Peterse b5a47c0a38 Merge branch 'external-issue-tracker' into 'master'
See merge request !3218
2016-03-15 16:16:39 +00:00
Rémy Coutable 5c1f6f8cfc Merge branch 'revert-avatar-cropping' into 'master'
Revert the avatar cropping feature

Reverts !2951 since the added 'mini_magick' dependency should be replaced by client-side croppping

See merge request !3223
2016-03-15 15:53:42 +00:00
Robert Speicher bbfe15491e Merge branch 'ci-fix-double-borders' into 'master'
Fix double borders around the CI status

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/14281
Introduced by https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2760#note_4238291

See merge request !3224
2016-03-15 15:50:12 +00:00
Yorick Peterse c742760289 Ignore eager loading in Project.search UNION
The queries that are UNION'd together don't need any eager loading
(since we really only use the resulting SQL instead of having
ActiveRecord actually run the queries). By dropping any eager loaded
associations queries such as the following work instead of producing a
SQL error:

    Project.all.includes(:namespace).search('foo')
2016-03-15 16:46:17 +01:00
Kamil Trzcinski 89e50a0264 Use klass instead of clazz 2016-03-15 16:24:51 +01:00
Douwe Maan 6f50cef809 Merge branch 'fix/13928-wrong-iid-of-max-iid' into 'master'
Fixes "iid of max iid" in Issuable sidebar for merged MR


Fixes #13928.

See merge request !3046
2016-03-15 15:17:08 +00:00
Douwe Maan a628db7b4d Merge branch 'fix/ensure-no-new_ssh_key_email-dead-jobs' into 'master'
Ensure "new SSH key" email do not ends up as dead Sidekiq jobs

Related to #2235.

This is done by:
1. Delaying the notification sending after the SSH key is commited in DB
2. Gracefully exit the mailer method if the record cannot be found

/cc @dblessing @stanhu @DouweM 

See merge request !3163
2016-03-15 15:10:49 +00:00
Robert Speicher 90e91e28e4 Merge branch 'application-settings' into 'master'
Applications tab on profile settings

Closes #13855

See merge request !3031
2016-03-15 14:33:14 +00:00
Rémy Coutable 1714883107 Revert "Merge branch 'avatar-cropping' into 'master' "
This reverts commit 01160fc061, reversing
changes made to 4bff9daf8b.
2016-03-15 14:55:40 +01:00
Kamil Trzcinski c96e037dcb Fix double borders around the CI status 2016-03-15 14:29:02 +01:00
Douwe Maan ea7d062fa6 Merge branch 'auto-gc' into 'master'
Run 'git gc' every 10 pushes

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

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

Fixes https://gitlab.com/gitlab-org/gitlab-ee/issues/254

Associated gitlab-shell MR:
https://gitlab.com/gitlab-org/gitlab-shell/merge_requests/44

See merge request !3206
2016-03-15 10:51:38 +00:00
Rémy Coutable 76350e2ede Ensure "new SSH key" email do not ends up as dead Sidekiq jobs
Related to #2235.

This is done by:
1. Delaying the notification sending after the SSH key is commited in DB
2. Gracefully exit the mailer method if the record cannot be found
2016-03-15 11:23:57 +01:00
Kamil Trzcinski c51c901916 Return the external issue tracker even if it's null
This solves the problem with caching the nil value with instance variable.
Without this the every time we ask for external_issue_tracker we built AR and potentially do SQL query
2016-03-15 11:06:50 +01:00
Jacob Vosmaer 30b36c92c3 Use an exception to pass messages 2016-03-15 11:03:43 +01:00
Dmitriy Zaporozhets 9403142083 Merge branch 'filter-bug-fix' into 'master'
Fix bug with JS error from dropdowns in filter area

Fixes:

![consoleerror](/uploads/0fa19a943050baac855c9e6f896ea941/consoleerror.png)

This error is not a logged issue yet.

Error when turbolinks fetches a new page, `setup()` was not run. 

Signed-off-by: Jacob Schatz jschatz@gitlab.com

cc @iamphill @alfredo1 

See merge request !3216
2016-03-15 09:41:29 +00:00
Dmitriy Zaporozhets 19ecfb5c85 Merge branch 'group-projects-page' into 'master'
Redesign project tabs on group page

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>


Final step to fix #13480 

See merge request !3209
2016-03-15 08:59:41 +00:00
Jacob Schatz 4fc2dcc4f4 Fix bug with JS error from dropdowns in filter area 2016-03-14 23:23:30 -04:00
Robert Speicher c4b35a6230 Merge branch 'fix-commit-status-rendering' into 'master'
Cleanup Ci::Commit, Ci::Build and CommitStatus views

This MR tries to do first sweep of cleanups to Ci::Commit and
Ci::Build objects removing all view-related functions and fixing the
API from other side.

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

See merge request !2760
2016-03-15 00:51:43 +00:00
Phil Hughes cef1f4f2d9 Fixes issue with unassigned not working in dropdown
Also allowed issues to be bulk unassigned
2016-03-14 20:04:05 +00:00
Jacob Schatz 3211d1cb76 Merge branch 'nav-over-content-mobile' into 'master'
Left sidebar overlaps the content on mobile devices

On mobile, the navigation sidebar will always revert to being hidden. When clicking the toggle, it will then go over the top of the content - rather than push the content.

See merge request !3087
2016-03-14 19:05:34 +00:00
Dmitriy Zaporozhets 6c791f7da7 Redesign project tabs on group page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-03-14 18:31:14 +01:00
Robert Speicher b782e7c973 Merge branch 'rs-note-active-spec' into 'master'
Add unit specs for `Note#active?`

See merge request !3133
2016-03-14 12:53:15 -04:00
Jacob Schatz 961bc41c38 Merge branch 'updated-project-home-icon' into 'master'
Changed project home icon

Closes #14196

![Screen_Shot_2016-03-14_at_16.01.48](/uploads/0039c0c3afe0bf560368d2b910e2a93f/Screen_Shot_2016-03-14_at_16.01.48.png)

See merge request !3207
2016-03-14 16:44:31 +00:00
Dmitriy Zaporozhets d324bf8434 Merge branch 'share-project-ce' into 'master'
Bring from EE: Share Project with Group

- [x] Models and migrations
- [x] Logic, UI
- [x] Tests
- [x] Documentation
- [x] Share with group lock
- [x] Api feature
- [x] Api docs
- [x] Api tests

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

For #12831 

cc @DouweM @rspeicher @vsizov

See merge request !3186
2016-03-14 16:38:52 +00:00
Phil Hughes 09d3cdfd9e Changed project home icon
Closes #14196
2016-03-14 16:03:17 +00:00
Jacob Vosmaer 021d53c96d Run 'git gc' every 10 pushes 2016-03-14 16:49:24 +01:00