home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-26 13:06:41 +10:00
Code Issues Packages Projects Releases Wiki Activity
23,733 Commits 48 Branches 340 Tags
c8b6ec47ade1c8685c085310d650fb9af1c44521
Commit Graph
2992 Commits
Author SHA1 Message Date
Robert Speicher 7ea60fbfc8 Merge remote-tracking branch 'dev/master' into 'master' 2016-02-09 12:13:58 -05:00
Douwe Maan 6b0801d4f3 Merge branch 'develop7/add-merge_status-to-merge-request-in-api' into 'master' 
Expose MergeRequest#merge_status

_Originally opened at !2478 by @develop7._

- - -

This enables API users to see whether a merge request can be merged without conflicts.

See merge request !2756
 2016-02-09 16:01:20 +00:00
Douwe Maan 80352b783c Merge branch '3kami3/gitlab-ce-root_email' into 'master' 
Add an option to supply root email through an environmental variable.

_Originally opened at !2499 by @3kami3._

---

Add an option to supply root email through an environmental variable.

See merge request !2751
 2016-02-09 13:55:52 +00:00
Robert Speicher 201fb4c7e3 Merge branch 'ci-permissions' into 'master' 
Limit guest access to builds

Closes https://dev.gitlab.org/gitlab/gitlabhq/issues/2646

See merge request !1942
 2016-02-08 23:33:44 +00:00
Paul Johnson 910e5fd217 Fix grammar in installation requirements. 
Fixes #13274
 2016-02-08 22:03:10 +01:00
3kami3andRémy Coutable cdcedd5b26 Add an option to supply root email through an environmental variable. 2016-02-08 18:26:29 +01:00
Rémy Coutable f6a666bdc2 Add an API spec for MergeRequest#merge_status and properly document this resource 2016-02-08 17:18:44 +01:00
Achilleas Pipinellis 66fe68ac7c Merge branch 'jira_when_ce' into 'master' 
Clarify when JIRA service was backported to CE



See merge request !2744
 2016-02-07 22:42:51 +00:00
Achilleas Pipinellis ed093f1ef0 Clarify when JIRA service was backported to CE 
[ci skip]
 2016-02-08 00:37:45 +02:00
Achilleas Pipinellis d734b38359 Merge branch 'markdown_help' into 'master' 
Change logo image name in markdown documentation

Closes #13233

See merge request !2743
 2016-02-07 15:59:47 +00:00
Achilleas Pipinellis ab0525eafb Change logo image name in markdown documentation 
[ci skip]
 2016-02-07 17:58:49 +02:00
Achilleas Pipinellis bce482a59a Merge branch 'patch-1' into 'master' 
fixed Windows commands in SSH Help.

The current commands shown don't work in Command Line, or PowerShell. Command Line doesn't recognize the `~` character as the home directory, the `<` character is reserved in PowerShell, and `cat` doesn't work in Command Line. This commit provides commands that will work for both the Command Line, and PowerShell.

See merge request !2694
 2016-02-06 18:35:01 +00:00
Aaron Power b92ce40daa Fixed Window's commands for SSH Help. 2016-02-06 12:17:12 +00:00
Kamil Trzcinski 170ca8435a Merge branch 'master' into ci-permissions 
# Conflicts:
#	db/schema.rb
 2016-02-05 20:15:32 +01:00
Achilleas Pipinellis aa5eca47db Make sure the public/uploads/ directory is created 
[ci skip]
 2016-02-05 18:28:46 +02:00
Achilleas Pipinellis 569c467203 Merge branch 'ruby_sha' into 'master' 
Fix Ruby SHA in installation guide

The Ruby SHA that we were checking against in the
installation guide was wrong. I replaced it with
sha256sum which is also present in the Ruby downloads
page. Also added it as a note in the doc styleguide. 

See merge request !2726
 2016-02-05 15:28:09 +00:00
Achilleas Pipinellis a95c6e38c6 Add ruby version update info in doc_styleguide 
[ci skip]
 2016-02-05 17:26:40 +02:00
Achilleas Pipinellis bf94ddef78 Fix wrong Ruby SHA and replace with sha256sum 
[ci skip]
 2016-02-05 16:53:00 +02:00
Achilleas Pipinellis 9afcacb3a4 Merge branch 'doc_refactor_session_api' into 'master' 
Refactor session API documentation



See merge request !2473
 2016-02-05 10:11:44 +00:00
Achilleas Pipinellis 6d18f748f0 Merge branch 'doc_refactor_deploy_key_multiple_projects_api' into 'master' 
Refactor deploy_key_multiple_projects API documentation



See merge request !2468
 2016-02-05 10:10:23 +00:00
Eric L Frederich f835fa8d75 fix documentation bug / typo 2016-02-04 10:42:36 -05:00
Kamil Trzcinski 6fea7c386f Merge remote-tracking branch 'origin/master' into ci-permissions 
# Conflicts:
#	app/views/projects/builds/index.html.haml
 2016-02-04 13:16:48 +01:00
Kamil Trzcinski b4c36130cc Rename allow_guest_to_access_builds to public_builds 2016-02-04 12:57:46 +01:00
Kamil Trzcinski 6a5a175d9f Expose allow_guest_to_access_builds in GitLab API 2016-02-04 11:14:12 +01:00
Achilleas Pipinellis bb51e9c66e Merge branch 'fix-build-artifacts-doc' into 'master' 
Cleanup artifacts section in Docs

- Added Note that artifact collection is only done for successful builds.
- Cleaned up Windows Support and Version notes.

See merge request !2619
 2016-02-03 14:32:13 +00:00
Rémy Coutable c1faa836f6 Merge branch 'improve-environment-variables-doc' into 'master' 
Improving the "Environment variables" administration doc

Closes #12829.

/cc @sytses 

See merge request !2669
 2016-02-03 13:47:19 +00:00
Achilleas Pipinellis 9fbe9d97ed Unicorn worker killer is not Omnibus specific 
[ci skip]
 2016-02-03 14:18:51 +02:00
Achilleas Pipinellis ea14429b7e Clean up environment variables doc 
[ci skip]
 2016-02-03 13:56:23 +02:00
Achilleas Pipinellis 43d8dbaedd Merge branch 'update_doc' into 'master' 
Update OAuth doc



See merge request !2589
 2016-02-03 11:23:22 +00:00
Achilleas Pipinellis cbd550cfa6 Refactor OAuth provider documentation 
[ci skip]
 2016-02-03 13:18:37 +02:00
Achilleas Pipinellis 2e056d5ee2 Merge branch 'aral/gitlab-ce-master' into 'master' 
Added note: working copy changes should be stashed before update process

Originally proposed by @aral in !1043.

Added note: working copy changes (e.g., deleted vendor folder) should be stashed before beginning the update process.
We should probably include this notice on all update guides.

See merge request !2668
 2016-02-03 09:58:08 +00:00
Robert Speicher 8a85906a74 Merge branch 'support-akismet' into 'master' 
Support Akismet spam checking for creation of issues via API

Currently any spam detected by Akismet for non-members via API will
be logged in a separate table in the admin page.

Closes #5612

See merge request !2266
 2016-02-03 01:26:30 +00:00
Malte BlättermannandMalte Blättermann acea6e1c50 Documentation cleanup of artifacts section in Gitlab CI Readme 
- Added notice about build artifacts not beeing collected on failed builds.
- Removed "introduced in 0.7.0" for artifacts section.
- Made windows notice more precise
 2016-02-02 22:43:15 +01:00
Jacob Vosmaer 752468d55b Merge branch 'git-raw-workhorse' into 'master' 
Send raw Git blobs via gitlab-workhorse



See merge request !2451
 2016-02-02 17:22:04 +00:00
Kamil Trzcinski 627909c2a4 Add CI setting: allow_guest_to_access_builds 
Add the `read_build` ability if user is anonymous or guest and allow_guest_to_access_builds is enabled.
 2016-02-02 17:59:37 +01:00
Robert Speicher dc390c5ac2 Merge branch 'patch-1' into 'master' 
explicitly call script with bash for consistency

simpler than telling users to set script executable

[ci skip]

See merge request !2621
 2016-02-02 16:25:37 +00:00
Jacob Vosmaer ea41d36077 Use gitlab-workhorse 0.6.3 in installation guide 2016-02-02 16:01:20 +01:00
Stan HuandDouglas Barbosa Alexandre d20e75a8d8 Support Akismet spam checking for creation of issues via API 
Currently any spam detected by Akismet by non-members via API will be logged
in a separate table in the admin page.

Closes #5612
 2016-02-02 11:25:44 -02:00
Achilleas Pipinellis ded170eb2e Merge branch 'patch-1' into 'master' 
Fix typo indentation in CI projects' API



See merge request !2561
 2016-02-02 12:16:35 +00:00
Rémy Coutable 06c0025f16 Improving the "Environment variables" administration doc 2016-02-01 19:10:46 +01:00
Aral BalkanandRémy Coutable e6cb010088 Added note: working copy changes (e.g., deleted vendor folder) should be stashed before beginning the update process. We should probably include this notice on all update guides. 
[ci skip]
 2016-02-01 17:11:25 +01:00
Robert Speicher 3986f4f083 Make "Two-factor" casing consistent throughout the application 2016-01-31 20:34:51 -05:00
Achilleas Pipinellis 0b3c76c72f Merge branch 'improve-gitlab-flow-doc' into 'master' 
Improve GitLab flow documentation regarding the WIP merge requests



See merge request !2647
 2016-01-31 19:12:21 +00:00
Achilleas Pipinellis dec2151718 Merge branch 'patch-1' into 'master' 
Fixed typo for PRIVATE-TOKEN header

Was PRIVATE_TOKEN but should be PRIVATE-TOKEN.
Underscore vs. kebab-case.

See merge request !2624
 2016-01-29 18:02:48 +00:00
Rémy Coutable 87d3ce88c7 Improve GitLab flow documentation regarding the WIP merge requests 
[ci skip]
 2016-01-29 10:39:42 +01:00
Sytse Sijbrandij 92c04ecbd7 Make changes in config/initializers/1_settings.rb 2016-01-28 17:06:21 -08:00
Dmitriy Zaporozhets dfb8803c1c Improve consistency and duplication for Merge Request API 
* Follow REST for merge request API route
* Remove repeating comments API for MR

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2016-01-28 14:26:12 +01:00
Robert Speicher ca171b8190 Update gitlab-workhorse versions in documentation 
[ci skip]
 2016-01-27 18:30:36 -05:00
James Lopez 683770f35d Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into update-ruby-2.2.4 2016-01-27 15:42:35 +01:00
James Lopez 1b84de573d updated docs to reflect min requirement of 2.1 [ci skip] 2016-01-27 14:48:15 +01:00