Commit Graph
29581 Commits
Author SHA1 Message Date
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
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
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
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
Phil Hughes e7ca709a92 Updated labels UI
Closes #14227
2016-06-09 17:19:14 +01:00
Douwe Maan 3803b380b4 Merge branch 'fix-git-http-routing' into 'master'
Ensure only IDs ending in .git perform git actions

## What does this MR do?

Rails's routing is pretty strange. Previously, `GET /namespace/project/info/refs` would go to the Git HTTP controller (if the redirect for that case was taken out).

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

The specs fail if the redirect is moved to above the Git HTTP routes, removed altogether, or the Git HTTP constraints are changed. But there might still be missing cases.

## Why was this MR needed?

The master build and HTTP cloning were both broken.

## What are the relevant issue numbers?

Closes #18376.

## Screenshots (if relevant)

Nope.

## Does this MR meet the acceptance criteria?

- [x] [not needed] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [x] [not needed] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [ ] (not needed) API support added
- [ ] Tests
  - [x] Added for this feature/bug
  - [ ] All builds are passing
- [x] 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 !4558
2016-06-09 15:01:10 +00:00
Sean McGivern bf63964b4d Add test for getting info/refs from repo 2016-06-09 14:26:52 +01:00
Sean McGivern df5fb28a3a Ensure only IDs ending in .git perform git actions
It doesn't seem possible to set constraints based on format for project
IDs ending in .git, so set the constraint on the ID and ensure the
format is nil to avoid the case where the project ID is something like
project.git.foo.
2016-06-09 11:53:11 +01:00
Douwe Maan 30ee4ea665 Merge branch 'saml-ldap-link-flow' into 'master'
Adjust the SAML control flow to allow LDAP identities to be added to an existing SAML user.

## What does this MR do?

It correctly lets an existing SAML user to add their LDAP identity automatically at login.

## Why was this MR needed?

A customer had issues with the `auto_link_ldap_user` feature. The flow was not working if there was an account with a SAML identity, but no LDAP identity. GitLab would pick up the correct LDAP person, but due to the order of the flow, that LDAP person was never associated with the user.

## What are the relevant issue numbers?

Fixes #17346 

/cc @dblessing @balameb @stanhu 

See merge request !4498
2016-06-09 10:48:31 +00:00
Yorick Peterse 1e4db9ed0f Merge branch 'make-omniauth-tests-to-not-modify-global-state' into 'master'
Make Omniauth providers specs to not modify global configuration

See merge request !4534
2016-06-09 09:55:14 +00:00
Rémy Coutable 3d72cb897e Merge branch '18019-fix-wiki-linking' into 'master'
Fix wiki linking behavior for markdown wiki pages

Related to #18019 

- As per the documentation in !4372 

## TODO
- [ ] !4432 Have wiki linking behave as per the documentation
    - [x] Move `WikiLinkFilter` specs to the pipeline level
    - [x] Verify current behavior on wiki `show` page
    - [x] Fix current behavior on wiki `show` page
    - [x] Verify current behaviour on wiki preview
    - [x] Fix current behaviour on wiki preview
        - [x] Rewrite all links and get preview links working
        - [x] Make sure all links are on-par with the wiki `show` page
        - [x] TDD `WikiLinkFilter` and get it working
        - [x] Hook `WikiLinkFilter` up
    - [x] Fix tests 
        - [x] Fix `markdown_spec`
        - [x] Fix `wiki` spinach feature
        - [x] Wait for [build](https://gitlab.com/gitlab-org/gitlab-ce/commit/4f50dd2/builds) to pass
        - [x] Make sure all wiki-related pages are working as expected (history, all pages, etc.)
    - [x] Test in different ruby versions
    - [x] GitLab instances hosted on a relative URL
    - [x] Non-markdown rendering formats?
        - [x] RDoc
        - [x] ASCIIDoc
        - [x] Create issues to fix things for RDoc and ASCIIDoc
    - [x] Gauge performance impact
    - [x] Refactor
    - [x] Re-organize commits
    - [x] Make sure [build](https://gitlab.com/gitlab-org/gitlab-ce/commit/f860e9a8dcabe7d5f160c32fc549807c98baa4a1/builds) passes
    - [x] Respond to @rymai's comments
        - [x] `class WikiLinkFilter < HTML::Pipeline::Filter`
        - [x] blank line after guard clause
        - [x] keyword arguments for `wiki` and `slug`
        - [x] invert the condition
        - [x] inline `user` in spec
        - [x] Make sure spec names are not out of date
        - [x] Comment for each rewrite rule
    - [x] Add CHANGELOG entry
    - [x] Reorganize commits
    - [x] Make sure [build](https://gitlab.com/gitlab-org/gitlab-ce/commit/19b91e749a6320d12fb299d33f1f6440777e0e26/builds) passes
    - [ ] Wait for merge

See merge request !4432
2016-06-09 08:37:27 +00:00
Timothy Andrew 19b91e749a Add #18019 to the CHANGELOG. 2016-06-09 10:16:46 +05:30
Timothy Andrew e6b1d1669b Hook up the updated WikiLinkFilter to the wiki controllers.
- Need to pass in a `page_slug` to the filter, so it can rewrite based
  on the current page (all links are rewritten to the level of the app root).
- The earlier `markdown_preview` endpoint was at the level of the wiki.
  We need to know the current page (for rewriting, as above), so this
  commit moves the endpoint to the level of a wiki page.
- Fix all tests
2016-06-09 10:15:01 +05:30
Timothy Andrew 8e71c19a69 Implement the correct linking behaviour in WikiLinkFilter.
Original Comments
=================

- Linking behaves as per rules documented here:
  https://gitlab.com/gitlab-org/gitlab-ce/blob/16568-document-wiki-linking-behavior/doc/markdown/wiki.md
- All links (to other wiki pages) are rewritten to be at the level of
  the app root. We can't use links relative to the current
  page ('./foo', 'foo', '../foo'), because they won't work in the
  markdown preview, where the current page is suffixed with `/edit`
- Move existing `WikiLinkFilter` specs to `WikiPipeline` spec. It makes
  sense to run these tests on the combined output of the pipeline,
  rather than a single filter, since we can catch issues with
  conflicting filters.
- Add more tests to cover the new linking

@rymai's Review
===============

- Classes nested under `WikiLinkFilter` should declare `WikiLinkFilter`'s
  inherit, so nothing changes if the nested class is loaded first.
- Add a blank line after a guard clause
- Use keyword arguments for the `Rewriter` constructor
- Invert a condition - use `if` instead of `unless`
- Inline a `let` in `WikiPipeline` spec - it was only used in a single place
- Change out of date spec names
- Add a comment for every rewrite rule in `Rewriter`
2016-06-09 10:04:15 +05:30
Jacob Schatz 13fd88faa3 Merge branch 'fix-award-emoji-hidden' into 'master'
Shows award emoji for comments to all users who are logged in.

## What does this MR do?
Fixes the award emoji picker not showing up for users who weren't able to edit another user's comment.

## Screenshots (if relevant)
Before:

![Screen_Shot_2016-06-08_at_5.18.04_PM](/uploads/a8b40ba319481f53d55de055d84649b9/Screen_Shot_2016-06-08_at_5.18.04_PM.png)

After (logged in):
![Screen_Shot_2016-06-08_at_5.16.16_PM](/uploads/535edcca6fbdd8834beda39399f85384/Screen_Shot_2016-06-08_at_5.16.16_PM.png)

After (logged out):
![Screen_Shot_2016-06-08_at_5.15.08_PM](/uploads/7f0dff751714c7d20f78b56893cacd59/Screen_Shot_2016-06-08_at_5.15.08_PM.png)

cc: @fatihacet 

See merge request !4547
2016-06-09 00:27:09 +00:00
Jacob Schatz f5818baffd Merge branch 'mention-loading-indicator' into 'master'
Show loading indicator for autocomplete

![autocomplete](/uploads/397df34689aeb5f4cbca99aea209c8cf/autocomplete.gif)

Closes #15435

See merge request !4182
2016-06-08 23:38:43 +00:00
Jacob Schatz e382f13068 Merge branch '17284-Edit-form-does-not-cancel-correctly' into 'master'
#17284 Edit form does not cancel correctly

## What does this MR do?

Replaces the markdown textarea with the currently saved note text when the note edit is cancelled.

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

No

## Why was this MR needed?

Allows the user to revert back to the original note text, as expected, using cancel.

## What are the relevant issue numbers?

Fixes #17284.

## Screenshots

![17284](/uploads/c3598de6f8e70d52275ef25907d92d42/17284.gif)

See merge request !4175
2016-06-08 23:38:29 +00:00
Jacob Schatz cc54b74a3c Merge branch 'nav-scroll-bug' into 'master'
Side nav scrolls if content height taller than screen

## What does this MR do?
Header logo is now fixed at top; put back scrolling functionality in side nav

## Screenshots (if relevant)
<img src="/uploads/e1d1b60c296c39c61d7fe7da22b6c52d/scroll.gif" width="600px">

See merge request !4513
2016-06-08 23:32:47 +00:00
Robert Speicher 5d66e0e0e3 Merge branch 'git-http-no-authenticity-token' into 'master'
Disable CSRF protection when serving Git HTTP clients

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

See merge request !4538
2016-06-08 23:29:23 +00:00
Connor Shea bdc995bf00 Shows award emoji for comments to all users who are logged in. 2016-06-08 17:09:48 -06:00
Patricio Cano 9282810fb7 Syntax fixes and better logging around the ldap_person method. 2016-06-08 18:09:43 -05:00
Jacob Schatz 0001a0cf9d Merge branch '17240-svg' into 'master'
Add new icons in left sidebar and layout nav

Closes #17609    
Closes #17240    
Closes #17321    

![Screen_Shot_2016-06-02_at_8.47.38_AM](/uploads/f254fe81cba65cbdeb8e5720f0b2fc19/Screen_Shot_2016-06-02_at_8.47.38_AM.png)
![Screen_Shot_2016-06-02_at_8.53.33_AM](/uploads/2c27284f0a4916fe447794d9b663c4df/Screen_Shot_2016-06-02_at_8.53.33_AM.png)

@skyruler I couldn't find the icons for `Projects`, `Merge Requests`, `Snippets`, or `Help` in the design repo. Do you have them available somewhere?

See merge request !4268
2016-06-08 22:58:09 +00:00
Jacob Schatz 8578f4011a Merge branch '18333-layout-bug' into 'master'
Use container helper instead of hard coded container

## What does this MR do?
Add `container_class` helper class to fix layout bug

## What are the relevant issue numbers?
#18333 
## Screenshots (if relevant)
Fixed:    
![Screen_Shot_2016-06-08_at_2.03.38_PM](/uploads/6e7575d711efb8eaf6ba641907b2d607/Screen_Shot_2016-06-08_at_2.03.38_PM.png)
Fluid:     
![Screen_Shot_2016-06-08_at_2.03.56_PM](/uploads/33d3f73781ca9ed129f853abfe9feb4b/Screen_Shot_2016-06-08_at_2.03.56_PM.png)

See merge request !4543
2016-06-08 21:28:36 +00:00
Annabel Dunstone a280116a05 Fix activity SVG 2016-06-08 16:15:30 -05:00
Jacob Schatz b4812e2e86 Merge branch 'dropdown-link-lineheight' into 'master'
Fixed dropdown link line-height

## What does this MR do?

Fixes line-height issue on dropdown menu links

## Why was this MR needed?

The line-height of some dropdown links were taking the parent, most noticeable the commit header

## Screenshots (if relevant)

Before:

![Screen_Shot_2016-06-08_at_12.26.13](/uploads/51d6bbb4d727da0e3f27d715d6556d4f/Screen_Shot_2016-06-08_at_12.26.13.png)

After:

![Screen_Shot_2016-06-08_at_12.25.03](/uploads/2dcbfaa67982500eef42cfe4247cd54d/Screen_Shot_2016-06-08_at_12.25.03.png)

See merge request !4531
2016-06-08 20:59:46 +00:00
Jacob Schatz 2268c6c70e Merge branch 'dz-improve-ui-consistency' into 'master'
Improve ui consistency

* Decline idea of using gray buttons actively in UI
* remove icons from some buttons that already has text
* standardizes margin between buttons 


First step in https://gitlab.com/gitlab-org/gitlab-ce/issues/18324 

See merge request !4533
2016-06-08 20:51:52 +00:00
Robert Speicher 18f5cca25b Merge branch '14098-customize-after-sign-up-path' into 'master'
Allow custom text on 'almost there' page

Add a new application setting, after_sign_up_text. This is text to be
rendered as Markdown and shown on the 'almost there' page after a user
signs up, but before they've confirmed their account.

Closes #14098.

See merge request !4098
2016-06-08 20:49:01 +00:00