home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-25 12:36:27 +10:00
Code Issues Packages Projects Releases Wiki Activity
31,280 Commits 48 Branches 340 Tags
a8cf89a78c7fbcfc0a32b11f2ff4a33e2ecebb38
Commit Graph
3837 Commits
Author SHA1 Message Date
Rémy Coutable b8d75d41aa Merge branch 'fix/builds-api-builds-for-commit-search' into 'master' 
Find all builds for commit if there are multiple pipelines for it

## What does this MR do?

This MR fixes a builds API. When multiple pipelines were triggered for a commit, then API returned builds only from the last pipeline.

## What are the relevant issue numbers?

Closes #18912  
Closes #19243 

## 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
  - [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 !4849
 2016-06-28 17:10:07 +00:00
Achilleas Pipinellis 1ade080ec8 Merge branch 'iankelling-api-doc' into 'master' 
docs: fix default_branch_protection default



See merge request !4479
 2016-06-28 14:57:42 +00:00
Achilleas Pipinellis 9315597adb Merge branch 'add-smtp-upgrade-info' into 'master' 
Add SMTP upgrade information

8.8 to 8.9 requires an update to the SMTP settings for source installs.

See merge request !4966
 2016-06-28 13:11:26 +00:00
Stan Hu 3be80540aa Add SMTP upgrade information 
Closes #19252

[ci skip]
 2016-06-28 04:27:40 -07:00
Grzegorz Bizon 087f080871 Add documentation for commit builds API improvements 2016-06-28 13:04:11 +02:00
Achilleas Pipinellis 365015e3c9 Merge branch 'gitlab_architecture' into 'master' 
Refactor GitLab architecture document

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

See merge request !3694
 2016-06-28 10:34:46 +00:00
Chris Wilson 5eba2670c7 Add "GitLab team members only" to diagram link 2016-06-28 03:12:26 +00:00
http://jneen.net/ ffd8162191 doc: note that .gitattributes uses default branch 2016-06-27 14:17:49 -07:00
http://jneen.net/ f06fe77531 use the conf lexer so we have highlighted comments 2016-06-27 14:17:49 -07:00
http://jneen.net/ 8c15989621 first draft of docs 2016-06-27 14:17:49 -07:00
Stan Hu 0fcd72e06f Merge branch 'workhorse-gmake' into 'master' 
Mention gmake

Fixes https://gitlab.com/gitlab-org/gitlab-workhorse/issues/46

See merge request !4945
 2016-06-27 17:12:29 +00:00
Rémy Coutable 52be433c36 Merge branch 'case-insensitive-ci-skip' into 'master' 
Allow "ci skip" to be in any case

## What does this MR do?

This MR makes the check for the [ci skip] tag in a commit message case insensitive and adds support for [skip ci].

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

No.

## Why was this MR needed?

I couldn't understand why some of my commits were being built, even though they contained "[CI Skip]".

## What are the relevant issue numbers?
N/A
## Screenshots (if relevant)
N/A
## 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] 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 !4785
 2016-06-27 14:53:21 +00:00
Achilleas Pipinellis f48f7760c2 Merge branch 'update-ee-downgrade-instructions' into 'master' 
Update EE downgrade instructions to include JenkinsDeprecatedService

EE now includes JenkinsDeprecatedService in addition to JenkinsService, so we need to clean both when downgrading from EE to CE.

Closes #19133
    
[ci skip]

See merge request !4916
 2016-06-27 14:34:48 +00:00
Achilleas Pipinellis 298b4850ba Merge branch 'remove-docs-for-gitlab-ci-service-api' into 'master' 
Remove docs for GitLab CI Service API

## What does this MR do?

Documentation update: http://docs.gitlab.com/ce/api/services.html

Old GitLab CI Service API description will be removed from the docs.

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

n/a

## Why was this MR needed?

Obsolete information is harmful than nothing.

## What are the relevant issue numbers?

Closes #19167

## Does this MR meet the acceptance criteria?

- [n/a] [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)
- [n/a] 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 !4927
 2016-06-27 14:33:47 +00:00
Jacob Vosmaer 46d2015ea5 Mention gmake 2016-06-27 16:23:30 +02:00
Achilleas Pipinellis 0115ab7f40 Merge branch '2979-document-2fa-auth-changes' into 'master' 
Add notices about disabling auth features for users with 2FA.

Related to #2979

- Document the proposed changes to the GitLab authentication system.
- This is done because currently, users with 2FA enabled are allowed API access without a 2FA token.

# Tasks

- [ ]  #2979 !xxxx - Document proposed auth changes for 2FA users
    - [x]  Wait for replies on "[potential avenues for documenting the planned changes](https://gitlab.com/gitlab-org/gitlab-ce/issues/2979#note_12591578)"
    - [x]  Update documentation
    - [ ]  CHANGELOG entry?
    - [ ]  Merge conflicts

See merge request !4815
 2016-06-27 12:15:57 +00:00
Timothy Andrew f7fc352b4a Add notices about disabling auth features for users with 2FA. 2016-06-27 13:48:55 +05:30
Achilleas Pipinellis c5295f96a0 Merge branch 'add-debugging-tips' into 'master' 
Add debugging tips with gdb



See merge request !4522
 2016-06-26 22:40:55 +00:00
Takuya Noguchi 7773fe5b03 Remove docs for GitLab CI Service API 2016-06-27 00:56:17 +09:00
Ian Lee fa60c18a2e Removed unneeded word 2016-06-26 00:16:39 +00:00
Simon Welsh 0550f2a5e7 Add support for "skip ci" too 2016-06-25 11:38:06 +10:00
Simon Welsh 2fc91c4865 Allow "ci skip" to be in any case 2016-06-25 11:36:36 +10:00
Stan Hu 12c688c103 Update EE downgrade instructions to include JenkinsDeprecatedService 
Closes #19133

[ci skip]
 2016-06-24 12:11:46 -07:00
Stan Hu 67e83543b3 Add debugging tips with gdb 
[ci skip]
 2016-06-24 08:58:32 -07:00
Achilleas Pipinellis 0372afe22a Merge branch 'update-regexp-doc' into 'master' 
Update default regexp documentation to match reality

The regexp was updated in 8172d2c1 but this was stale.


See merge request !4866
 2016-06-24 15:39:45 +00:00
Rémy Coutable 588244ddd8 Merge branch 'mahcsig/gitlab-ce-17818-group-issues-api' 2016-06-24 13:44:47 +02:00
Robert Speicher 9e43fc151b Merge branch 'hamlit-test' into 'master' 
Replace Haml with Hamlit

What this change does:
- It replaces HAML with [Hamlit](https://github.com/k0kubun/hamlit), a much more efficient implementation of HAML.
- It removes `haml-rails`.
- It adds `hamlit.rb` and removes `haml.rb`.
- It makes things faster and less memory-hungry!

See also #13201.

See merge request !3666
 2016-06-23 23:51:08 +00:00
Connor Shea 262f902d9a Restrict hamlit version, remove coffeescript filters. 2016-06-23 15:54:23 -06:00
Achilleas Pipinellis b7c7ebee59 Merge branch 'document-emoji-rake-tasks' into 'master' 
Added basic docs for the Emoji Rake tasks

## What does this MR do?

This MR adds basic documentation for the two Emoji Rake tasks.

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

Spelling, that sort of thing.

## Why was this MR needed?

These Rake tasks only had some small amount of source level documentation.

## What are the relevant issue numbers?

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

## 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)
- [ ] 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 !4877
 2016-06-23 19:37:46 +00:00
Marc Siegfriedt 6587feba65 gitlab-org/gitlab-ce#17818 - add api call for issues by group 
rely only on IssuesFinder
docs and changelog
 2016-06-23 16:31:48 +00:00
Yorick Peterse a5670cd59b Added basic docs for the Emoji Rake tasks 
Fixes gitlab-org/gitlab-ce#14794 gitlab-com/performance#13

[ci skip]
 2016-06-23 16:17:49 +02:00
Drew Blessing 8d96bae6db Remove Rubocop skip comment from migration style guide [ci skip] 2016-06-23 09:01:04 -05:00
Yorick Peterse b8b09a8c0a Use influxdb-management for managing InfluxDB 
This removes the need for manually updating the list of queries every
time we make a change.

[ci skip]
 2016-06-23 13:01:45 +02:00
Yorick Peterse 8d5bdf081a Updated InfluxDB continuous queries for 8.9.0 
[ci skip]
 2016-06-23 11:37:02 +02:00
Chris Wilson bb5a6e3c51 Update GitLab architecture diagram, include Google draw link 
[ci skip]
 2016-06-23 02:21:39 +00:00
Drew Blessing 9487dd3a40 Merge branch 'fix_upgrade_docs' into 'master' 
Update docs based on customer upgrade from 4.0

## What does this MR do?

Adds helpful notes to early upgrade docs. Without these helpful hints it will be really hard for most people to upgrade from early versions to later versions. 

The tip about doing database migrations to version 6.1, then migrating iids, then migrating the database all the way was based on a tip from https://github.com/gitlabhq/gitlabhq/issues/7869. It worked really well!


See merge request !4409
 2016-06-22 21:29:59 +00:00
Drew Blessing 2538c4ec8a Update docs based on customer upgrade from 4.0 [ci skip] 2016-06-22 16:27:00 -05:00
Stan Hu 69c70928c8 Update default regexp documentation to match 8172d2c1. 
[ci skip]
 2016-06-22 14:10:24 -07:00
Robert Speicher cb0283d218 Merge branch 'inline-todos-docs' into 'master' 
Update Todos documentation and screenshots to include new functionality.

Updates documentation for todos, includes updated and new screenshots.

See also !4502 and #18906 

Closes #18923

[ci skip]

See merge request !4840
 2016-06-22 17:06:49 +00:00
Connor Shea ac212b9ca4 Finish my sentence. [ci skip] 2016-06-22 08:49:40 -06:00
Achilleas Pipinellis 6f6c6f68ea Merge branch 'doc_refactor_labels' into 'master' 
Refactor labels docs

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

See merge request !3347
 2016-06-22 12:18:47 +00:00
Achilleas Pipinellis 7e42d4992c Merge branch 'expiry' into 'master' 
Clarify artifact expiry

## What does this MR do?

Clarifies documentation about artifact expiry.

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

## Why was this MR needed?

## What are the relevant issue numbers?

## Screenshots (if relevant)


See merge request !4831
 2016-06-22 12:10:42 +00:00
Achilleas Pipinellis 564026f6af Merge branch 'ci-git' into 'master' 
Document `GIT_STRATEGY` and `GIT_DEPTH`

## What does this MR do?

Documents `GIT_STRATEGY` and `GIT_DEPTH`. Also fixes the TOC since the anchors weren't working.

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

The TOC and the location of the new entries.

## Why was this MR needed?

## What are the relevant issue numbers?

https://gitlab.com/gitlab-org/gitlab-ci-multi-runner/merge_requests/188

## Screenshots (if relevant)

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

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

/cc @axil @ayufan 

See merge request !4720
 2016-06-22 12:10:06 +00:00
Achilleas Pipinellis 78186c68ff Refactor labels documentation 
- Add new images to match the new UI
- Document the new prioritize feature
 2016-06-22 13:50:02 +02:00
Achilleas Pipinellis 79a9cfa375 Merge branch 'feature/import-export-docs' into 'master' 
import/export docs

Added documentation for and closes https://gitlab.com/gitlab-org/gitlab-ce/issues/3050

Also added a couple of rake tasks that might be useful.

See merge request !4732
 2016-06-22 10:31:20 +00:00
Achilleas Pipinellis 2232b56d39 Merge branch 'award-emoji-docs' into 'master' 
Expand on Award Emoji documentation, update/add screenshots.

Adds documentation for award emoji now that comments can be awarded with emojis.

See also !4291 and #18906 

Closes #9091

cc: @virtuacreative @axil 

See merge request !4839
 2016-06-22 10:30:40 +00:00
Achilleas Pipinellis e1917b56c6 Merge branch 'hotfix/better-container-registry-documentation' into 'master' 
Add some docs for Docker Registry configuration - Relatively important for anyone installing from source

There have been a few issues created because of the lack of documentation for how to configure Docker Registry when installing from source, specifically what the `realm` needs to be and the `service`

These 2 bits of info will stop a lot of headaches 👍 

Issues:
https://gitlab.com/gitlab-org/gitlab-ce/issues/17957
https://gitlab.com/gitlab-org/gitlab-ce/issues/17991

See merge request !4738
 2016-06-22 10:30:22 +00:00
Achilleas Pipinellis 193d7079a6 Merge branch 'master' into feature/import-export-docs 2016-06-22 11:48:00 +02:00
Achilleas Pipinellis 51b51de77d Give images proper names 2016-06-22 11:41:50 +02:00
Achilleas Pipinellis a41b468816 Add note about the shared directory 2016-06-22 11:31:07 +02:00