Commit Graph
30794 Commits
Author SHA1 Message Date
Z.J. van de WegandAlfredo Sumaran 620d014aef Implement backend gitlab ci dropdown
This commit builds on the groundwork in
ee008e300b1ec0abcc90e6a30816ec0754cea0dd, which refactored the backend
so the same code could be used for new dropdowns. In this commit its
used for templates for the `.gitlab-ci.yml` files.
2016-06-20 14:48:28 -05:00
Z.J. van de WegandAlfredo Sumaran 567f6a7b42 Add first templates for gitlab-ci dropdown 2016-06-20 14:48:28 -05:00
ZJ van de WegandAlfredo Sumaran 27bf7ae59e Refactor Gitlab::Gitignores 2016-06-20 14:48:28 -05:00
Jacob Schatz 74f8f26098 Merge branch 'image-border' into 'master'
Add borders to images in issues, MRs, and Help.

## What does this MR do?

Adds a gray border around images in Issues, MRs, and Help pages.

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

That this doesn't effect other elements or pages that it shouldn't.

## Why was this MR needed?

It was hard to differentiate between the actual interface and screenshots of it.

## What are the relevant issue numbers?

Fixes #18578 

## Screenshots (if relevant)

### Issues/MRs

Before:

![Screen_Shot_2016-06-14_at_12.22.08_PM](/uploads/00a242a5b4a09b5308f02e6e498862a8/Screen_Shot_2016-06-14_at_12.22.08_PM.png)

After:

![Screen_Shot_2016-06-14_at_12.22.30_PM](/uploads/8fc9fc1c561d788b050e48373449771b/Screen_Shot_2016-06-14_at_12.22.30_PM.png)

![Screen_Shot_2016-06-14_at_12.22.39_PM](/uploads/36c91b2f2ce1eeb77f1646415baea14d/Screen_Shot_2016-06-14_at_12.22.39_PM.png)

### Help

Before:

![Screen_Shot_2016-06-14_at_11.58.54_AM](/uploads/7620491ca338064b872efb538b0bf4f3/Screen_Shot_2016-06-14_at_11.58.54_AM.png)

After:

![Screen_Shot_2016-06-14_at_11.58.57_AM](/uploads/d9fcfcac0f70dde4e69ff4263e369f65/Screen_Shot_2016-06-14_at_11.58.57_AM.png)

## Does this MR meet the acceptance criteria?

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

cc: @jschatz1

See merge request !4655
2016-06-20 19:19:21 +00:00
Jacob Schatz 681a3acf97 Merge branch 'note-emoji-system-note' into 'master'
Hides award emoji & access level on system notes

## What does this MR do?

Hides award emoji & access level on system notes as they aren't applicable to them notes.

## Screenshots (if relevant)

![Screen_Shot_2016-06-13_at_16.14.03](/uploads/c105c37d0f140dea7480b56242c14ed9/Screen_Shot_2016-06-13_at_16.14.03.png)

See merge request !4629
2016-06-20 19:14:35 +00:00
Jacob Schatz d5bbc86094 Merge branch 'async-refs-dropdown' into 'master'
Refs dropdown is now loaded async

## What does this MR do?

The refs dropdown is loaded async so not to block the page.

## What are the relevant issue numbers?

Part of #18202

## Screenshots (if relevant)

![Screen_Shot_2016-06-07_at_14.41.21](/uploads/8fea12655f96fe7f7008a32677bff037/Screen_Shot_2016-06-07_at_14.41.21.png)

See merge request !4508
2016-06-20 19:10:47 +00:00
Achilleas Pipinellis 503bbcc3e7 Merge branch '18584-document-request-access-feature' into 'master'
Document access request to project & group

## What does this MR do?

Adds documentation that was missing from !3798.

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

I've taken the opportunity to update the images in the "Project users" documentation page, I can remove the commit if it's not welcome!

## What are the relevant issue numbers?

Closes #18584.

## Does this MR meet the acceptance criteria?

- [ ] Tests
  - [ ] 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)

/cc @DouweM 

See merge request !4685
2016-06-20 18:45:25 +00:00
Stan Hu 0e987ee7a2 Merge branch '18757-fix' into 'master'
Fallback to group's owners/masters when a project has none for the "access requested email"

## What does this MR do?

From b31c5052f9:

    Fallback to group's owners/masters when a project has none
    
    A project in a group can have no explicit owners/masters,
    in that case we fallbacks to the group's owners/masters.

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

No.

## Why was this MR needed?

Because of #18757.

## What are the relevant issue numbers?

Fixes #18757.

## Does this MR meet the acceptance criteria?

- [x] No need for CHANGELOG.
- [x] No need for documentation.
- [x] No API support added.
- [x] Tests
  - [x] Added for this feature/bug
  - [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 !4791
2016-06-20 17:46:40 +00:00
Jacob Schatz a0aaa6a0b8 Merge branch 'markdowner' into 'master'
POC: Markdown shortcut buttons

## What does this MR do?
Adds markdown shortcut buttons to text area for comments. 

## Are there points in the code the reviewer needs to double check?
Because changing `textarea.val('something')` kills the natural browser undo stack, I had to implement a custom undo stack using state. You can't use the "undoable" state undo pattern because you need to go back to a previous state regardless of cursor position. The undo also adds an undo history item once you delete stuff or press enter.

You can also edit multiple textareas at once and it will keep an undo history for each textarea individually, so the undo state should not collide between textareas.

## Why was this MR needed?
It has been requested multiple times and the competition has it. https://gitlab.com/gitlab-org/gitlab-ce/issues/17185#note_12073433

Libraries are available that already implement this functionality but they are enormous and bloaty. I implemented this in very few lines of code and kept it very simple and as minimal as possible. This was also some competitions approach. I believe so as to not include too much JS. 

Adding extra buttons with new functionality **should only need new HTML and no new JS**.

Only extra complex thing was adding a overridden undo stack, which was made as simple as possible as well.

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

## Screenshots (if relevant)

**NOTE:** One thing you cannot see in this screenshot is that I am pressing <kbd>Cmd</kbd><kbd>Z</kbd> to undo and <kbd>Cmd</kbd><kbd>Shift</kbd><kbd>Z</kbd> to redo which is the undo/redo stack I implemented. <kbd>Ctrl</kbd><kbd>Y</kbd> also works for redo. 
![markdown-editor](/uploads/2517bfb1a7b4269da7fcc4003c88b7f6/markdown-editor.gif)

cc @dzaporozhets for UI

cc @iamphill @alfredo1 for JS review

cc @JobV if you like the idea.

Fixes: #17185

See merge request !4305
2016-06-20 17:18:13 +00:00
Rémy Coutable d32ac35642 Merge branch '17949-error-500-on-gitlab-org-when-visiting-pipelines' into 'master'
Set missing stages on ci builds to 'test' to avoid regressions in the pipelines view

## What does this MR do?

Sets a default stage on old `ci_builds`.

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

Is the migration acceptable for online execution?

## Why was this MR needed?

Old `ci_builds`with no stages cause a regression on the pipelines index view.

## What are the relevant issue numbers?

#17949 

Blocked by https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4680


See merge request !4381
2016-06-20 16:58:54 +00:00
Stan Hu 032e398374 Merge branch 'patch-1' into 'master'
Broken instructions. git fetch --all --tags doesn't refresh tags



See merge request !4092
2016-06-20 16:11:20 +00:00
Yorick Peterse 8b2a2fc5b0 Merge branch 'issue_12758_2' into 'master'
Add notification_settings:events to schema

See merge request !4800
2016-06-20 15:55:11 +00:00
Jacob Schatz 92430f0194 Merge branch 'mr-button-placement' into 'master'
Fixed placement of close button on merge requests

## What does this MR do?

Fixes the order in which the MR buttons appear

## Screenshots (if relevant)

![Screen_Shot_2016-06-18_at_21.41.38](/uploads/66a88ebc287b7c21160af193ee9de54c/Screen_Shot_2016-06-18_at_21.41.38.png)

![Screen_Shot_2016-06-18_at_21.41.44](/uploads/ba8f6776d79f4eb0af7877c3c71fbb54/Screen_Shot_2016-06-18_at_21.41.44.png)


See merge request !4778
2016-06-20 15:45:53 +00:00
Robert Speicher 43be046e7b Merge branch 'fix-double-query-string-url' into 'master'
Fix double query string in url

This MR should fix the double query string in url  that shows up while using the "filter by name .."  input  on projects list pages and also closes [17743](https://gitlab.com/gitlab-org/gitlab-ce/issues/17743)

Closes #17743

See merge request !4480
2016-06-20 15:45:42 +00:00
Alejandro Rodríguez bcecc19571 Set missing stages on ci builds to 'test' to avoid regressions in the pipelines view 2016-06-20 11:25:10 -04:00
Felipe Artur 8a2a01e023 Add notification_settings:events to schema 2016-06-20 11:56:52 -03:00
Jacob Schatz 699badabc9 Merge branch 'pinned-nav-cookie-path' into 'master'
Set path for pinned nav cookie

## What does this MR do?

Sets a path for the pinned nav cookie so it will be present across page reload.

Closes #18836 

See merge request !4784
2016-06-20 14:32:29 +00:00
Achilleas Pipinellis 3c9c1b6c16 Merge branch 'document-environments' into 'master'
Document environments and deployments

## What does this MR do?

Adds an introduction to environments and deployments and tweaks the `environments` entry in `.gitlab-ci.yml` documentation.

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

## Why was this MR needed?

## What are the relevant issue numbers?

Closes #18683.

## Screenshots (if relevant)

![image](/uploads/1e3355c543abaf7b358f3c37596b1f0b/image.png)

![image](/uploads/58a51505674bcf605039db46833a8ae6/image.png)

/cc @ayufan @axil 

See merge request !4725
2016-06-20 14:24:30 +00:00
Yorick Peterse 764c9131d3 Merge branch '18697-uniqueness-key-validation' into 'master'
Remove Duplicated keys adding UNIQUE index to fingerprint

See merge request !4787
2016-06-20 13:39:39 +00:00
Robert Speicher f7e10f1ebf Merge branch '18810-nameerror-uninitialized-constant-mail-parsers-addressstruct' into 'master'
Avoid autoload issue such as 'Mail::Parsers::AddressStruct'

This is mostly a shot in the dark but at least it shouldn't break anything.

Fixes #18810.

See merge request !4793
2016-06-20 13:29:19 +00:00
Robert Speicher 160499b525 Merge branch 'limit-email-diff-size' into 'master'
Limit push email diff size

Restrict the size of diffs in push emails to 30 lines / 150 KB (whichever is smaller),
following https://gitlab.com/gitlab-org/gitlab_git/merge_requests/85.

Emails on push can get very large if they contain a lot of files that sneak under the single-file limit.

https://gitlab.com/gitlab-org/gitlab-ee/issues/490

See merge request !4566
2016-06-20 13:26:16 +00:00
Jacob Schatz ced3db8a0f Merge branch 'dz-admin-tabs-dropdown' into 'master'
Move part of admin area navigation from tabs into settings dropdown

Partly fix https://gitlab.com/gitlab-org/gitlab-ce/issues/18799 

See merge request !4796
2016-06-20 13:11:51 +00:00
Dmitriy Zaporozhets 3f12e8d1b2 Put some admin settings in dropdown
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-06-20 14:55:20 +03:00
Achilleas Pipinellis 6317e491ca Merge branch 'grammar-tweaks' into 'master'
Grammar tweaks

## What does this MR do?

* Updates grammar in recent CI documentation.

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

## Why was this MR needed?

Because grammar.

## What are the relevant issue numbers?

Needed because of !4200 and !4201.

## Screenshots (if relevant)


See merge request !4772
2016-06-20 11:54:13 +00:00
Achilleas Pipinellis 261fbab5b8 Merge branch 'source_omnibus_doc_styleguide' into 'master'
Add documentation styleguide  on configuration settings

See merge request !4794
2016-06-20 11:36:46 +00:00
Achilleas Pipinellis dd417699a3 Add styleguide on configuration settings documentation
[ci skip]
2016-06-20 13:32:54 +02:00
Paco Guzman ca01c4c648 Remove Duplicated keys add UNIQUE index to fingerprint 2016-06-20 13:29:04 +02:00
Rémy Coutable 3cb1e96ef6 Avoid autoload issue such as 'Mail::Parsers::AddressStruct'
By eager-loading the Mail gem in the Sidekiq initializer.

Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-06-20 12:43:29 +02:00
Phil Hughes f112e2a1da Fixed issue with returning ref in commits JSON
Added tests to project controller
2016-06-20 11:37:27 +01:00
Rémy Coutable b31c5052f9 Fallback to group's owners/masters when a project has none
A project in a group can have no explicit owners/masters,
in that case we fallbacks to the group's owners/masters.

Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-06-20 12:10:37 +02:00
Dmitriy Zaporozhets 73d431731f Move appearance settings as sub tab to application settings
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-06-20 12:43:40 +03:00
Rémy Coutable 44b8b77e02 Merge branch 'fix/import-export-prod' into 'master'
Fixed a couple of errors on import/export spotted in production

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/18828 and https://gitlab.com/gitlab-org/gitlab-ce/issues/18829

A couple of tiny bugs spotted after deploying in prod

See merge request !4782
2016-06-20 08:23:20 +00:00
Phil Hughes b543a96e1c Added text_utility to JS tests 2016-06-20 08:54:57 +01:00
Phil Hughes 657aaca363 Fixed mobile styling 2016-06-20 08:47:38 +01:00
Phil Hughes a0173bc46f Set path for pinned nav cookie 2016-06-20 08:37:17 +01:00
James Lopez d5b3a266e8 use rails root join 2016-06-20 09:17:07 +02:00
James Lopez cee2a2dc66 fixed a couple of errors spotted in production 2016-06-20 08:58:43 +02:00
Connor Shea 15789e8eb5 Emoji shouldn't have borders. #EmojiWithoutBorders 2016-06-19 18:31:29 -06:00
Connor Shea 8685b3f80a Add borders to images in issues, MRs, and Help. 2016-06-19 18:02:53 -06:00
Phil Hughes c240cad59a Fixed Ruby to use exclude 2016-06-18 21:49:20 +01:00
Phil Hughes 68c9981013 Correctly adds commit ID into dropdown
Removes un-used method
Fixes other Ruby issues
2016-06-18 21:49:20 +01:00
Phil Hughes 3c8c912965 Pulls back tags if any exist 2016-06-18 21:49:20 +01:00
Phil Hughes ed0f26c223 Escapes branch names before appending to dom 2016-06-18 21:49:20 +01:00
Phil Hughes d2362e2edf Tests fix for ref switcher 2016-06-18 21:49:20 +01:00
Phil Hughes deca5ef200 Refs dropdown is now loaded async 2016-06-18 21:49:20 +01:00
Robert Speicher 98cede7ebe Merge branch 'fix-out-of-bounds-markdown-refs' into 'master'
Fix RangeError exceptions when referring to issues or merge requests outside of max database values

When using #XYZ in Markdown text, if XYZ exceeds the maximum value of a signed 32-bit integer, we get an exception when the Markdown render attempts to run `where(iids: XYZ)`. Introduce a method that will throw out out-of-bounds values.
    
Closes #18777

See merge request !4777
2016-06-18 20:48:58 +00:00
Phil Hughes 55982c3dbb Fixed placement of close button on merge requests 2016-06-18 21:40:59 +01:00
Stan Hu 7c9eba8919 Fix RangeError exceptions when referring to issues or merge requests outside of max database values
When using #XYZ in Markdown text, if XYZ exceeds the maximum value of a signed 32-bit integer, we
get an exception when the Markdown render attempts to run `where(iids: XYZ)`. Introduce a method
that will throw out out-of-bounds values.

Closes #18777
2016-06-18 13:07:38 -07:00
Jacob Schatz 0aab84c760 Merge branch 'star-fork-mobile' into 'master'
Display Star and Fork on mobile, fix #18537.

## What does this MR do?

Displays the Star and Fork buttons on mobile devices.

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

Nope.

## Why was this MR needed?

I wanted to star and/or fork projects while on my phone, I couldn't do that before.

## What are the relevant issue numbers?

#18537 

## Screenshots (if relevant)

![Screen_Shot_2016-06-16_at_11.41.24_AM](/uploads/053ac0c1b39a7b1b30fffb0a8d43cffb/Screen_Shot_2016-06-16_at_11.41.24_AM.png)

cc: @jschatz1 

See merge request !4714
2016-06-18 17:12:38 +00:00
Jacob Schatz 0766936340 Merge branch 'milestones-show-mrs' into 'master'
Add merge request data to the progress information on Milestones pages.

## What does this MR do?

Adds data about merge requests to the Milestone show view. It previously only showed something like `3 issues: 2 open and 1 closed 20% complete`, now it shows `3 issues: 2 open and 1 closed 2 merge requests: 2 open and 0 merged 20% complete`.

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

I don't think so.

## Why was this MR needed?

The milestone progress % didn't accurately reflect the open/merged MRs.

## What are the relevant issue numbers?

Fixes #13980

## Screenshots (if relevant)

Before:

![Screen_Shot_2016-06-16_at_2.12.57_PM](/uploads/99a044ea918b23fe93cef3305c21086e/Screen_Shot_2016-06-16_at_2.12.57_PM.png)

After:

![Screen_Shot_2016-06-16_at_2.12.38_PM](/uploads/be17e723b9c9bbe33099d1f0e94192d0/Screen_Shot_2016-06-16_at_2.12.38_PM.png)

## Does this MR meet the acceptance criteria?

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

cc: @jschatz1

See merge request !4719
2016-06-18 17:09:45 +00:00