Commit Graph

37399 Commits

Author SHA1 Message Date
e98d4940fe Remove redundant images
[ci skip]
2016-10-11 13:14:08 +02:00
777ca78027 Rearrange GitLab basics READMEs
[ci skip]
2016-10-11 11:30:35 +02:00
54fd5e830a New images for GitLab basics "Create MR" docs 2016-10-11 11:29:16 +02:00
815bf9b589 Add new images in GitLab basics "Create issue" docs 2016-10-11 11:07:37 +02:00
7374f876dc Reference the web editor docs in GitLab basics "Add a file" 2016-10-11 07:44:26 +02:00
7d703a4dbb New images for GitLab basics "Fork project" docs 2016-10-11 07:41:28 +02:00
54642e5245 Reference the web editor docs in GitLab basics "Create a branch" 2016-10-11 07:21:47 +02:00
ec102fe8f1 New images for GitLab basics "Create group" docs 2016-10-11 07:11:55 +02:00
c003c89422 Add new images for GitLab basics "create project" 2016-10-11 06:41:40 +02:00
6de2990c99 Use new image for gitlab-basics/command-line-commands.md
[ci skip]
2016-10-10 22:18:06 +02:00
f8df2bc61f Refactor SSH key addition in GitLab basics 2016-10-10 22:07:17 +02:00
eecccf5e20 Change img dir name 2016-10-10 21:36:30 +02:00
4c8ea149ed Merge branch 'jmcgeheeiv/gitlab-ce-patch-1' into 'master'
Improve backup doc readability

From https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3761

See merge request !6781
2016-10-10 15:41:26 +00:00
7aa9675fbd Add registry to skipped data in backup raketask docs
[ci skip]
2016-10-10 17:35:57 +02:00
1659c3b871 Merge branch 'explain-0600' into 'master'
Explain the extra chmod

There is confusion about what passing `0600` to File.open does.

```
$ touch /tmp/foobar
$ ls -l /tmp/foobar
-rw-r--r--  1 jacobvosmaer  wheel  0 Sep 26 14:20 /tmp/foobar
$ ruby -e 'File.open("/tmp/foobar", "w", 0600)'
$ ls -l /tmp/foobar
-rw-r--r--  1 jacobvosmaer  wheel  0 Sep 26 14:20 /tmp/foobar
$ 
$ 
$ rm /tmp/foobar
$ ruby -e 'File.open("/tmp/foobar", "w", 0600)'
$ ls -l /tmp/foobar
-rw-------  1 jacobvosmaer  wheel  0 Sep 26 14:21 /tmp/foobar
```

See merge request !6523
2016-10-10 15:18:46 +00:00
4ce9a783b5 Merge branch 'jerdog/gitlab-ce-update-start-using-git-documentation' into 'master'
Changes to make Git basics more intuitive

From https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6420

See merge request !6777
2016-10-10 15:04:06 +00:00
db32660450 Updating changes based on feedback from @connorshea 2016-10-10 16:49:01 +02:00
ee9b75fd37 Changes to make Git basics more intuitive
- updated verbiage where appropriate
- changed "git config" commands to include quotes for variables to be more in line with standard practive and to avoid issues with spaces
- updated CHANGELOG as part of commit
2016-10-10 16:49:01 +02:00
b06acbf52d Merge branch 'tnir/gitlab-ce-23068-cleanup-ci-application-controller'
Remove Ci::ApplicationController.

See gitlab-org/gitlab-ce!6757.
2016-10-10 16:47:48 +02:00
36bf0b67e5 Remove Ci::ApplicationController
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-10-10 16:47:27 +02:00
516d869e09 Merge branch 'gtrafimenkov/gitlab-ce-clarify-runners-delete-token' into 'master'
Clarify which token should be used to delete a Runner



See merge request !6775
2016-10-10 14:10:34 +00:00
ee2d392255 Clarify which token should be used to delete a runner 2016-10-10 16:03:26 +02:00
359b4f9a03 Merge branch 'fix/async-pipeline-processing-stale-data' into 'master'
Fix ci pipeline processing with async jobs

## What does this MR do?

This MR fixes CI pipeline processing with asynchronous jobs called from `around_transition` provided by state machine.
For details see  https://github.com/pluginaweek/state_machine/issues/191 and commit f68acba.

## Why was this MR needed?

Recently merged https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6650 introduced problem with asynchronous job being deployed when `around_transition` still held transaction, which caused race condition that prevented pipeline status to change in a proper way. 

## What are the relevant issue numbers?

Closes #23111

See merge request !6736
2016-10-10 13:39:51 +00:00
f5576b16ba Merge branch 'namespace-validation-fixes' into 'master'
Correct namespace validation to forbid bad names #21077

## What does this MR do?
Updates master namespace regex to forbid any namespace ending in `.git` or `.atom` and corrects and adds relevant tests

## Are there points in the code the reviewer needs to double check?
I think it's all good. I could use help with the creation of tests for usernames with trailing `.atom` or `.git` as the testing framework is a bit over my head.

## Why was this MR needed?
A group that ends in `.atom` will cause the relevent dashboard to crash if the user (ANY user, not just the creator) has visibility of the group until it is deleted through the admin panel (it cannot be renamed, the edit page will crash. It may be fixable through the API, that wasn't checked.)

This allows a malicious user with group creation privileges to bulk add users to a group, rename the group to a bad name, and crash the groups dashboard for all members of the group. The same applies if the group is internal or public and users navigate to the explore tab of the groups dashboard.

The same applies to usernames ending in `.atom`.

In many places of the code, it implies that `.git` in not allowed at the end of namespaces, but many allowed it anyway. This MR forbids it everywhere to prevent potential issues (like the one with `.atom` going forward).

## What are the relevant issue numbers?
Group path validation incomplete, crashes groups dashboard #21077

## 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
  - [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 !5994
2016-10-10 13:39:39 +00:00
b26a3d5381 Merge branch 'fix-typo_doc-api-labels.md' into 'master'
Fix a typo in doc/api/labels.md

See merge request !6760
2016-10-10 13:13:19 +00:00
6f18c0a0b0 Merge branch '23123-build-sidebar-selected-build' into 'master'
Fix wrong icon in CI build detail sidebar: right-arrow => arrow-right

## What does this MR do?

It fixes a wrong icon name in the build detail page's sidebar: `right-arrow` should be `arrow-right`!

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

No.

Closes #23123

See merge request !6768
2016-10-10 12:54:25 +00:00
680b675eae Merge branch 'bpj-mr-loop' into 'master'
Prevent running GfmAutocomplete setup for each diff note

## What does this MR do?

Debounces GfmAutoComplete.setup.

## Why was this MR needed?

See https://gitlab.com/gitlab-org/gitlab-ce/issues/22704

Major lag on MR screens with many diff notes.

## Does this MR meet the acceptance criteria?

- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [x] 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 you do - 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?
https://gitlab.com/gitlab-org/gitlab-ce/issues/22704

See merge request !6569
2016-10-10 12:52:51 +00:00
5b5a2a5d4c Merge branch 'adam-commit-search-case-insensitive' into 'master'
Make searching for commits case insensitive.

## Does this MR meet the acceptance criteria?

- [x] [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 [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 you do - 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?

Fixes #21800

See merge request !6715
2016-10-10 12:47:46 +00:00
2d3210fd22 Merge branch 'shell-update' into 'master'
Update Gitlab Shell to fix errors moving projects between storages

## What does this MR do?

Update Gitlab Shell to fix errors moving projects between storages

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

No

## Why was this MR needed?

We are unable to move projects using `ionice` because of an error in the current version of gitlab-shell. This brings the changes of https://gitlab.com/gitlab-org/gitlab-shell/merge_requests/96 and https://gitlab.com/gitlab-org/gitlab-shell/merge_requests/97

## 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
- [ ] 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?

Related to https://gitlab.com/gitlab-com/infrastructure/issues/513

See merge request !6751
2016-10-10 12:32:39 +00:00
2e55580b90 Merge branch 'tests-use-tmpfs' into 'master'
Try tmpfs for repository storage, etc

See merge request !6730
2016-10-10 10:23:40 +00:00
2879da8cda Merge branch '22373-reduce-queries-in-api-helpers-find_project' into 'master'
Improve project policy specs

See merge request !6442
2016-10-10 10:22:44 +00:00
434d98b22a Merge branch 'gjlaubenstein/gitlab-ce-21712-change-issue-show-html-title'
reword title for issues_controller#show and issues_controller#edit

Closes #21712

See merge request !6503
2016-10-10 11:43:40 +02:00
ed24cf05fa Fix wrong icon in CI build detail sidebar: right-arrow => arrow-right
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-10-10 10:41:52 +02:00
b6a83be65f Merge branch 'brennanroberts/gitlab-ce-22872-prevent-default-search-autocomplete'
Prevent conflict b/w search field and its dropdown

What does this MR do?

Stops the global search form's default "action" from fighting with
dropdown items when using the keyboard to navigate the dropdown.
`e.preventDefault()` is now called on the enter key when a dropdown item
is already selected.

Closes #22872

See merge request !6643
2016-10-10 10:16:36 +02:00
f3c55164d2 Prevent conflict b/w search field and its dropdown
Stop the global search form's default "action" from fighting with
dropdown items when using the keyboard to navigate the dropdown.
`e.preventDefault()` is now called on the enter key when a dropdown item
is already selected.

Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-10-10 10:16:09 +02:00
1cf2b9a6b8 Make searching for commits case insensitive.
Fixes #21800.
2016-10-10 10:11:46 +02:00
90b0162c3b reword html titles for merge requests and issues 2016-10-09 10:11:55 -05:00
ef7f16faaa Fix a typo in doc/api/labels.md 2016-10-09 22:42:11 +09:00
904de2d64b Check for transition loopback in commit status 2016-10-08 20:42:09 +02:00
3fb4d86c6d Add temporary fix for race condition in MWBS 2016-10-08 20:34:45 +02:00
74fd5cab15 Improve transitions and run hooks after transaction 2016-10-08 20:25:16 +02:00
04afdb613e Improve spec for merge when build succeeds feature 2016-10-08 20:24:43 +02:00
4e963fed42 Merge branch 'sh-add-user-constraints' into 'master'
Fix missing constraints causing route failures when usernames with periods are used

Closes #23131

See merge request !6758
2016-10-08 16:59:34 +00:00
e72f2cfcb2 Fix missing constraints causing route failures when usernames with periods are used
Closes #23131
2016-10-08 09:58:25 -07:00
ed2fe98412 Merge branch 'sh-fix-for-ruby-2.1.0-spec' into 'master'
Use Hash rocket syntax to maintain Ruby 2.1 compatibility in spec

Builds in Ruby 2.1 specs were failing in master: https://gitlab.com/gitlab-org/gitlab-ce/builds/4883142

See merge request !6756
2016-10-08 12:59:11 +00:00
4695bb8829 Use Hash rocket syntax to maintain Ruby 2.1 compatibility in spec 2016-10-08 05:17:01 -07:00
28ca8502c2 Merge branch '22953-label-with-long-title-overlaps-description-field' into 'master'
Truncate long labels with ellipsis in labels page

## What does this MR do?
Fixes #22953, where long labels overlaps into the description field in the labels page. Truncates long labels with ellipsis. Labels that fit are unaffected.

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

## Why was this MR needed?
Fixes #22953.

## Screenshots (if relevant)
Existing behavior:
![image](/uploads/4d85730fe9d039d91036d09bf892d9f2/image.png)

With the change:
![desktop](/uploads/6866389cc3a1e2af5c2def59536a2a7c/desktop.png)
![mobile](/uploads/3d1fbb4a3470abefdd3670f7a794d2a8/mobile.png)

## Does this MR meet the acceptance criteria?
- [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry 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 you do - 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 #22953

See merge request !6725
2016-10-07 21:08:06 +00:00
48099e07bf Merge branch 'improve-contributing' into 'master'
Improve the contribution and MR review guide

## What does this MR do?

This merge request improves the contributing and MR review guides following @stanhu's reply on https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6096#note_16537211.

## Why was this MR needed?

To clearly state that MR reviews can take multiple iterations but that as reviewers we should do our best to minimize the number of iterations and take over any MR that is set as "Merge when build succeeds" at some point.

See merge request !6739
2016-10-07 19:02:07 +00:00
d6d61aad76 Update Gitlab Shell to fix errors moving projects between storages 2016-10-07 15:47:54 -03:00
4f1de5faac Correct namespace validation to forbid bad names #21077
Adds .git and .atom to the master namespace regex
Updates existing group tests and adds two new ones
Updates path cleaning to also forbid .atom
2016-10-07 13:46:59 -05:00