Commit Graph
25258 Commits
Author SHA1 Message Date
Douwe Maan cd683714eb Fix changelog 2016-03-15 23:24:27 +01:00
Douwe Maan ecfa6cd75b Merge branch 'master' into git-2-7-3 2016-03-15 23:24:06 +01:00
Douwe Maan 7ae573c75a Bump Git version requirement to 2.7.3 2016-03-15 23:22:05 +01: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
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
Rémy Coutable ac8c6f24e3 Add 8.5.6 CHANGELOG items
[ci skip]
2016-03-15 18:16:21 +01:00
Jacob Schatz 37707ac59e Merge branch 'css-style-guide' into 'master'
CSS style guide

Working towards what was discussed in #13552, this adds the [SCSS Linter gem](https://github.com/brigade/scss-lint) for style guide conformity in CI.

TODO:
- [x] Agree on and write SCSS Style Guide Documentation.
- [x] Document the `scss-lint` config file.
- [x] Figure out how best to run this in CI, right now it's taking longer than I would think it should.
- [x] Use CSSComb for auto-correction (Maybe just include a CSSComb config file and have developers run the node package manually if they're interested in using it?).

My logic for not using CSSComb in the first place is that, AFAIK, we don't currently require Node/NPM, even in the dev environment. Maybe I'm wrong about that? `scss-lint` is a Ruby implementation of a similar concept, but it doesn't include autocorrect.

Is there a way we can run get GitLab CI to run `scss-lint` without having to put together the full GitLab application? Seeing as it's just static analysis, it seems like a waste of time/resources.

/cc @jschatz1 @rspeicher

See merge request !3069
2016-03-15 16:52:53 +00:00
Robert Speicher 0602091f0c Merge branch 'if-statement-syntax-fix' into 'master'
Remove parentheses from if statement

Otherwise Rubocop will give a warning after we upgrade it.

As discussed in !3197.

[ci skip]

See merge request !3231
2016-03-15 16:45:40 +00: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
Jeroen van Baarsen 0732500595 Merge branch 'patch-1' into 'master'
Fix typo in Ruby CI test and deploy example

[skip ci]

See merge request !3201
2016-03-15 16:13:49 +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 7196ee1095 Merge branch 'bundler-audit-only-master' into 'master'
bundle:audit job only on master

As discussed in !3215

See merge request !3227
2016-03-15 14:50:39 +00:00
Zeger-Jan van de Weg a7f74e033f bundle:audit job only on master 2016-03-15 15:38:12 +01: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
Achilleas Pipinellis be3a9440af Merge branch 'ci_note_win_runner' into 'master'
Windows CI support is full since Runner v1.0.0



See merge request !3219
2016-03-15 10:49:34 +00:00
Achilleas Pipinellis 090368f6c6 Windows CI support is full since Runner v1.0.0
[ci skip]
2016-03-15 12:46:21 +02: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
Douwe Maan a60e09d313 Merge branch 'rs-issue-14220' into 'master'
Be more intelligent about sanitizing links with unsafe protocols

This prevents false matches on relative links like
`[database](database.md)`.

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/14220

See merge request !3210
2016-03-15 08:29:04 +00:00
Jacob Schatz 4fc2dcc4f4 Fix bug with JS error from dropdowns in filter area 2016-03-14 23:23:30 -04:00
connorshea 8d8b457ceb Add SCSS Lint, CSSComb config file, run SCSS Lint in GitLab CI, add documentation for SCSS Style Guide.
See !3069 for more information.
2016-03-14 20:33:54 -06: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
Robert Speicher c1d7e5ac18 Merge branch 'bundle-audit-ignore-redcloth' into 'master'
Remove allowed to fail by ignoring RedCloth

Having `Allowed to fail` jobs will only make sure we'll miss something
when it should fail, so I excluded a known issue which has been an
issue a long time now.

Now when this build is not green we know we should look at it and pay
attention.

See merge request !3215
2016-03-15 00:39:33 +00:00
Douwe Maan 2612451bc0 Merge branch 'update-gitlab-git-9.0.3' into 'master'
Bump gitlab_git to 9.0.3



See merge request !3213
2016-03-15 00:12:36 +00:00
Zeger-Jan van de Weg 5960e99549 Remove allowed to fail by ignoring RedCloth 2016-03-15 00:36:11 +01:00
Stan Hu d0d7dfb2f5 Bump gitlab_git to 9.0.3 2016-03-14 15:41:36 -07:00
Robert Speicher 41de7b345b Be more intelligent about sanitizing links with unsafe protocols
This prevents false matches on relative links like
`[database](database.md)`.

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/14220
2016-03-14 18:05:01 -04:00
Jacob Schatz e1e79e7e17 Merge branch 'zero-dropdown-id' into 'master'
Fixes issue with unassigned not working in dropdown

Also allowed issues to be bulk unassigned

See merge request !3211
2016-03-14 22:03:20 +00:00
Stan Hu 449e1d4f04 Merge branch 'upgrade-capybara' into 'master'
Bump Capybara gem to 2.6.2

2.6.2 has new selectors, such as `have_current_path`, that may be useful.


See merge request !3200
2016-03-14 21:35:34 +00:00