home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-16 08:06:08 +10:00
Code Issues Packages Projects Releases Wiki Activity
24,611 Commits 48 Branches 340 Tags
3be20afa9f7bfb4e4d13b30d5cfcd304b79ea478
Commit Graph
3120 Commits
Author SHA1 Message Date
Robert Speicher cbe8b70908 Merge branch 'patch-1' into 'master' 
Typo in API documentation

[ci skip]

See merge request !3058
 2016-03-02 17:43:05 +00:00
Achilleas Pipinellis 77c7a0e9ee Merge branch 'docs_todos' into 'master' 
Add Todos documentation

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

See merge request !3064
 2016-03-02 12:37:29 +00:00
Achilleas Pipinellis 5ee049fcfb Add Todos documentation 
[ci skip]
 2016-03-02 14:33:47 +02:00
bb-froggy 2af778c4fa typo 2016-03-02 09:42:14 +00:00
Achilleas Pipinellis 07bc0b43b0 Merge branch 'notes_guidelines' into 'master' 
Change doc styleguide to use blockquotes for notes



See merge request !3009
 2016-03-02 08:00:33 +00:00
Achilleas Pipinellis 156642cfa4 Merge branch 'saml-doc-update' into 'master' 
Updated SAML and Omniauth docs

Updated SAML and Omniauth docs with information on the new behavior recently introduced in !2882

/cc @ernstvn @DouweM 

See merge request !2950
 2016-03-02 06:02:04 +00:00
Patricio Cano 3f70c8f2db Style updates. 2016-03-01 13:51:47 -05:00
Douwe Maan 6b0e37b05f Merge branch 'rel-url-fix' into 'master' 
Fix relative URL

See https://github.com/gitlabhq/gitlabhq/issues/10053

 1. Same configuration way for relative URL like with Omnibus
 2. Loading the relative configuration from Rakefile as Rails do not load initializers for `asset:precompile`

First point has another positive side effect: no collisions (due to git controlled `application.rb`) any more during the upgrades of source based installations and relative url configuration

 - [x] tests on the source based installation
 - [x] tests on the centos&ubuntu omnibus packages

Fixes: gitlab-org/gitlab-ce#13730, gitlab-org/gitlab-ce#13727, gitlab-org/omnibus-gitlab#1143 and https://github.com/gitlabhq/gitlabhq/issues/10053

See merge request !2979
 2016-03-01 16:24:43 +00:00
Achilleas Pipinellis 581da235bf Merge branch 'triggers_link' into 'master' 
Add link to triggers doc in variables section

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

See merge request !3025
 2016-03-01 07:58:39 +00:00
Achilleas Pipinellis 141783d592 Add link to triggers doc in variables section 
[ci skip]
 2016-03-01 09:57:09 +02:00
Artem Sidorenko 28ba8ed5f5 Use dedicated relative_url.rb initializer 
in order to have it the same way like in omnibus
 2016-02-29 21:17:48 +01:00
Douwe Maan 2ea8f71bb4 Merge branch '11489-branded-appearance-to-ce' into 'master' 
Branded appearance to CE

Closes #11489 

The difference with the EE version is only that there is no distinction between light and dark logos, though this wasn't used anyway. If this is fine, I'll create a MR on EE too.

TODO:
- [x] Copy docs
- [x] Make new screenshots
- [ ] Remove Custom Welcome message feature?

@rymai: I was unsure what labels to add to ping you, so I just ping you like this 😉 

/cc @DouweM

See merge request !2927
 2016-02-29 13:18:29 +00:00
Achilleas Pipinellis bfeab78ab5 Change doc styleguide to use quotes for notes 
[ci skip]
 2016-02-29 15:00:40 +02:00
Achilleas Pipinellis 9e3c78724b Link to examples page 
[ci skip]
 2016-02-29 14:50:08 +02:00
Achilleas Pipinellis f742ddeebe Reorganize CI sections and give descriptive names to links 2016-02-29 14:44:08 +02:00
Achilleas Pipinellis e1e6dd76f5 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ci_examples 2016-02-29 13:31:17 +02:00
Douwe Maan 17251cf447 Merge branch 'rs-development-docs' into 'master' 
Add "Gotchas" to development docs

Also:

- Alphabetizes the "Developer" index page
- Fixes the broken `db_dump.md` link

See merge request !2846
 2016-02-29 11:00:33 +00:00
Thomas Schmidt d324c67db3 Adjust documentation of permissions 
[ci skip]
 2016-02-27 23:26:04 +01:00
Achilleas Pipinellis cbd9f1bc09 Move languages to examples 2016-02-26 22:51:07 +02:00
Zeger-Jan van de Weg 9a2869ab46 Branded login page also in CE 
The only major difference with the EE version is the change from a light and dark logo to only a header logo
The dark logo wasn't used anyway, so it seemed to make sense to me to rename the field to the actual function of it
 2016-02-26 15:50:51 +01:00
Achilleas Pipinellis 3f83d1dc3a Merge branch 'patch-1' into 'master' 
Reformats confusing '[named here]' section for 3rd party code attribution

Weird formatting originally. Which of the following is the proper format for attribution?

1. Submitted on behalf of a third-party: [David Alexander]
1. Submitted on behalf of a third-party: [[] David Alexander]
1. Submitted on behalf of a third-party: [] David Alexander
1. Submitted on behalf of a third-party: [[ David Alexander ]]
1. ... _etc._

With this change, it allows for either of the following formats:

1. Submitted on behalf of a third-party: [David Alexander]
1. Submitted on behalf of a third-party: David Alexander

See merge request !2861
 2016-02-26 09:28:22 +00:00
Achilleas Pipinellis f37e031bc9 Merge branch 'master' into 'master' 
Add instructions for pushing tags as well as branches

Current instructions will push the svn branches but not tags  - add missing line to tags


See merge request !2778
 2016-02-26 09:27:05 +00:00
Achilleas Pipinellis 83ba37e544 Merge branch 'fix_git_tag_in_architecture' into 'master' 
Fixed ~git beeing displayed as link to issues tagged with git in architecture.md

The architecture documentation explains `~git` from the picture below which is replaced by a [link to issues tagged with `git`](https://gitlab.com/gitlab-org/gitlab-ce/issues?label_name=git). I believe that this was unintended and should be fixed by using backticks.

![Screenshot_from_2016-02-13_21-36-30](/uploads/5ea1a60e8b230952874e58eab0abe1ac/Screenshot_from_2016-02-13_21-36-30.png)

See merge request !2814
 2016-02-24 20:16:50 +00:00
Achilleas Pipinellis 8fecb47c07 Merge branch 'commit-status-permission-update' into 'master' 
Update commit status permissions [ci skip]

cc @axil 


See merge request !2942
 2016-02-24 20:15:23 +00:00
Patricio Cano 265d45c4eb Updated SAML and Omniauth docs with information on the new behavior recently introduced in !2882 2016-02-23 17:25:24 -05:00
Alfredo Sumaran 89d8e72b6c Update shortcuts image 2016-02-23 12:21:14 -05:00
Kamil Trzcinski 7b785fd773 Update commit status permissions [ci skip] 2016-02-23 16:13:12 +01:00
Marin Jankovski f317d5fcb9 Merge branch 'uploads-700' into 'master' 
Restrict permissions on public/uploads

Based on https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests/631

See merge request !2764
 2016-02-23 15:12:20 +00:00
Robert Speicher d10b43dae3 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2016-02-22 15:24:20 -05:00
Robert Speicher 9871612d50 Add missing word to GitLab Flow doc 
[ci skip]
 2016-02-22 15:23:11 -05:00
Sytse Sijbrandij b31c68aa2a Make sure we recommend 2GB 2016-02-22 17:35:18 +00:00
Achilleas Pipinellis 13fd08b157 Add when the API changes got introduced 
[ci skip]
 2016-02-22 14:30:22 +02:00
Achilleas Pipinellis ad833c934b Fix docs on artifacts API 
- Backticks in parameters
- Remove headings
- Fix curl URL link

[ci skip]
 2016-02-20 14:13:21 +02:00
yuxiao.lxy 74eb4215a5 correct compare_braches.png to /compare_branches.png and make sure it works in line 25 in add-merge-request.md 2016-02-20 12:20:58 +08:00
Kamil Trzciński 20781b2927 Merge branch 'builds-artifacts-API' into 'master' 
Introduce API for serving the artifacts archive

Add API to download build artifacts archive in context of GitLab API

/cc @DouweM @grzesiek 

See merge request !2893
 2016-02-19 22:30:11 +00:00
Achilleas Pipinellis 2cc9a42ca4 Merge branch 'doc/add-build-email-service' into 'master' 
Add documentation about build emails service

Closes #12497

See merge request !2871
 2016-02-19 21:36:47 +00:00
Achilleas Pipinellis 7f5f56d443 Move builds emails service to its own document 
[ci skip]
 2016-02-19 23:35:26 +02:00
Robert Schilling 041cae6792 Merge pull request #10042 from sestus/master 
Typo fix in README.md of ci quick-start docs.
 2016-02-19 22:12:23 +01:00
Kamil Trzcinski 17182cdfe0 Fix documentation 2016-02-19 20:56:56 +01:00
Robert Speicher 94915f97de Merge branch 'gitlab-ce-fix/revert-ruby-2.2' into 'master' 
revert back to ruby 2.1

- - -

Revert Ruby 2.2 changes - until we solve https://gitlab.com/gitlab-org/gitlab-ce/issues/13514

This also updates Ruby 2.1.7 to 2.1.8

See merge request !2898
 2016-02-19 18:59:54 +00:00
Achilleas PipinellisandRobert Speicher 78d3444fa7 Refactor and conform to styleguide 
[ci skip]
 2016-02-19 13:15:42 -05:00
Achilleas PipinellisandRobert Speicher a63bcb7b6d Rename image names to conform with styleguide 2016-02-19 13:15:42 -05:00
Achilleas PipinellisandRobert Speicher e406eb7d6a Add revert changes doc to workflow README 2016-02-19 13:15:42 -05:00
Achilleas PipinellisandRobert Speicher d521079fd8 Move images to img/ directory 2016-02-19 13:15:42 -05:00
Rubén DávilaandRobert Speicher d6e3abccb8 Add documentation for revert changes feature. 2016-02-19 13:15:42 -05:00
Kamil Trzcinski 6c6bb79422 Fix API 2016-02-19 18:30:43 +01:00
Kamil Trzcinski 921cfb66e6 Introduce API for serving the artifacts archive 2016-02-19 18:30:13 +01:00
Grzegorz Bizon 7d5a182624 Use POST method instead of DELETE when erasing a build 
Discussion:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2560#note_3742042
 2016-02-19 17:24:59 +01:00
Grzegorz Bizon ec5c3c029c Add API documentation for build erase endpoint 2016-02-19 17:24:59 +01:00
James Lopez af0ba6605b revert back to ruby 2.1 - use 2.1.8 2016-02-19 17:19:57 +01:00