home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-23 03:26:07 +10:00
Code Issues Packages Projects Releases Wiki Activity
26,676 Commits 48 Branches 340 Tags
34d7619a1c424029ebfb20c19bdaeff67b045891
Commit Graph
3364 Commits
Author SHA1 Message Date
Achilleas Pipinellis dabedd1d8c Merge branch 'fix_grafana_docs' into 'master' 
Fix Grafana docs and link from Influx page

Fixing images and adding links to Influx docs, as suggested by @sytses 

See merge request !3702
 2016-04-13 14:26:35 +00:00
Marin Jankovski c746046992 Merge branch 'external-omniauth-providers' into 'master' 
Allow Omniauth providers to be marked as external

Related to #4009 

With this MR we will be able to allow the user to set which Omniauth Providers they would like to have as external. All users login in via these providers will be marked as external, even if they already had an account before. If the provider is removed form the list of external providers, the users will be marked as internal at their next login.

MR for Omnibus: gitlab-org/omnibus-gitlab!727

/cc @dblessing @DouweM 

See merge request !3657
 2016-04-13 13:09:47 +00:00
Dmitriy Zaporozhets 87cd46c475 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2016-04-13 14:47:17 +02:00
Rémy Coutable 861e685e18 Merge branch 'api-move-issues' into 'master' 
API: Ability to move an issue

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

See merge request !3593
 2016-04-13 10:55:12 +00:00
Robert Schilling 94c8fbc9fc Merge branch 'patch-2' into 'master' 
improve formatting



See merge request !3688
 2016-04-13 10:25:58 +00:00
Robert Schilling fdbf368202 Fix doc for moving an issue 2016-04-13 12:03:05 +02:00
Rémy Coutable e83424a13e Merge branch 'configure_trusted_proxies' into 'master' 
Adjust the default trusted_proxies to only include localhost

And also allow other trusted proxies to be added from the config.yml.

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/3538

Omnibus config: https://gitlab.com/gitlab-org/omnibus-gitlab/issues/1208

See merge request !3524
 2016-04-13 09:53:13 +00:00
Robert Schilling 2b036025d6 Update tests for moving issues via API 2016-04-13 11:31:50 +02:00
Achilleas Pipinellis 244219376d Tie example config to JIRA screenshot 
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15203
 2016-04-13 12:28:07 +03:00
Robert Schilling 482f67edb4 API: Ability to move an issue 2016-04-13 11:23:42 +02:00
Achilleas Pipinellis 6bb71869b8 Merge branch 'docs-new-branch-button-3886' into 'master' 
Docs for the new branch button

[ci-skip]

Closes #3886 

@axil Could you check this and make sure this is up to your standards?



See merge request !3425
 2016-04-13 09:02:14 +00:00
Achilleas Pipinellis 4a09a6c6f2 Move 'New branch from issue' feature doc to web_editor.md 
[ci skip]
 2016-04-13 11:31:06 +03:00
Rémy Coutable fc9e1be1fd Merge branch 'api-group-visibility' into 'master' 
API: Ability to update a group

This makes it much easier to update a group after introducing the group visibility.

* Closes #14991 

See merge request !3587
 2016-04-13 08:23:29 +00:00
Ben Bodenmiller a0008f2720 improve formatting 2016-04-12 23:57:42 +00:00
Lee fd248b0f06 (doc) fix typo to ssh keys doc url 2016-04-12 16:13:31 -05:00
Drew Blessing 4e5ae5a281 Fix Grafana docs and link from Influx page 2016-04-12 15:40:53 -05:00
DJ Mountney e18f20d711 Updated trusted proxies doc section to link to the restart GitLab docs 2016-04-12 11:02:41 -07:00
DJ Mountney bb372ac97f Add changelog entries, install docs, and gitlab.yml.example entry for the trusted_proxies setting 2016-04-12 10:42:59 -07:00
Robert Schilling 5fb572417e Fix minor issues according development guidelines 2016-04-12 19:08:35 +02:00
Rémy Coutable e322b993e7 Merge branch 'api-delete-note' into 'master' 
Delete notes via API

Supports deleting issues, snippets, and merge requests via the API.

* Closes #14944
* Closes #14845 
* Closes #6060 

@zj I did not see that you assigned yourself in #6060. Hopefully, you did not start yet.

@rymai In #6060 this is targeted for 8.7 release. Could you review that and maybe this still lands in 8.7. 


See merge request !3557
 2016-04-12 14:34:50 +00:00
Rémy Coutable a5512099ce Merge branch 'api-get-tag' into 'master' 
API: Ability to retrieve a single tag

* Closes #14330

/cc @dblessing

See merge request !3577
 2016-04-12 14:04:40 +00:00
Robert Schilling d0cdc2ee73 API: Ability to update a group 2016-04-12 15:47:20 +02:00
Zeger-Jan van de Weg 6dbcb880cc Allow a project member to leave the projected through the API 2016-04-12 14:30:42 +02:00
Robert Schilling 9aefaa41ab Fix code review issues 2016-04-12 14:24:05 +02:00
Robert Schilling ba21c00f01 Delete notes via API 2016-04-12 14:24:05 +02:00
Robert Schilling f81352f531 Fix minor styling issues from code review 2016-04-12 14:12:30 +02:00
Robert Schilling 20d4ca4cc3 API: Ability to retrieve a single tag 2016-04-12 12:38:59 +02:00
Robert Schilling 10080ce362 API: Expose updated_at for notes 2016-04-12 12:32:34 +02:00
Rémy Coutable 8cb41f1989 Merge branch 'api-labels-info' into 'master' 
API: Expose open_issues_count, closed_issues_count, open_merge_requests_count on labels

Partly fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/13238

See merge request !3569
 2016-04-12 09:21:00 +00:00
Patricio Cano cedfe9d228 Documentation of feature 2016-04-11 10:16:56 -05:00
Jacob Vosmaer ca0b3ea1f1 Go back to gitlab-workhorse 0.7.1 
We found out that 0.7.2 breaks shallow `git clone`. GitLab 8.7 will
work fine with gitlab-workhorse 0.7.1 too.
 2016-04-11 17:03:27 +02:00
Yorick Peterse 15cbbd09fb Merge branch 'metrics-measure-block-transaction' into 'master' 
Store block timings as transaction values

See merge request !3649
 2016-04-11 13:16:58 +00:00
Dmitriy Zaporozhets 1794e934ce Merge branch 'rs-code-review-guide' into 'master' 
First pass at a Code Review guide

Largely borrowed from thoughtbot's code review guide, so attribution is
included.

[ci skip]

See merge request !3639
 2016-04-11 11:28:42 +00:00
Yorick Peterse d9110a7eca Track call counts in Gitlab::Metrics.measure_block 2016-04-11 13:27:52 +02:00
Yorick Peterse 16926a676b Store block timings as transaction values 
This makes it easier to query, simplifies the code, and makes it
possible to figure out what transaction the data belongs to (simply
because it's now stored _in_ the transaction).

This new setup keeps track of both the real/wall time _and_ CPU time
spent in a block, both measured using milliseconds (to keep all units
the same).
 2016-04-11 13:09:36 +02:00
Achilleas Pipinellis 85279c07c9 Merge branch 'patch-1' into 'master' 
Correct documentation on enabling artifacts.

The docs say to enable artifacts that settings should be set to "false".  This updates the documents to change the setting to "true".

See merge request !3630
 2016-04-11 09:44:23 +00:00
Robert Speicher 0c6923e2d1 Re-add a note about sarcasm to the Code Review guide 
[ci skip]
 2016-04-10 22:54:44 -04:00
Benjamin Montgomery 84ff30a6b2 fix typo 2016-04-10 21:16:06 +00:00
Benjamin Montgomery 1e99e56202 Make the purpose of artifact config options clearer 2016-04-10 21:14:40 +00:00
Robert Speicher c7ec5929b1 First pass at a Code Review guide 
Largely borrowed from thoughtbot's code review guide, so attribution is
included.

[ci skip]
 2016-04-09 21:49:47 -04:00
Sytse Sijbrandij 98f536f169 Everything on one page. 2016-04-09 20:09:07 -04:00
Benjamin Montgomery ca823065a9 actually enable artifacts 2016-04-09 20:51:15 +00:00
Robert Speicher cedcc1453c Minor Testing guide copyedits 
[ci skip]
 2016-04-09 01:19:21 -04:00
Dmitriy Zaporozhets 4a1fdc78a4 Merge branch 'remove-todo' into 'master' 
Remove TODO for not documented stuff

We should not put a `TODO` in a released product.

See merge request !3553
 2016-04-08 17:42:53 +00:00
Dmitriy Zaporozhets 0396c8525c Merge branch 'rs-testing-guide' into 'master' 
First pass at a Testing styleguide

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

[ci skip]

See merge request !3465
 2016-04-08 17:34:55 +00:00
Yorick Peterse fb02c96747 Merge branch 'gitlab-workhorse-0.7.2' into 'master' 
Use gitlab-workhorse 0.7.2

See merge request !3570
 2016-04-08 15:14:05 +00:00
Rémy Coutable 312a09e7aa Merge branch 'api-expose-subscribed' into 'master' 
API: Expose subscribed? on issues and merge requests

This is the first start for the new `subscribable` API. It exposes the `subscribed` field for issues and merge requests.

Related to #6024

See merge request !3611
 2016-04-08 14:36:54 +00:00
Robert Schilling fb2fde9d62 API: Expose subscribed? on issues 2016-04-08 15:53:04 +02:00
Alex Mayer 875646a85e Fix Incorrect Quote In Docker Executor Example 2016-04-07 20:10:29 +00:00
Jacob Vosmaer 94c135d3c8 Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into gitlab-workhorse-0.7.2 2016-04-07 12:47:23 +02:00