Commit Graph

21670 Commits

Author SHA1 Message Date
Fatih Acet d62ee36472 Merge branch '25092-change-font-commit-list-in-system-note' into 'master'
Resolve "Change font of commit list in a system note according to proposed design"

## What does this MR do?
This MR  closes #25092 
## Are there points in the code the reviewer needs to double check?
NR
## Why was this MR needed?
To improve `UX`
## Screenshots (if relevant)
**Before**
![before](/uploads/50b72a1f818c5a5dc633b06eee3eff92/before.png)
**After**
![after](/uploads/7a488fe22a942af8846fcd202da8f400/after.png)
## Does this MR meet the acceptance criteria?

- [ ] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) 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 [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [ ] 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 it does - rebase it please)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

## What are the relevant issue numbers?


Closes #25092

See merge request !7822
2016-11-30 19:58:16 +00:00
Fatih Acet e618990af4 Merge branch 'issue_24363' into 'master'
Fix appearance in error pages

## What does this MR do?
The error pages under `app/views/errors/*` looks like the error page for 404 `public/404.html`

## Are there points in the code the reviewer needs to double check?
I restructured how the GitLab logo is shown in the `public/404.html` and all the pages under  `app/views/errors/*`.

## Why was this MR needed?
#24363 
## Screenshots (if relevant)
Before
![Screen_Shot_2016-11-10_at_11.11.48](/uploads/b134195dd2d63d093ec0a6d906761e3f/Screen_Shot_2016-11-10_at_11.11.48.png)

After
![Selection_064](/uploads/d57601513d6ab3c0b5e1c7448ecf6ffc/Selection_064.png)![Selection_057](/uploads/50220320bad0b1c14ec8d1e89e490373/Selection_057.png)![Selection_060](/uploads/1e04e4ce36ef7fa5bee4e7916b0e5de2/Selection_060.png)![Selection_059](/uploads/0a4a02a8bae132232d4331adce132d4a/Selection_059.png)![Selection_062](/uploads/3d96f0e8c0e5f0f73b3b51cbb168c76a/Selection_062.png)![Selection_061](/uploads/e127a2b2acc810a9176d02927f1c8dbc/Selection_061.png)![Selection_063](/uploads/e3f682c293539ff195a78018da872abf/Selection_063.png)


## Does this MR meet the acceptance criteria?

- [X] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) 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 [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [ ] 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 it does - rebase it please)
- [X] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

## What are the relevant issue numbers?

See merge request !7635
2016-11-30 19:19:00 +00:00
Annabel Dunstone Gray c993cbbeaa Merge branch '25044-md-header-tabs' into 'master'
25044 Make md header tabs match nav tabs

## What does this MR do?
Changes styling of md-header tabs to match navigation tabs

## Screenshots (if relevant)

## Does this MR meet the acceptance criteria?

- [ ] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) 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 [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [ ] 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 it does - rebase it please)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

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

See merge request !7801
2016-11-30 19:11:53 +00:00
Annabel Dunstone Gray d2ba27993e Merge branch '24894-style-system-note-in-commit-discussion' into 'master'
new system note design for commit discussion

## What does this MR do?
This MR implement new system notes design for discussion on a commit.

## Are there points in the code the reviewer needs to double check?
NR
## Why was this MR needed?
It improves UX and coherent style in UI
## Screenshots (if relevant)
**before**
![commit-discussion-before](/uploads/b68ab7cce583a18ac066691448f955e7/commit-discussion-before.png)

**After**
![commit-discussion-after](/uploads/e9c0cb48c29fdd9b6de6f23a3c588d03/commit-discussion-after.png)
## Does this MR meet the acceptance criteria?

- [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) 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
- [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [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 it does - rebase it please)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

## What are the relevant issue numbers?


Closes #24894

See merge request !7721
2016-11-30 18:54:49 +00:00
Filipa Lacerda cd5813ee21 Fix comma-dangle in function's arguments errors 2016-11-30 14:24:12 +00:00
Filipa Lacerda 54e6287404 Improvements after review 2016-11-30 12:44:42 +00:00
Filipa Lacerda edc97c9dc6 Use created date from last_deployment
Adds test

Adds changelog entry
2016-11-30 12:44:42 +00:00
Rémy Coutable 2706550a96 Merge branch '25031-do-not-raise-error-in-autocomplete' into 'master'
Do not raise error in AutocompleteController#users when not authorized

Closes #25031

See merge request !7817
2016-11-30 11:23:31 +00:00
Kamil Trzciński 7e5fa10b66 Merge branch 'fix/create-pipeline-with-builds-in-transaction' into 'master'
Create pipeline along with builds in the transation

## What does this MR do?

This MR makes it possible to create pipeline along with all associated builds in the transaction, to avoid having empty pipelines when asynchronous job gets terminated.

This will simplify implementation of `PipelineUnlockWorker` in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6988 and improve reliability of the CI as a whole.

## What are the relevant issue numbers?

Related to #24361

See merge request !7742
2016-11-30 11:16:53 +00:00
Kamil Trzciński 21b90ef866 Merge branch 'fix/rename-merge-request-head-pipeline' into 'master'
Rename `MergeRequest#pipeline` to `head_pipeline`

## What does this MR do?

This MR renames `MergeRequest#pipeline` to `MergeRequest#head_pipeline`

## Does this MR meet the acceptance criteria?

- [x] All builds are passing

## What are the relevant issue numbers?

Closes #24810

See merge request !7783
2016-11-30 11:09:40 +00:00
Douwe Maan b755bbad65 Merge branch 'fix/ca-no-date' into 'master'
fix for builds with no start date throwing an error in cycle analytics events

Instead of the error, we should inform that there is no start date

- [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added
- Tests
  - [x] Added for this feature/bug
  - [x] All builds are passing
- [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [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 it does - rebase it please)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

## What are the relevant issue numbers?

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

See merge request !7738
2016-11-30 10:01:56 +00:00
Nur Rony 49ae66fe95 adjust commit list ul height 2016-11-30 14:55:15 +06:00
Nur Rony e77c867dba adjust padding in list 2016-11-30 14:55:15 +06:00
Nur Rony df085e4143 makes ul bullets fully visible 2016-11-30 14:55:15 +06:00
Nur Rony 89bd04cda1 shows commits SHAs in monospcase and commit messaages in normal font 2016-11-30 14:55:15 +06:00
Nur Rony 28638356a2 removes redundant styles 2016-11-30 14:51:12 +06:00
Nur Rony 11de793c27 new system note design for commit discussion 2016-11-30 14:51:12 +06:00
Semyon Pupkov f5e8337c7b Do not raise error in AutocompleteController#users when not authorized
https://gitlab.com/gitlab-org/gitlab-ce/issues/25031
2016-11-30 10:09:14 +05:00
Douwe Maan f0c44b5db9 Merge branch 'improve/invite-accept-page' into 'master'
Alert user when logged in user email is not the same as the invitation

## What does this MR do?

Add a note to the invitation page when the logged in user email is not the same as the invitation.

## Why was this MR needed?

Help users to not accept invitations logged in with a wrong account.

## Screenshots (if relevant)

![1](/uploads/78ac6d3db67c9ed60cf74a20ad240d0b/1.png)

## Relevant issues

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

See merge request !7803
2016-11-30 03:20:04 +00:00
Douwe Maan ef3a898d9a Merge branch 'ee-1137-follow-up-protected-branch-users-and-groups' into 'master'
CE-specific changes for gitlab-org/gitlab-ee#1137

## What does this MR do?

- gitlab-org/gitlab-ee#1137 is a `technical debt` issue to clean up the EE protected branch access levels (for users and groups) implementation.
- Some of this cleanup bleeds over to code shared by CE and EE, which is why this MR is required.
- An EE-specific MR has also been created: gitlab-org/gitlab-ee!927

See merge request !7821
2016-11-30 03:18:10 +00:00
Annabel Dunstone Gray 32f6e444cd Merge branch '24999-fix-project-avatar-alignment' into 'master'
Fix the width of project avatars in order to adjust alignment within their container element

## What does this MR do?
Adjusts the width of project avatars in order to fix their alignment within the container elements.

## Are there points in the code the reviewer needs to double check?
To make sure there are no unintentional styles changes on unrelated elements.

## Why was this MR needed?
To fix the issue seen below.

## Screenshots (if relevant)
Before: ![Screen_Shot_2016-11-26_at_3.55.58_PM](/uploads/c0012ee7bb5f9e83af41190f71f030fa/Screen_Shot_2016-11-26_at_3.55.58_PM.png)

After: ![Screen_Shot_2016-11-26_at_3.56.17_PM](/uploads/c1236216382e6baa094570c17565e8cf/Screen_Shot_2016-11-26_at_3.56.17_PM.png)

Affected pages: ![Screen_Shot_2016-11-26_at_4.12.38_PM](/uploads/8db6d86a5998843e7b7a755fb4000add/Screen_Shot_2016-11-26_at_4.12.38_PM.png)

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

See merge request !7772
2016-11-30 01:08:54 +00:00
Annabel Dunstone Gray 3460359514 Merge branch '25002-sentence-case-dashboard-tabs' into 'master'
Changes project dashboard tabs to sentence casing

Changes the nav tab titles on the project dashboard page (```https://gitlab.com/dashboard/projects```) from title casing to sentence casing.

Before: ![Screen_Shot_2016-11-26_at_11.17.23_PM](/uploads/a31c951cf83f7670acee778db9337be5/Screen_Shot_2016-11-26_at_11.17.23_PM.png)

After: ![Screen_Shot_2016-11-26_at_11.17.39_PM](/uploads/a0cb5f6b6771e6f5149750ea1e7beb02/Screen_Shot_2016-11-26_at_11.17.39_PM.png)

Closes #25002

See merge request !7774
2016-11-30 00:22:52 +00:00
tauriedavis 9ed87e5c36 25044 Make md header tabs match nav tabs 2016-11-29 12:45:16 -08:00
Annabel Dunstone Gray b021cc261b Merge branch 'add-sub-nav-active-color' into 'master'
Add blue back to sub nav active

## What does this MR do?
Adds blue color back active sub nav tab

## Screenshots (if relevant)
![Screen_Shot_2016-11-29_at_10.00.55_AM](/uploads/b968fce60d8e25e7f0769f6fb045291c/Screen_Shot_2016-11-29_at_10.00.55_AM.png)

## Does this MR meet the acceptance criteria?

- [ ] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) 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 [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [ ] 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 it does - rebase it please)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

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

See merge request !7829
2016-11-29 20:34:13 +00:00
Fatih Acet 8f98b704ed Merge branch '25011-hoverstates-for-collapsed-issue-merge-request-sidebar' into 'master'
Adds hoverstates for collapsed Issue/Merge Request sidebar

This MR is part 1/2 of https://gitlab.com/gitlab-org/gitlab-ce/issues/25011

## What does this MR do?

Adds hoverstates for collapsed Issue/Merge Request sidebar

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


## Why was this MR needed?

We needed hover states on the issue/merge request sidebar

## Screenshots (if relevant)

![2016-11-27_23.39.28](/uploads/adb83f5fa291cc8f89f1a7d7e2577546/2016-11-27_23.39.28.gif)![2016-11-27_23.39.13](/uploads/7018e4272da26cb06efb7c6fe4eae413/2016-11-27_23.39.13.gif)

![2016-11-29_16.05.11](/uploads/fcf9a674aa24cf0e7349a7e439b024fe/2016-11-29_16.05.11.gif)

## Does this MR meet the acceptance criteria?

- [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) 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 [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [ ] 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 it does - rebase it please)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

## What are the relevant issue numbers?


Closes #25011

See merge request !7777
2016-11-29 19:01:22 +00:00
Luis Alonso Chavez Armendariz 500c0d5e41 Fix appearance in error pages 2016-11-29 11:44:07 -07:00
Alfredo Sumaran ef6a91af12 Merge branch '24135-new-project-should-be-below-new-group-on-the-welcome-screen' into 'master'
New project should be below new group on the welcome screen

## What does this MR do?

Places the group `.blank-slate` above the project's.

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

## Why was this MR needed?

## Screenshots (if relevant)

![Screen_Shot_2016-11-26_at_13.52.33](/uploads/a6e28dc54ebfc42f0cff5b46558f4ff0/Screen_Shot_2016-11-26_at_13.52.33.png)

## Does this MR meet the acceptance criteria?

- [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) 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
- [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [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 it does - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

## What are the relevant issue numbers?


Closes #24135

See merge request !7770
2016-11-29 18:27:58 +00:00
Fatih Acet f5b712e7b7 Merge branch 'remove-jsx-react-eslint-plugins' into 'master'
Remove JSX/React eslint plugins.

## What does this MR do?

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

## Why was this MR needed?

## Screenshots (if relevant)

## Does this MR meet the acceptance criteria?

- [ ] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) 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 [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [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 it does - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

## What are the relevant issue numbers?

See merge request !7470
2016-11-29 18:26:45 +00:00
tauriedavis f08385142d Add blue back to sub nav active 2016-11-29 10:19:00 -08:00
Grzegorz Bizon 04229eceea Merge branch 'feature/expose-timestimes-in-build-entity' into 'master'
Expose timestamps in build entity

## What does this MR do?

This MR exposes timestamps for build entity that is being used by serializers in `app/serializers`. 

## Does this MR meet the acceptance criteria?

- Tests
  - [x] Added for this feature/bug
  - [ ] All builds are passing

## What are the relevant issue numbers?

See https://gitlab.com/gitlab-org/gitlab-ce/issues/24844#note_19145053

See merge request !7818
2016-11-29 17:46:30 +00:00
Annabel Dunstone Gray 25e6e2fc73 Merge branch '25055-pipelines-info-missing-from-mr-widget' into 'master'
Fix pipelines info being hidden in merge request widget

## What does this MR do?

Reintroduces CSS classes that are necessary for `MergeRequestWidget` to show correct divs.

## Does this MR meet the acceptance criteria?

- [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) 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
- [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [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 it does - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

## What are the relevant issue numbers?

Closes #25055

See merge request !7808
2016-11-29 17:11:02 +00:00
Luke "Jared" Bennett c145413d1a
Remove JSX/React eslint plugins.
Change airbnb eslint config package to `eslint-config-airbnb-base` and update plugins.

Change `airbnb` to `airbnb-base` for .eslintrc `extends` value.

Added changelog entry

Made sure all plugins and envs are set

Corrected new failing specs
2016-11-29 16:15:47 +00:00
Dimitrie Hoekstra 30c3eed89b Adds hoverstates for collapsed Issue/Merge Request sidebar 2016-11-29 16:08:16 +01:00
Luke "Jared" Bennett ddf288f0d0
Moved groups above projects 2016-11-29 14:49:30 +00:00
Douglas Barbosa Alexandre 867dcdf750 Alert user when logged in user email is not the same as the invitation 2016-11-29 11:29:07 -02:00
Grzegorz Bizon 651eccda62 Expose timestamp in build entity used by serializer 2016-11-29 14:14:05 +01:00
Grzegorz Bizon a49e9949c6 Rename `MergeRequest#pipeline` to `head_pipeline` 2016-11-29 14:12:49 +01:00
Timothy Andrew 41bf093662 CE-specific changes gitlab-org/gitlab-ee#1137
- Extract all common {push,merge} access level model code into the
  `ProtectedBranchAccess` module

- Use the HTTP verb to define controller specs
2016-11-29 17:38:45 +05:30
Sean McGivern d8eee8ed73 Merge branch '24880-configurable-plaintext-emails' into 'master'
Add setting to enable/disable HTML emails

Closes #24880

See merge request !7749
2016-11-29 12:05:23 +00:00
James Lopez e40172548b Merge remote-tracking branch 'origin/fix/ca-no-date' into fix/ca-no-date 2016-11-29 12:42:01 +01:00
James Lopez a32dd93a4c fix started_at check 2016-11-29 12:41:11 +01:00
Annabel Dunstone Gray 63f5c4ea54 Merge branch '24150-consistent-dropdown-styles' into 'master'
Homogenize sort and filter dropdown toggles

## What does this MR do?

Homogenizes the style of *filter* and *sort* dropdown toggles (aka buttons) related to:
- *issues* (index, new & edit views)
- *issue boards* (index);
- *merge requests* (index, new, edit);
- *projects* (index and "explore");
- *projects admin* (index);
- *groups* (show and "explore");
- *groups admin* (index);
- *users admin* (index);
- *todos* (index);
- *branches* (index);
- *commits* (index);
- *cycle analytics*;
- *network*;
- *forks*;
- *tags* (index);
- *global search*

Some other dropdowns are incidently concerned:
- project admin (show);
- assigne/due date/milestone/label dropdowns on the issue and board sidebars;
- stage dropdown on the build sidebar;
- merge request and comparison dropdowns for choosing forks and branches;
- ref switcher (e.g. in the blob (show) view or in the graphs view);

Dropdown toggles concerned by #24150 but not covered in this MR:
- Dropdowns for selection MR versions to be compared (in the "Changes" tab of an MR);
- Dropdowns that bring up a list of actions:
  - "Settings" dropdowns (such as the one found on the upper-right corner of all project pages);
  - The download/action/notifications buttons on the main project page;
  - Dropdowns located inside of list items (on list of pipelines, users and groups, for instance);
  - The "Options" button on the commit (show) view;
  - The "+" button on the tree explorer (for creating files, branches, tags, ...)

### TODO
- [ ] Update ui.html if needed

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

Am I changing any other dropdown toggle than listed above?

## Why was this MR needed?

For #24150

## Screenshots (if relevant)

### Issue Index

**Before:**
![issue-index-before](/uploads/1aa358b0b9e79fd3a7467b57cd2b03ec/issue-index-before.png)

**After:**
![issue-index-after](/uploads/7a4159e8927d456ed3f4390072174e49/issue-index-after.png)

### Issue New

**Before:**
![issue-new-before](/uploads/fcfb9c39d2ff8f00827f52d60db5c114/issue-new-before.png)

**After:**
![issue-new-after](/uploads/a0b151d257d8f3e8f98a2873427362ee/issue-new-after.png)

### Merge Request Branch Selector

**Before:**
![merge-request-new-before](/uploads/8dd7b6e8ea38af7aced743386bfb83ca/merge-request-new-before.png)

**After:**
![merge-request-new-after](/uploads/38ad8f5a315344b3bab7e936a84acf7e/merge-request-new-after.png)

### Global Search
![global-search-after](/uploads/f2912b7d91fd286028cb9481d2d53a82/global-search-after.png)

### Cycle Analytics
![cycle-analytics-after](/uploads/248d5ca360bb510aa0f0bfa8a1a00aae/cycle-analytics-after.png)


## Does this MR meet the acceptance criteria?

- [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) 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 [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)~~
- [ ] 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 it does - rebase it please)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

## What are the relevant issue numbers?

#24150

See merge request !7583
2016-11-29 08:57:10 +00:00
Fatih Acet e0a46540c3 Merge branch 'hide-project-variables' into 'master'
Hide project variables values by default

Add a button to reveal/hide the values to help prevent accidental disclosure of sensitive information from wandering on a page.

![hide-vars](/uploads/5b5eeef9b4650776b529b780998bbb1b/hide-vars.gif)    

Closes #21358

See merge request !7731
2016-11-29 05:52:39 +00:00
Robert Speicher 25c1256736 Merge branch 'refactor-issuable-description-and-metadata' into 'master'
Refactor issuable description and metadata form sections

Continuation of https://gitlab.com/gitlab-org/gitlab-ce/issues/23864.

Brother of gitlab-org/gitlab-ee!916.

See merge request !7758
2016-11-29 04:57:09 +00:00
Douwe Maan b0bde100f2 Merge branch 'hoopes/gitlab-ce-21027-add-diff-hunks-to-notification-emails' into 'master'
Add diff hunks to notification emails

Add diff hunks to notification emails. Continued from https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5855 - thanks @hoopes!

This also fixes an issue where the + / - prefixes were missing from diffs in emails.

Screenshots (from my browser) of the HTML emails, along with text screenshots 😛

![image](/uploads/cb31400becf5149d40c8bb98a655aa93/image.png)

```
New comment for Merge Request !1 on app/views/admin/builds/index.html.haml:

http://localhost:3000/gitlab-org/gitlab-ce/merge_requests/1#note_1023

>          Finished

This is a comment at the top of a match section.
```

![image](/uploads/704dd3845797530697a27f5c1953c053/image.png)

```
New comment for Merge Request !1 on app/views/admin/builds/index.html.haml:

http://localhost:3000/gitlab-org/gitlab-ce/merge_requests/1#note_1022

>          Finished
>          %span.badge.js-running-count= @all_builds.finished.count(:id)
>  
> -    %li{class: ('active' if @scope == 'all')}
> -      = link_to admin_builds_path(scope: :all) do
> -        All
> -        %span.badge.js-totalbuilds-count= @all_builds.count(:id)
> -
>  .gray-content-block
>    #{(@scope || 'running').capitalize} builds
>  

This is a comment at the bottom of a match section.
```

![image](/uploads/4063f3d9738aea8ebf3c0e690d0eddee/image.png)

```
New comment for Merge Request !1 on app/views/admin/builds/index.html.haml:

http://localhost:3000/gitlab-org/gitlab-ce/merge_requests/1#note_1024

>          = link_to 'Cancel all', cancel_all_admin_builds_path, data: { confirm: 'Are you sure?' }, class: 'btn btn-danger', method: :post
>  
>    %ul.center-top-menu
> -    %li{class: ('active' if @scope.nil?)}
> +    %li{class: ('active' if @scope == 'all')}
>        = link_to admin_builds_path do
> +        All

This is a comment with some deleted and added lines above it.
```

Closes #21027, closes #24340.

See merge request !7660
2016-11-29 04:11:15 +00:00
Douwe Maan 3bf34face4 Merge branch 'jej-use-issuable-finder-instead-of-access-check' into 'security'
Replace issue access checks with use of IssuableFinder

Split from !2024 to partially solve https://gitlab.com/gitlab-org/gitlab-ce/issues/23867

## Which fixes are in this MR?

⚠️ - Potentially untested  
💣 - No test coverage  
🚥 - Test coverage of some sort exists (a test failed when error raised)  
🚦 - Test coverage of return value (a test failed when nil used)  
 - Permissions check tested

### Issue lookup with access check

Using `visible_to_user` likely makes these security issues too. See [Code smells](#code-smells).

- [x] 🚦 app/finders/notes_finder.rb:15 [`visible_to_user`]
- [x] 🚥 app/views/layouts/nav/_project.html.haml:73 [`visible_to_user`] [`.count`]
- [x]  app/services/merge_requests/build_service.rb:84 [`issue.try(:confidential?)`]
- [x]  lib/api/issues.rb:112 [`visible_to_user`]
  - CHANGELOG: Prevented API returning issues set to 'Only team members' to everyone
- [x]  lib/api/helpers.rb:126 [`can?(current_user, :read_issue, issue)`] Maybe here too?
- [x]  lib/gitlab/search_results.rb:53 [`visible_to_user`]

### Previous discussions
- [ ] https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2024/diffs#b2ff264eddf9819d7693c14ae213d941494fe2b3_128_126
- [ ] https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2024/diffs#7b6375270d22f880bdcb085e47b519b426a5c6c7_87_87

See merge request !2031
2016-11-28 21:26:23 -03:00
Douwe Maan 6d37fe952b Merge branch 'jej-fix-missing-access-check-on-issues' into 'security'
Fix missing access checks on issue lookup using IssuableFinder

Split from !2024 to partially solve https://gitlab.com/gitlab-org/gitlab-ce/issues/23867

⚠️ - Potentially untested
💣 - No test coverage
🚥 - Test coverage of some sort exists (a test failed when error raised)
🚦 - Test coverage of return value (a test failed when nil used)
 - Permissions check tested

- [x]  app/controllers/projects/branches_controller.rb:39
  - `before_action :authorize_push_code!` helpes limit/prevent exploitation. Always checks for reporter access so fine with
    confidential issues, issues only visible to team, etc.
- [x] 🚥 app/models/cycle_analytics/summary.rb:9 [`.count`]
- [x]  app/controllers/projects/todos_controller.rb:19

- [x] Potential double render in app/controllers/projects/todos_controller.rb

- https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/2024/diffs#cedccb227af9bfdf88802767cb58d43c2b977439_24_24

See merge request !2030
2016-11-28 21:25:46 -03:00
Douwe Maan 742cee756b Merge branch 'jej-22869' into 'security'
Fix information disclosure in `Projects::BlobController#update`

It was possible to discover private project names by modifying `from_merge_request`parameter in `Projects::BlobController#update`. This fixes that.

- [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) entry added
- Tests
  - [x] Added for this feature/bug
  - [ ] All builds are passing
- [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

https://gitlab.com/gitlab-org/gitlab-ce/issues/22869

See merge request !2023
2016-11-28 21:25:18 -03:00
Douwe Maan 3d7704ae5f Merge branch 'zj-fix-label-creation-non-members' into 'security'
Fix label creation non members

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

See merge request !2006
2016-11-28 21:24:19 -03:00
Adam Niedzielski 7de6aee755 Fix pipelines info being hidden in merge request widget
We do need these "ci-#{status}" classes because we use them in
MergeRequestWidget to show correct divs.
2016-11-29 00:08:11 +01:00