Commit Graph
15495 Commits
Author SHA1 Message Date
Jacob Schatz d6de816982 Merge branch 'ci-page-ui-update' into 'master'
CI build page UI update

Closes #2569 

See merge request !3829
2016-06-10 15:44:21 +00:00
Jacob Schatz bedb711453 Merge branch 'icon-color-fix' into 'master'
Update activity SVG path

## What does this MR do?
Fixes SVG path so the activity icon is the correct color

## Screenshots (if relevant)
<img src="/uploads/ea948338ea816890851a8011b8b3255f/Screen_Shot_2016-06-09_at_8.43.05_AM.png" width="600px">


See merge request !4563
2016-06-10 15:39:13 +00:00
Jacob Schatz 0adc6d1bc0 Merge branch 'prettier-awardable-button-active' into 'master'
Made the awardable buttons prettier when active

## What does this MR do?

Made the active and hover state of the award emoji buttons prettier.

## Why was this MR needed?

'cause @JobV wanted them to look nicer 😉 

## What are the relevant issue numbers?

Closes #18379 

## Screenshots (if relevant)

![Screen_Shot_2016-06-09_at_09.10.44](/uploads/5ecd0f12679e3484de1ab1d2dbe50cd8/Screen_Shot_2016-06-09_at_09.10.44.png)

See merge request !4554
2016-06-10 15:38:52 +00:00
Jacob Schatz c7eecb4a20 Merge branch 'label-create-error-messages' into 'master'
Correctly shows label errors in dropdown

## What does this MR do?

Correctly shows any errors in the dropdown when creating a new label

## What are the relevant issue numbers?

Closes #18344 

## Screenshots (if relevant)

![Screen_Shot_2016-06-09_at_09.01.59](/uploads/58dc56b39db20a50adce6f12510025fc/Screen_Shot_2016-06-09_at_09.01.59.png)

See merge request !4553
2016-06-10 15:38:32 +00:00
Jacob Schatz e99559260b Merge branch 'user-search-dropdown' into 'master'
Revert change to search all users

## What does this MR do?

Reverts a change that allowed the user to search for all users in the author/assignee dropdown

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

Double check it isn't still searching all users

See merge request !4564
2016-06-10 15:30:28 +00:00
Jacob Schatz 2e7e2b5349 Merge branch 'project-dropdown-position-fix' into 'master'
Fixed project dropdown being overlapped by sidebar

## What does this MR do?

Changes the header expanded `padding` to `margin` to prevent the project dropdown from overlapping.

## What are the relevant issue numbers?

Closes #18410 

## Screenshots (if relevant)

![Screen_Shot_2016-06-10_at_10.38.00](/uploads/b569d6d4cbd126fd776cf849ebc1137d/Screen_Shot_2016-06-10_at_10.38.00.png)

See merge request !4583
2016-06-10 15:29:40 +00:00
Jacob Schatz 7aa6768812 Merge branch 'label-filter-fix' into 'master'
Fixed issue where label filtering didnt work

## What does this MR do?

The filterable option was missing which meant labels in the dropdown couldn't be filtered. This fixes that.

## What are the relevant issue numbers?

Closes #18375 

See merge request !4556
2016-06-10 15:23:39 +00:00
Rémy Coutable 133d5c1c64 Merge branch 'rename-ci-commit-phase-4' into 'master'
Rename Commit to Pipeline in TriggerRequest

Changes in TriggerRequest a `commit` to `pipeline`.


See merge request !4505
2016-06-10 14:31:21 +00:00
Paco GuzmanandYorick Peterse 136a4ea39b Cache the presence of an issue_tracker at project level
Using update_column to store the boolean flag to avoid
any side effects with the current state of the project
instance
2016-06-10 15:41:56 +02:00
Rémy Coutable f29fd65cdd Merge branch 'fix/incremental-trace-update-api' into 'master'
Fix UTF-8 handling in incremental trace update API

## What does this MR do?

This MR fixes invalid UTF-8 handling in incremental trace update API (used by GitLab Runner).

## Why was this MR needed?

Current version is using `.length` method to determine current trace size where Runner is using the trace size in bytes. Also this byte size is used in headers and file operations to agree the trace part to send. This is a problem when build trace contains any multi-byte UTF-8 characters. This MR is fixing this situation so all parts are using the same size in bytes.

### Runner -> API communication before fix:
```
Checking for builds... received                     runner=_token_
gitlab-ci-multi-runner 1.3.0~beta.26.gcfd63b9 (cfd63b9)  build=25 runner=_token_
Using Docker executor with image debian:jessie ...  build=25 runner=_token_
Pulling docker image debian:jessie ...              build=25 runner=_token_
25 Submitting build to coordinator... ok            runner=_token_
25 Appending trace to coordinator... ok             RemoteRange=0-158 RemoteState=running ResponseMessage=202 Accepted ResponseStatusCode=202 SentRange=0-158 runner=_token_
25 Appending trace to coordinator... ok             RemoteRange=0-491 RemoteState=running ResponseMessage=202 Accepted ResponseStatusCode=202 SentRange=158-505 runner=_token_
WARNING: 25 Appending trace to coordinator... range missmatch  RemoteRange=0-491 RemoteState= ResponseMessage=416 Requested Range Not Satisfiable ResponseStatusCode=416 SentRange=505-584 runner=_token_
WARNING: 25 Resending trace patch due to range missmatch  runner=_token_
25 Appending trace to coordinator... ok             RemoteRange=0-556 RemoteState=running ResponseMessage=202 Accepted ResponseStatusCode=202 SentRange=491-584 runner=_token_
WARNING: 25 Appending trace to coordinator... range missmatch  RemoteRange=0-556 RemoteState= ResponseMessage=416 Requested Range Not Satisfiable ResponseStatusCode=416 SentRange=584-663 runner=_token_
WARNING: 25 Resending trace patch due to range missmatch  runner=_token_
25 Appending trace to coordinator... ok             RemoteRange=0-621 RemoteState=running ResponseMessage=202 Accepted ResponseStatusCode=202 SentRange=556-663 runner=_token_
Build succeeded                                     build=25 runner=_token_
WARNING: 25 Appending trace to coordinator... range missmatch  RemoteRange=0-621 RemoteState= ResponseMessage=416 Requested Range Not Satisfiable ResponseStatusCode=416 SentRange=663-797 runner=_token_
WARNING: 25 Resending trace patch due to range missmatch  runner=_token_
25 Appending trace to coordinator... ok             RemoteRange=0-741 RemoteState=running ResponseMessage=202 Accepted ResponseStatusCode=202 SentRange=621-797 runner=_token_
25 Submitting build to coordinator... ok            runner=_token_
```

### Runner -> API communication after fix:
```
Checking for builds... received                     runner=_token_
gitlab-ci-multi-runner 1.3.0~beta.26.gcfd63b9 (cfd63b9)  build=26 runner=_token_
Using Docker executor with image debian:jessie ...  build=26 runner=_token_
Pulling docker image debian:jessie ...              build=26 runner=_token_
26 Submitting build to coordinator... ok            runner=_token_
26 Appending trace to coordinator... ok             RemoteRange=0-158 RemoteState=running ResponseMessage=202 Accepted ResponseStatusCode=202 SentRange=0-158 runner=_token_
26 Appending trace to coordinator... ok             RemoteRange=0-505 RemoteState=running ResponseMessage=202 Accepted ResponseStatusCode=202 SentRange=158-505 runner=_token_
26 Appending trace to coordinator... ok             RemoteRange=0-584 RemoteState=running ResponseMessage=202 Accepted ResponseStatusCode=202 SentRange=505-584 runner=_token_
26 Appending trace to coordinator... ok             RemoteRange=0-663 RemoteState=running ResponseMessage=202 Accepted ResponseStatusCode=202 SentRange=584-663 runner=_token_
Build succeeded                                     build=26 runner=_token_
26 Submitting build to coordinator... ok            runner=_token_
```

See merge request !4541
2016-06-10 13:08:22 +00:00
Rémy Coutable 3579edba1f Rename ci_commit -> pipeline
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-06-10 14:41:38 +02:00
Rémy Coutable 5324c93643 Rename MergeRequest#cannot_be_merged_because_build_is_not_success? to #mergeable_ci_state?
The logic of the method was obviously inverted.

Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-06-10 14:37:32 +02:00
Rémy Coutable 6dff7c1771 Improve initial implementation of the 'only_allow_merge_if_build_succeeds.rb' feature
Based on the feedback from reviewers.

Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-06-10 14:36:57 +02:00
Rui AndersonandRémy Coutable 07dbd6b388 Allow or not merge MR with failed build
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-06-10 14:36:54 +02:00
Kamil Trzcinski 9ba0f83d25 Merge remote-tracking branch 'origin/master' into rename-ci-commit-phase-4 2016-06-10 13:58:35 +02:00
Tomasz Maczukin 9dfb809c57 Fix UTF-8 handling in incremental trace update API 2016-06-10 13:09:34 +02:00
Phil Hughes e7950bd942 Fixed project dropdown being overlapped by sidebar
Closes #18410
2016-06-10 12:09:26 +01:00
Phil Hughes bd257c3d38 Fixed merge conflict that caused tests to fail with build 2016-06-10 12:07:51 +01:00
Phil Hughes dc6ec2adf8 CI build page UI update
Added sidebar
Removed elements not present in design
2016-06-10 12:07:51 +01:00
Phil Hughes 10f17c2fcd Correctly shows label errors in dropdown
Fixes #18344
2016-06-10 10:48:39 +01:00
Phil Hughes b2b3fb6c01 Revert change to search all users 2016-06-10 10:45:44 +01:00
Phil Hughes e0a90c467c Made the awardable buttons prettier when active
Closes #18379
2016-06-10 10:42:53 +01:00
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
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
Annabel Dunstone 12483e898b Update activity SVG path 2016-06-09 17:10:10 -05: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 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 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 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 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
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