Commit Graph
30755 Commits
Author SHA1 Message Date
Mark Pundsack 41af86bc86 Move Pipelines and Builds definitions to their own page 2016-06-20 15:07:38 -07:00
Mark Pundsack edfe2e2db9 Add CD 2016-06-20 14:25:45 -07:00
Mark Pundsack a1c2b16837 Add pipeline image 2016-06-20 14:25:45 -07:00
Mark Pundsack a0fefc2ad2 Add definitions and tweak some docs. Partially fixes #17733 2016-06-20 14:25:45 -07: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
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
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 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
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
Jacob Schatz 93ad4b13f0 Merge branch '18762-feedback-btn' into 'master'
Fix margin & padding on activity btn

## What does this MR do?
Fixes alignment of activity btn

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

## Screenshots (if relevant)
![Screen_Shot_2016-06-17_at_9.29.06_AM](/uploads/4ab9fb33d450dda72811a5ce2570b8c7/Screen_Shot_2016-06-17_at_9.29.06_AM.png)


See merge request !4750
2016-06-18 16:45:07 +00:00
Jacob Schatz 81204f3d4a Merge branch 'comment-form-button-spacing' into 'master'
Fixed alignment of buttons in note forms

## What does this MR do?

Due to a CSS change on some buttons, the alignment of the save button on the note form went off. Also, it made no sense to have `.btn-grouped` as the button wasn't in a group.

## Screenshots (if relevant)

![Screen_Shot_2016-06-17_at_11.43.33](/uploads/5d9037a48ff6179fc906bdf0c6d5ff47/Screen_Shot_2016-06-17_at_11.43.33.png)

![Screen_Shot_2016-06-17_at_11.43.43](/uploads/8b130a25e8f73e79578d38f5f7aff4fb/Screen_Shot_2016-06-17_at_11.43.43.png)


See merge request !4740
2016-06-18 16:41:33 +00:00
Jacob Schatz e73ace4ccc Merge branch 'dz-organize-admin-settings' into 'master'
Move admin->runners tab as subnav of overview tab

cc @annabeldunstone 

See merge request !4716
2016-06-18 16:40:01 +00:00
Jacob Schatz a61550a814 Merge branch 'tags-edit-tooltip-placement' into 'master'
Fixed tooltip placement on edit tags button

## What does this MR do?

Moves the placement of the tooltip to the body so not to affect the movement of the button.

## Screenshots (if relevant)

Old:

![tooltip-old](/uploads/9ecb9bb919578881994698cd8b1d1826/tooltip-old.gif)

New:

![tooltip-new](/uploads/66f90cf95c2ee4001bfa3c65b9de8c05/tooltip-new.gif)


See merge request !4737
2016-06-18 16:35:51 +00:00
Jacob Schatz d0bca4b83f Merge branch 'branch-buttons-size' into 'master'
Fixed size of buttons in branches list

## What does this MR do?

The buttons on the branch list were using `btn-xs` this MR removes that so the buttons are a normal size to match https://gitlab.com/gitlab-org/gitlab-ce/tags

## What are the relevant issue numbers?

#18677 

## Screenshots (if relevant)

![Screen_Shot_2016-06-17_at_10.38.31](/uploads/19fc173e3f549a84bb14517613403792/Screen_Shot_2016-06-17_at_10.38.31.png)

See merge request !4735
2016-06-18 16:34:12 +00:00
Jacob Schatz 79488092e7 Merge branch 'last-push-vertical-alignment' into 'master'
Aligns create merge request button vertically

## What does this MR do?

Based on https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4644#note_12507178 I have vertically aligned the button correctly.

## Screenshots (if relevant)

Here is my awesome screenshot to show it is centered vertically 

![Screen_Shot_2016-06-17_at_10.17.19](/uploads/e7bf5bcc5b254ed4db376c16460d79a5/Screen_Shot_2016-06-17_at_10.17.19.png)

See merge request !4733
2016-06-18 16:33:00 +00:00
Jacob Schatz 204da39685 Merge branch '18714_bulk_assign_labels_icon' into 'master'
Fixes item icon state when for issues that have the same labels assigned

## What does this MR do?
Previously if all issues had the same labels the dropdown was showing the labels with indeterminate stated which is wrong. This MR fixes that and shows the correct state.

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

## Screenshots (if relevant)

**Before**

![label-before](/uploads/c65aa051e773dfea898a0d19767d6ade/label-before.gif)

**After**

![label](/uploads/73fd657d104d1081e189e0a9547d483b/label.gif)

## 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)
- [x] 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 !4721
2016-06-18 16:29:43 +00:00
Jacob Schatz f065decad1 Merge branch '18707-label-tooltips-dont-dissapear-firefox' into 'master'
Hide tooltip manually

## What does this MR do?
Fixes an issue with tooltips not dissapearing  on Firefox after toggling label priority

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

## Screenshots (if relevant)

**Test on Firefox**

![label-firefox](/uploads/09ed05f81b9861d666e5d9ad805fb501/label-firefox.gif)
## 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
- [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 !4715
2016-06-18 16:13:57 +00:00
Stan Hu b272879377 Merge branch '18819-wiki-link-filter-exception' into 'master'
Fix bug in `WikiLinkFilter`.

Closes #18819 

- [ ]  #18819 Wiki link filter exception
    - [x]  Make sure [build](https://gitlab.com/gitlab-org/gitlab-ce/commit/6d169d36cabda783116bcb8e2e6f73254566a670/builds) passes
    - [ ]  Wait for merge
    - [ ]  Pick into 8.9

See merge request !4775
2016-06-18 13:10:11 +00:00
Timothy Andrew 6d169d36ca Fix bug in WikiLinkFilter.
1. An exception would be raised if the filter was called with an invalid
   URI. Mainly because we weren't catching the `Addressable` exception.

2. This commit fixes it and adds a spec for the filter.
2016-06-18 14:10:40 +05:30
Achilleas Pipinellis 3d766b347b Merge branch 'ci-scala-example' into 'master'
Ci scala example

## What does this MR do?

Add a scala CI example.

## Why was this MR needed?

Supersedes https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2984

See merge request !4774
2016-06-18 07:51:51 +00:00
Achilleas Pipinellis 56777e8956 Merge branch 'master' into ci-scala-example 2016-06-18 09:23:31 +02:00
Mark Pundsack e45372b7b2 Grammar and typographic changes to artifacts documentation 2016-06-17 18:14:29 -07:00
Mark Pundsack 20a06798ae Tweak grammar 2016-06-17 18:14:19 -07:00
Douwe Maan 00906b5bb6 Merge branch 'issue_12758' into 'master'
Implement custom notification level options

![Screen_Shot_2016-06-17_at_15.31.43](/uploads/3fc47d2f461b3e8b67bb8acaa304cf99/Screen_Shot_2016-06-17_at_15.31.43.png)

![Screenshot_from_2016-06-15_10-52-27](/uploads/88dbdd21d97e80ee772fe08fa0c9b393/Screenshot_from_2016-06-15_10-52-27.png)

part of #12758 

See merge request !4389
2016-06-17 23:28:22 +00:00
Felipe Artur 4b204f071e Small frontend code fixes and restore 8a2d88f commit 2016-06-17 19:57:59 -03:00
Douwe Maan 33d8972bf9 Merge branch 'fix-18717' into 'master'
Ensure that group owner cannot request access to a project of their group

## What does this MR do?

It fixes two things:

- 91ad995d69e1a0f8991fd896f1d9febc109273fe Ensure that group owner cannot request access to a project of their group
- ec3ff061148d556757e7cd486cdc6083d77acf34 Ensure group/project owners can see their members' access_level (see the commit message for details)

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

Not really, these are pretty simple fixes.

## Why was this MR needed?

Because there was an issue created!

## What are the relevant issue numbers?

Fixes #18717.

## Does this MR meet the acceptance criteria?

- [x] CHANGELOG is not needed since the bug is only present in a 8.9 RC
- [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 !4729
2016-06-17 22:47:19 +00:00
Douwe Maan b218e82b5c Merge branch 'issuable-todo-improvements'
# Conflicts:
#	app/controllers/projects/todos_controller.rb
2016-06-18 00:42:36 +02:00