Commit Graph
7978 Commits
Author SHA1 Message Date
Rémy Coutable b2dc917601 Group owner cannot request access to a project of their group
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-06-17 13:03:19 +02:00
Robert Speicher 933cd3478d Customize the Devise unlock_instructions email 2016-06-16 20:10:52 -04:00
Robert Speicher 3a5315d3ce Customize the Devise reset_password_instructions email 2016-06-16 20:10:52 -04:00
Robert Speicher dd1f56b5c4 Customize the Devise password_change emails 2016-06-16 20:10:52 -04:00
Jacob Schatz 0de4462468 Merge branch 'tree-file-title' into 'master'
Added title attribute to entries in tree view

## What does this MR do?

Adds a title attribute to entries in the tree view. Moe useful when files have long names.

## What are the relevant issue numbers?

Closes #18353 


See merge request !4709
2016-06-16 20:26:52 +00:00
Jacob Schatz e0f46ef1a5 Merge branch 'merge-request-default-source-branch-text' into 'master'
Added source branch text to dropdown toggle

## What does this MR do?

Previously, the dropdown toggle would default to "Select source branch", this changes that so that it defaults to the branch name and if that doesn't exist, it defaults to "Select source branch"

## Screenshots (if relevant)

![Screen_Shot_2016-06-07_at_12.20.10](/uploads/40d31e21297a99300050cf9f23bd7371/Screen_Shot_2016-06-07_at_12.20.10.png)

See merge request !4504
2016-06-16 19:29:28 +00:00
Jacob Schatz af1574e041 Merge branch 'dz-fix-mr-widget-padding' into 'master'
Add bottom padding for merge request command line text

Because without bottom padding text is too close to the UI tabs - hard to navigate



See merge request !4681
2016-06-16 18:46:50 +00:00
Jacob Schatz 280c95fc4a Merge branch 'mr-download-dropdown-alignment' into 'master'
Fixed alignment of download dropdown

## What does this MR do?

Correctly aligns the download dropdown on merge requests

## Screenshots (if relevant)

![Screen_Shot_2016-06-14_at_14.47.06](/uploads/9381f25110e5573e56aa5c3f46786df5/Screen_Shot_2016-06-14_at_14.47.06.png)

See merge request !4646
2016-06-16 17:59:32 +00:00
Jacob Schatz e11aae1a07 Merge branch 'push-event-banner-container' into 'master'
Fixed last push event banner not being in container

## What does this MR do?

Adds the last push event content into a container with the correct class.

## What are the relevant issue numbers?

Closes #18567 

## Screenshots (if relevant)

![Screen_Shot_2016-06-14_at_13.17.41](/uploads/4afa3d2c73e59c5ffbd53869e49baa92/Screen_Shot_2016-06-14_at_13.17.41.png)

See merge request !4644
2016-06-16 17:58:57 +00:00
Jacob Schatz a44a5fd487 Merge branch 'template_dropdown' into 'master'
Implements TemplateDropdown class to create custom template dropdowns

## What does this MR do?
Refactorize template dropdowns. This MR creates a base TemplateSelector class so it can be reused for multiple types of templates.

## 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
  - [x] All builds are passing
- [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

See merge request !4697
2016-06-16 17:29:45 +00:00
Jacob Schatz 666b565168 Merge branch 'build-scroll-controls-on-complete' into 'master'
Shows build scroll buttons after build is complete

## What does this MR do?

Shows the build scroll buttons whenever there is a build trace. Previously they were only shown when the build was active.

## What are the relevant issue numbers?

Closes #18515 

## Screenshots (if relevant)

![Screen_Shot_2016-06-13_at_11.42.42](/uploads/6e0577f46a0cc7b4f2f13b17c85d97da/Screen_Shot_2016-06-13_at_11.42.42.png)

See merge request !4621
2016-06-16 16:52:23 +00:00
Phil Hughes 537e8f2105 Added title attribute to enties in tree view
Closes #18353
2016-06-16 13:58:00 +01:00
Douwe Maan 077e32740c Merge branch 'backport-view-condition-improvement-from-ee-460' into 'master'
Fix permission checks in member row (backport from gitlab-org/gitlab-ee!460)

## What does this MR do?

It improves the check we use to display or not the members' access and controls in the members list.

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

No, I replaced an helper with just a permission check so I think it's a better solution.

## Why was this MR needed?

There were a spec failure in gitlab-org/gitlab-ee!460 because of the refactor done in the "request access" MR.

## What are the relevant issue numbers?

None.

## Does this MR meet the acceptance criteria?

- No CHANGELOG needed
- [x] Tests
  - [x] All builds are passing
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

See merge request !4670
2016-06-16 09:54:53 +00:00
Phil Hughes da592a737c Added source branch text to dropdown toggle
Previously, the dropdown toggle would default to "Select source branch",
this changes that so that it defaults to the branch name and if that
doesn't exist, it defaults to "Select source branch"
2016-06-16 08:42:35 +01:00
Alfredo Sumaran e8a467e094 Implements TemplateDropdown class to create custom template dropdowns
Also License dropdown has been ported to use our GL dropdown instead of Select2.
Fixes tests to make it work with current implementation
2016-06-16 00:28:45 -05:00
Fatih Acet fe125f8dc9 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into category-search-dropdown
# Conflicts:
#	app/assets/javascripts/lib/common_utils.js.coffee
2016-06-16 02:04:09 +03:00
Jacob Schatz 5d16d50ceb Merge branch 'toggle-whitespace-button-for-compare-page' into 'master'
Toggle whitespace button for compare page

## What does this MR do?

Adds whitespace button to compare branches page.

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

Ruby code.

## Why was this MR needed?

Compare branches UX

## What are the relevant issue numbers?

Closes #17881.

## Screenshots (if relevant)

![Screen_Shot_2016-06-09_at_18.39.48](/uploads/8995a7bc8bea7fa3ff19446ebe49fb88/Screen_Shot_2016-06-09_at_18.39.48.png)

## Does this MR meet the acceptance criteria?

- [x] [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
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

See merge request !4569
2016-06-15 22:48:39 +00:00
Jacob Schatz 1a832c8f00 Merge branch 'network-assets' into 'master'
Replace raphael-rails with raphael.js and split it from the rest of the JS

## What does this MR do?

Removes raphael.js and its related libraries from the default JS bundle.

It also removes raphael-rails because the gem is unmaintained and – for whatever reason – didn't want to cooperate with the way I was trying to require it.

This brings the default (compressed and minified) application.js from 354KB after the d3 MR (!4394) down to 324KB.

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

That tests pass and that there aren't errors on any pages (especially the Network page).

## Why was this MR needed?

It's only used on the Network page and was using way too much bandwidth for just one page.

## What are the relevant issue numbers?

#14372 #13165 

Follow-up to !4394 and !4516.

cc: @jschatz1 

See merge request !4519
2016-06-15 21:11:31 +00:00
Jacob Schatz f0c58c72a9 Merge branch 'milestone-date-clear' into 'master'
Due date can be removed from milestones

## What does this MR do?

Adds a button to milestone form to allow user to remove due date 

## What are the relevant issue numbers?

Closes #15063 

## Screenshots (if relevant)

![Screen_Shot_2016-06-02_at_08.32.03](/uploads/8bd4446abde745dd5b1e140a887ec694/Screen_Shot_2016-06-02_at_08.32.03.png)

See merge request !4428
2016-06-15 20:52:09 +00:00
Jacob Schatz 1af4ae33b4 Merge branch '17804-pipeline-download-text' into 'master'
#17804 Pipeline download artifacts text

## What does this MR do?

Improves wording to the pipeline artifacts download dropdown items.

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

I couldn't test this very easily, any tips?

## Why was this MR needed?

UX.

## What are the relevant issue numbers?

Closes #17804.

## Screenshots (if relevant)

See merge request !4391
2016-06-15 20:36:22 +00:00
Jacob Schatz bb1c0e88ae Merge branch 'issuable-sidebar-bold' into 'master'
Fixed issue with bold in issuable sidebar

## What does this MR do?

~~The sidebar contained both normal font weight & bold font weight, so this standardises them to bold.~~

After looking at the designs, i've updated the font weights & colors throughout the sidebar to correctly match them

## Screenshots (if relevant)

![Screen_Shot_2016-06-02_at_11.03.40](/uploads/0a3eb6a67ce5722c77f6adf2fe883017/Screen_Shot_2016-06-02_at_11.03.40.png)


See merge request !4398
2016-06-15 20:29:50 +00:00
Jacob Schatz 5444db293c Merge branch 'commits-ui' into 'master'
Updated commits UI

Closes #14633 

See merge request !4271
2016-06-15 20:24:13 +00:00
Jacob Schatz 5f22603b3f Merge branch 'issue_18575' into 'master'
Improve usability for prioritized labels

## What does this MR do?
- Adds an icon next to prioritized label rows serving as a hint to the user that the labels can be sorted by dragging them.
- Adds description about prioritized labels.
- Restores empty message when removing all prioritized labels.

## Screenshots (if relevant)

![labels](/uploads/1da16c4c54a894fa45ccc47e3a5bdf7a/labels.gif)

Closes #18575 

See merge request !4652
2016-06-15 19:50:02 +00:00
Jacob Schatz 7094a4d75d Merge branch 'new-project-mobile' into 'master'
New Project page improvements for mobile

## What does this MR do?

Redesigns the "Project path" fields on the New Project page.

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

Not that I know of, nothing I changed should break any other pages.

## Why was this MR needed?

The new project page was unusable on mobile because the project name text field didn't have enough space.

## What are the relevant issue numbers?

Fixes #18599.

## Screenshots (if relevant)

Before:

![Screen_Shot_2016-06-15_at_12.38.58_PM](/uploads/046a824b283e24266cabc9ea3dfb169c/Screen_Shot_2016-06-15_at_12.38.58_PM.png)

After:

![Screen_Shot_2016-06-15_at_12.37.19_PM](/uploads/6d01310192965b413bfedd9c8d2129f7/Screen_Shot_2016-06-15_at_12.37.19_PM.png)

![Screen_Shot_2016-06-15_at_12.37.28_PM](/uploads/3944a0f0ab04373ec92f7cafe90872df/Screen_Shot_2016-06-15_at_12.37.28_PM.png)

## Does this MR meet the acceptance criteria?

- [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry 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)

cc: @jschatz1 @dzaporozhets 

See merge request !4687
2016-06-15 19:44:21 +00:00
Jacob Schatz 64a09d6e02 Merge branch 'pinned-sidebar' into 'master'
Pinned sidebar navigation option

## What does this MR do?

Gives the ability to pin the sidebar navigation. Pinning is only possible on screens with above `lg` which is `1200px` if not it reverts to being hidden by default.

## What are the relevant issue numbers?

Closes #18542 

## Screenshots (if relevant)

### Un-pinned

![Screen_Shot_2016-06-15_at_17.29.08](/uploads/82b7495df6ea46a2334a7c25d03b019b/Screen_Shot_2016-06-15_at_17.29.08.png)

### Pinned

![Screen_Shot_2016-06-15_at_17.29.41](/uploads/3eb381be807985d0a9583f000cb802f9/Screen_Shot_2016-06-15_at_17.29.41.png)

See merge request !4683
2016-06-15 19:21:17 +00:00
Connor Shea 190685741c Move group creation text to below the 'Project owner' field. 2016-06-15 12:55:05 -06:00
Connor Shea 01d9bffdd8 Improve New Project page for mobile.
Separate the New Project page's "Project path" grouped fields into separate fields.

Fixes #18599.
2016-06-15 12:43:32 -06:00
Phil Hughes 7886692147 Moved pinned button to the bottom
Changed breakpoint width to 1440px
2016-06-15 19:35:37 +01:00
Dmitriy Zaporozhets e09d573e2f Merge branch '18338-change-admin-navigation-to-match-new-ui' into 'master'
Resolve "Change admin navigation to match new UI"

## What does this MR do?
Moves admin navigation to layout nav to match Project, Groups, and Profile navigation

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

## Why was this MR needed?

## What are the relevant issue numbers?
Closes #18338

## Screenshots (if relevant)
![Screen_Shot_2016-06-14_at_10.26.40_AM](/uploads/f0b8c8b259da16d929be2b36e8eeafb8/Screen_Shot_2016-06-14_at_10.26.40_AM.png)
![Screen_Shot_2016-06-14_at_10.26.44_AM](/uploads/07d9ece2063dfcfec1f0f2647d8ee782/Screen_Shot_2016-06-14_at_10.26.44_AM.png)
## 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 !4650
2016-06-15 16:35:46 +00:00
Phil Hughes e3529d5432 Pinned sidebar navigation option
Closes #18542
2016-06-15 17:23:49 +01:00
Rémy Coutable b21980bff4 Fix permission checks in member row
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-06-15 18:17:45 +02:00
Jacob Schatz a69cd32114 Merge branch 'show_number_of_mrs_in_milestone_page' into 'master'
Show number of processed MRs in milestone page

closes #14025 

![Screen_Shot_2016-05-02_at_6.20.34_PM](/uploads/9208e58c0e0c77133bd73332ee3b3342/Screen_Shot_2016-05-02_at_6.20.34_PM.png)

See merge request !4006
2016-06-15 15:56:14 +00:00
Dmitriy Zaporozhets c279f40bc4 Add bottom padding for merge request command line text
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-06-15 18:51:15 +03:00
Alfredo Sumaran 0cb7d834f7 Add handler icon to prioritized labels 2016-06-15 10:35:58 -05:00
Rémy Coutable 56ca485955 Fix wrong partial path in JS view
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-06-15 17:27:37 +02:00
Jacob Schatz 93a496d270 Merge branch 'mr-buttons-update' into 'master'
Fixed issue with MR buttons being in a group

## What does this MR do?

Fixes design issue with the buttons in the merge request widget

## Screenshots (if relevant)

![Screen_Shot_2016-06-09_at_14.13.32](/uploads/44ac4175f5a97a8d7baf97be6eebc684/Screen_Shot_2016-06-09_at_14.13.32.png)


See merge request !4562
2016-06-15 15:23:02 +00:00
Rémy Coutable a8b4630190 Merge branch 'docker-registry-manifest-v1' into 'master'
Add support for Docker Registry manifest v1

## What does this MR do?

Adds support for Manifest V1 generated by older versions of Docker (before 1.10).

## What are the relevant issue numbers?

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


See merge request !4669
2016-06-15 15:07:39 +00:00
Jacob Schatz d1f0ad45b0 Merge branch 'tooltip-change' into 'master'
Update project star/unstar tooltip

## What does this MR do?
Fixes project toggle star button tooltip to show actual tooltip for its state.

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

## Why was this MR needed?
- When you star a project tooltip wasn't changing.
- When you star a project and refresh the page, tooltip was still showing `Star Project`

## What are the relevant issue numbers?
Fixes #18143

## Screenshots (if relevant)

### Before 
![Screen_Shot_2016-06-15_at_15.31.57](/uploads/e005951c23eeed7c2761a0ec1911f3ce/Screen_Shot_2016-06-15_at_15.31.57.png)

### After
![tooltip-change](/uploads/4caec99eac6ffcc7331947fdfdb9e051/tooltip-change.gif)

## Does this MR meet the acceptance criteria?

- [x] [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
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

See merge request !4672
2016-06-15 14:55:00 +00:00
Annabel Dunstone 6d10d8251c Rearrange order of tabs 2016-06-15 09:54:38 -05:00
Kamil Trzcinski 3213023dd6 Show created_at in table column 2016-06-15 16:16:21 +02:00
Annabel Dunstone f1245bde89 Nest li elements directly under ul 2016-06-15 09:11:17 -05:00
Annabel Dunstone d3b6c18526 Move builds tab to admin overview 2016-06-15 09:10:16 -05:00
Annabel Dunstone d1c3f3d872 Add monitoring link with subtabs 2016-06-15 09:10:16 -05:00
Annabel Dunstone 922a164d60 Add sub links to overview 2016-06-15 09:10:16 -05:00
Annabel Dunstone 736ba42b24 Add counter for abuse reports 2016-06-15 09:10:16 -05:00
Annabel Dunstone 58c8661cd1 Remove admin layout-nav counters 2016-06-15 09:10:16 -05:00
Annabel Dunstone 10ae4a8e71 Move admin nav to horizontal layout nav 2016-06-15 09:10:16 -05:00
Douwe Maan a95f8b9a82 Merge branch 'stanhu/gitlab-ce-fix-error-500-false-binary-negative' 2016-06-15 15:56:02 +02:00
Jacob Schatz a6042a2dbb Merge branch 'list-items' into 'master'
Remove div between ul and li

## What does this MR do?
Adds `container_class`to `ul` instead of `div` for valid HTML

## What are the relevant issue numbers?
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4592#note_12420843



See merge request !4633
2016-06-15 13:53:10 +00:00
Rémy Coutable be09845914 Merge branch 'environments-and-deployments' into 'master'
Add environments and deployments

This MR is a continuation of https://gitlab.com/gitlab-org/gitlab-ce/issues/17009.

The current implementation is as follow:
1. We have two new tables: `environments` and `deployments`.
2. We have a new tab: `Environments` under `Pipelines` where you can see all you environments and add a new one.
3. We add a new option to `.gitlab-ci.yml` to track where we should create a deployment for environment.
4. If environment in `.gitlab-ci.yml` is specified it will create a deployment. **If environment does not exist it will be created.** (this got changed)
5. The deployment is always successful and shows the time of the action, in that case a build that presumably should do deployment. In the future we could extend deployment with statuses: success, failure. We could extend deployments with information that this is partial or full deployment.
6. User have to create environments that he will track first.
7. User can remove environments.
8. User can retry/rollback past deployment (in that case we retry past build). The new build when succeeds it will create a new deployment.
9. Currently environment have only one parameter: `name`. In the future it should have: `variables`, `credentials` and possibly `runners` and maybe other resources.
10. Currently deployment have this parameters: `sha`, `ref`, `deployable (in this case a build)`, `user (who triggered a deployment)`, `created_at`.

The `.gitlab-ci.yml`:
```
deploy to production:
  stage: deploy
  script: dpl travis...
  environment: production
```

What needs to be done:
- [x] Write initial implementation
- [x] Improve implementation (@ayufan)
- [x] Write tests (@ayufan)
- [x] Improve UX of the forms (cc @markpundsack) - reviewed by @markpundsack
- [x] Improve implementation of the views (cc @jschatz1) - done by @iamphill 
- [x] Write .gitlab-ci.yml documentation for `environments` - done by @ayufan
- [ ] Write user documentation (@ayufan and @markpundsack)

See merge request !4605
2016-06-15 13:48:09 +00:00