Commit Graph
29624 Commits
Author SHA1 Message Date
Jacob Vosmaer 0e896ffe4e Improve Gitlab::Auth method names
Auth.find was a very generic name for a very specific method.
Auth.find_in_gitlab_or_ldap was inaccurate in GitLab EE where it also
looks in Kerberos.
2016-06-10 14:51:16 +02:00
Rémy Coutable cfc99bbd13 Merge branch 'cs-issue-pr-templates' into 'master'
Add Issue/PR Templates to deter issues/contributions on the GitHub mirror of the project

## What does this MR do?
Adds GitHub-specific `ISSUE_TEMPLATE.md` and `PULL_REQUEST_TEMPLATE.md` files in a `.github` directory. To prevent new issues/PRs, I figured it'd be good to direct users/contributors to open issues/contribute code in the "correct" project.

## Are there points in the code the reviewer needs to double check?
Wording/phrasing, mostly.

## Why was this MR needed?
The GitHub issue tracker is being closed, and PRs on GitHub haven't been accepted for a while now. This was discussed briefly during the GitLab Strategy Session at the Austin Summit.

cc: @dzaporozhets @rymai  @MrChrisW @dblessing @virtuacreative @amara  

See merge request !4324
2016-06-10 10:42:27 +00:00
Douwe Maan 0dcd050bf4 Merge branch 'enable-rubocop-for-migrations' into 'master'
Enable RuboCop for migrations

## What does this MR do?

Enable RuboCop for all files inside `db/migrate`, then add magic comments to all existing files, so that this only affects new migrations.

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

This entire change is a config change and a bunch of comments.

## Why was this MR needed?

```
Yorick Peterse [11:55 AM]  
I don't think we have any use case for nested def, might as well blacklist it

Sean McGivern [11:57 AM]  
http://www.rubydoc.info/gems/rubocop/RuboCop/Cop/Lint/NestedMethodDefinition

Sean McGivern [11:57 AM]  
hmm, it's already enabled

Sean McGivern [11:57 AM]  
... because we exclude `db/` from rubocop 🙂

Douwe Maan [11:57 AM]  
@smcgivern: heh

Sean McGivern [11:59 AM]  
I guess that's because we don't want to change the old migrations? I wonder if it's worth enabling it and adding magic comments to all the previous ones to ignore rubocop

Douwe Maan [11:59 AM]  
@smcgivern: agreed
```

## What are the relevant issue numbers?

None.

## Screenshots (if relevant)

None, but if I remove the magic comment from the migration `20160416182152_convert_award_note_to_emoji_award.rb` I get:
```
$ be rubocop
Inspecting 1959 files
..................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................W....................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................

Offenses:

db/migrate/20160416182152_convert_award_note_to_emoji_award.rb:3:5: W: Lint/NestedMethodDefinition: Method definitions must not be nested. Use lambda instead.
    def up ...
    ^^^^^^

1959 files inspected, 1 offense detected
```

## Does this MR meet the acceptance criteria?

- [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [ ] API support added
- [ ] Tests
  - [ ] Added for this feature/bug
  - [ ] All builds are passing
- [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [ ] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

See merge request !4559
2016-06-10 10:38:48 +00:00
Douwe Maan a9a9f19b0b Merge branch 'gh-rate-limit' into 'master'
Wrap all rate limiting logic inside GitHub API client

## What does this MR do?

Move the actual rate limiting logic to GitHub API to clean the code inside the GitHub importer, and avoid code duplication.

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

No there aren't.

## Why was this MR needed?

Avoid code duplication to handle API rate limit in every call to the GitHub API.

## What are the relevant issue numbers?

There are none.

## Screenshots (if relevant)

Not relevant.

See merge request !4552
2016-06-10 10:34:19 +00:00
Douwe Maan e0f3e44b3e Merge branch '18447-investigate-smtp-error' into 'master'
Fix failing `EmailOnPush` spec.

Closes #18447 

- This should fix CI on master

/cc @smcgivern @ayufan @stanhu @pacoguzman 

See merge request !4582
2016-06-10 09:36:51 +00:00
Timothy Andrew 99d5a91d7a Fix failing EmailOnPush spec. 2016-06-10 14:11:02 +05:30
Jacob Schatz cea3cf177c Merge branch 'award-emoji-fixes' into 'master'
Award emoji fixes

Fixes #18357 #18325 and #18424

See merge request !4550
2016-06-09 23:21:50 +00:00
Fatih Acet 94826d9abe Minor MR comment fixes.
yes -> true
no -> false
. frequent -> .frequent-emojis
2016-06-10 01:56:41 +03:00
Robert Speicher e328eab0da Update CHANGELOG for 8.8.4 and 8.8.5
[ci skip]
2016-06-09 18:42:15 -04:00
Robert Speicher b51a36cb2b Merge branch 'fix-issue-15259-postgresql' into 'master'
Properly quote table name in Rake task for MySQL and PostgreSQL compatibility

!4318 broke the gitlab:db:drop_tables functionality for PostgreSQL.
    
Closes #15259

See merge request !4577
2016-06-09 22:35:47 +00:00
Jacob Schatz dbc4f71868 Merge branch 'milestone-tooltip' into 'master'
Add milestone expire date to the right sidebar

## What does this MR do?
Shows milestone expire date tooltip in the sidebar. It also shows the tooltip when sidebar is collapsed.

## Are there points in the code the reviewer needs to double check?
`common_utils.js.coffee` and `milestones_helper.rb` should be reviewed deeply.

## What are the relevant issue numbers?
https://gitlab.com/gitlab-org/gitlab-ce/issues/17355

## Screencast
![zngAcytBWq](/uploads/bd8514506aa5010aef9b081455ee90af/zngAcytBWq.gif)

See merge request !4448
2016-06-09 22:10:51 +00:00
Stan Hu bf92ea687f Properly quote table name in Rake task for MySQL and PostgreSQL compatibility
!4318 broke the gitlab:db:drop_tables functionality for PostgreSQL.

Closes #15259
2016-06-09 15:06:19 -07:00
Jacob Schatz 5f803f0fd1 Merge branch 'autocomplete-comment-fix' into 'master'
Checks for undefined when inserting autocomplete into textarea

## What does this MR do?

Correctly checks for undefined before inserting anything into the textarea when using autocomplete. This happens because the loading indicator tries to insert `@undefined` which we dont want to insert.

See merge request !4561
2016-06-09 21:47:45 +00:00
Stan Hu 4fbb284cfd Merge branch 'fix_issue_15259' into 'master'
Fix bug with SQL syntax error during backup restoration

## What does this MR do?
It properly escapes the table name in the `DROP TABLE IF EXISTS ...` statement used during restore of a backup.

## Are there points in the code the reviewer needs to double check?
Please check compatibility with PostgreSQL

## Why was this MR needed?
Fix an issue with backups can not be restored if MySQL is used as database for GitLab.

## What are the relevant issue numbers?
#15259 

## Screenshots (if relevant)
-

See merge request !4318
2016-06-09 21:44:10 +00:00
Phil HughesandJacob Schatz ef48dd01cf Checks based on whether data is loaded not undefined 2016-06-09 17:20:57 -04:00
Phil HughesandJacob Schatz 4456b41b6a Checks for undefined when inserting autocomplete into textarea 2016-06-09 17:20:57 -04:00
Jacob Schatz 69e72774f2 Merge branch 'fix-empty-user-projects-snippets-list' into 'master'
Fix empty user projects snippets list

## What are the relevant issue numbers?
Closes #17952 #17816 and  #17737 

cc: @lbennett  @jschatz1 

See merge request !4532
2016-06-09 21:17:50 +00:00
Jacob Schatz 5fcb091922 Merge branch 'dz-improve-ui-consistency-2' into 'master'
Improve ui consistency. Part 2

* Use responsive top-area on project branches and tags pages
* Use default button size in the content list controls
* Improve button margin for btn-grouped css class

For https://gitlab.com/gitlab-org/gitlab-ce/issues/18324

See merge request !4536
2016-06-09 21:07:47 +00:00
Jacob Schatz 600078cccf Merge branch 'due-date-field-ux-improv' into 'master'
Improved the UX of issue & milestone date picker

## What does this MR do?

Improves the UX of the date picker on issue form & milestone form.

## What are the relevant issue numbers?

Closes #18198 

## Screenshots (if relevant)

### Issues

![Screen_Shot_2016-06-06_at_09.28.29](/uploads/d9c192dff0d8076adc3ed6f005ea3790/Screen_Shot_2016-06-06_at_09.28.29.png)

### Project milestones

![Screen_Shot_2016-06-06_at_09.28.18](/uploads/2d03d72791c5fc6badfadb975a85af2b/Screen_Shot_2016-06-06_at_09.28.18.png)

### Group milestones

![Screen_Shot_2016-06-06_at_09.28.05](/uploads/0f28532396a16e6fd48ddea784ca28e3/Screen_Shot_2016-06-06_at_09.28.05.png)

See merge request !4485
2016-06-09 20:54:05 +00:00
Jacob Schatz 87c77718a4 Merge branch 'remove-chart' into 'master'
Only load Chart.js when necessary.

Only load Chart.js where it's used, namely the Graphs section. Follow up on !4394.

cc: @jschatz1 

See merge request !4516
2016-06-09 20:51:10 +00:00
Fatih Acet e885c2fd31 Ignore frequent emojis in search. 2016-06-09 23:50:06 +03:00
Jacob Schatz 2cb4cb2ee3 Merge branch 'issue_17607' into 'master'
Fix local timeago on user dashboard

## What does this MR do?
Fixes incorrect date times on tooltips on the dashboard page

## Are there points in the code the reviewer needs to double check?
Yes,  The tooltip has to be recreated again because we needed a custom CSS classname in order to fix the date being splitted into two lines.

## Why was this MR needed?
Because the datetimes were incorrect we have to have the same format for .timeago() instances.

## What are the relevant issue numbers?
#17607

## Screenshots (if relevant)

**Before**

<img src="/uploads/f40cd58e8086d9675262e98a1fe57885/Screen_Shot_2016-05-24_at_7.23.25_PM.png" width="705">

**After**

<img src="/uploads/bd48046ef11659cc742f827b3404fbcd/Screen_Shot_2016-05-24_at_7.22.29_PM.png" width="704">


See merge request !4285
2016-06-09 20:39:29 +00:00
Jacob Schatz c05604a6c2 Merge branch 'input-padding' into 'master'
Improve input padding, fix #18237.

## What does this MR do?
Improves horizontal padding for input fields.

## What are the relevant issue numbers?
#18237

## Screenshots (if relevant)

Before:

![Screen_Shot_2016-06-06_at_12.11.07_PM](/uploads/11d24c84e1ca8d268a5acc2b4e10bb77/Screen_Shot_2016-06-06_at_12.11.07_PM.png)

After:

![Screen_Shot_2016-06-06_at_12.10.38_PM](/uploads/cbb407d8fca1e8dc1ace2af6c0774181/Screen_Shot_2016-06-06_at_12.10.38_PM.png)

cc: @jschatz1 

See merge request !4489
2016-06-09 20:29:07 +00:00
Jacob Schatz edba48c6c4 Merge branch 'merge-conflicts-icon-color' into 'master'
Use warning color merge conflicts icon in MR status widget.

Fixes #18174 

### Before
![Screen_Shot_2016-06-06_at_18.00.56](/uploads/4a74b1710478daee5ee95b7c6b6a835f/Screen_Shot_2016-06-06_at_18.00.56.png)

### After
![Screen_Shot_2016-06-06_at_17.58.04](/uploads/28faefaebef30e4256390029c87b28bb/Screen_Shot_2016-06-06_at_17.58.04.png)

See merge request !4487
2016-06-09 20:28:47 +00:00
Phil HughesandJacob Schatz 7c88141b95 Fixed tests 2016-06-09 16:24:40 -04:00
Phil HughesandJacob Schatz be7b67d293 CHANGELOG 2016-06-09 16:24:40 -04:00
Phil HughesandJacob Schatz cc971f0309 Improved the UX of issue & milestone date picker
Closes #18198
2016-06-09 16:24:40 -04:00
Jacob Schatz 787b73f5d6 Merge branch 'note-edit-background-color' into 'master'
Edit form background color on highlighted note

## What does this MR do?

Added white background to edit form when in a highlighted note

## What are the relevant issue numbers?

Closes #18101 

## Screenshots (if relevant)

![Screen_Shot_2016-06-02_at_11.24.20](/uploads/c7c7fe710aa74d86152a109560fd0ebe/Screen_Shot_2016-06-02_at_11.24.20.png)

See merge request !4435
2016-06-09 20:15:33 +00:00
Fatih Acet 24b64edf09 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into milestone-tooltip 2016-06-09 23:08:30 +03:00
Fatih Acet c987837336 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into award-emoji-fixes 2016-06-09 23:07:39 +03:00
Robert Speicher a458211b65 Merge branch 'toggling-task-should-not-generate-todo' into 'master'
Toggling a task in a description with mentions doesn't creates a Todo

When user toggle a task list item in a description with a mention it
does not create an unnecessary Todo for that mention.

Closes #14116

See merge request !4568
2016-06-09 19:47:15 +00:00
Jacob Schatz d64517c37d Merge branch 'button-focus-state' into 'master'
Blur button tags when pressed to remove the focus state.

## Before 

![pemnD5exKl](/uploads/333155bf4a6c43715f3fc04d8f5aa35e/pemnD5exKl.gif)


## After

![dCPvSwsuWp](/uploads/9bcfbe59ac8de51e9d2c3edcb3d13ff3/dCPvSwsuWp.gif)

See merge request !4418
2016-06-09 19:45:17 +00:00
Alfredo Sumaran 541e663c12 Change date format to be non zero padded in order to fix failing test 2016-06-09 14:38:24 -05:00
Alfredo Sumaran 89523396ba Update method name for better understanding 2016-06-09 14:38:24 -05:00
Alfredo Sumaran 340aa444b7 Add tests for dates on tooltips 2016-06-09 14:38:24 -05:00
Alfredo Sumaran 6ae82d5707 Fix local timeago on user dashboard 2016-06-09 14:38:24 -05:00
Jacob Schatz d7e8adeabf Merge branch 'labels-ui-fix' into 'master'
Updated labels UI

- Fixed alignment issues
- Added dropdown to mobile to make the options look nicer & to save space

![Screen_Shot_2016-05-25_at_09.42.46](/uploads/ff59abd2310725965b388a62c6c1f2af/Screen_Shot_2016-05-25_at_09.42.46.png)

Closes #14227

See merge request !4273
2016-06-09 19:30:48 +00:00
Douglas Barbosa Alexandre 0098468dfb Update CHANGELOG 2016-06-09 16:01:08 -03:00
Douglas Barbosa Alexandre aff3c6999b Toggling a task in a description with mentions doesn't creates a Todo 2016-06-09 16:01:08 -03:00
Jacob Schatz ae126c5599 Merge branch '17562-filter-issues-is-only-visible-when-user-is-logged-in' into 'master'
#17562 Fixes issues list filter only visible when user is logged in

## What does this MR do?

1. Moves the issue/MR list search form out of the `if current_user` conditional, allowing guests to view the field.

2.  Adds some margin to the search form, this is because in mobile view for guest users, the field was not supported by the RSS button and the New Issue button and would drop to meet the list.

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

Are there any views where the `margin-bottom: 12px` will affect the styling?

## Why was this MR needed?

Guest user UX. Nothing feels better than increasing intangible value!

## What are the relevant issue numbers?

Fixes #17562.

## Screenshots (if relevant)

![Screen_Shot_2016-05-16_at_23.48.06](/uploads/cf0f0c48287517ac3e83b204b4ee09b2/Screen_Shot_2016-05-16_at_23.48.06.png)

/cc @jschatz1 

**UPDATE:**

![Screen_Shot_2016-05-20_at_16.13.22](/uploads/eb854838a514d0d54d0f13bde1636b8a/Screen_Shot_2016-05-20_at_16.13.22.png)

See merge request !4171
2016-06-09 18:43:58 +00:00
Robert Speicher 8138f340f8 Merge branch 'rs-fix-ldap-2fa-login' into 'master'
Fix 2FA-based login for LDAP users

The OTP input form is shared by both LDAP and standard logins, but when
coming from an LDAP-based form, the form parameters aren't nested in a
Hash based on the `resource_name` value.

Now we check for a nested `remember_me` parameter and use that if it
exists, or fall back to the non-nested parameters if it doesn't.

Somewhat confusingly, the OTP input form _does_ nest parameters under
the `resource_name`, regardless of what type of login we're coming from,
so that allows everything else to work as normal.

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

See merge request !4493
2016-06-09 18:43:22 +00:00
Jacob Schatz 95de1c1a6a Merge branch 'fix-changelog' into 'master'
Update CHANGELOG

Fixes wrong changelog entry for !4175

See merge request !4548
2016-06-09 18:24:15 +00:00
Alfredo Sumaran cda68e926c Update CHANGELOG 2016-06-09 12:35:55 -05:00
Connor Shea 7722caf9d5 Address feedback about wording. 2016-06-09 11:25:47 -06:00
Connor Shea d1506ebeec Add ISSUE_TEMPLATE.md and PULL_REQUEST_TEMPLATE.md to point contributors toward the GitLab.com repository.
This adds templates for Issues/Pull Requests in a `.github` directory. These only effect issues/PRs opened in the GitHub mirror of the GitLab project. As we're shutting these down, I thought it'd be good to direct users/contributors to open issues/contribute code in the "correct" project.
2016-06-09 11:03:28 -06:00
Fatih Acet b5018ac53d Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into award-emoji-fixes 2016-06-09 19:45:20 +03:00
Phil Hughes b0a80f69e3 Fixed failing label subscribe test 2016-06-09 17:19:14 +01:00
Phil Hughes 8e8ec82d35 Tests update 2016-06-09 17:19:14 +01:00
Phil Hughes 9830f9a23b Updated subscribe icon 2016-06-09 17:19:14 +01:00
Phil Hughes 051dc1d263 Fixed failing tests 2016-06-09 17:19:14 +01:00