Commit Graph
2808 Commits
Author SHA1 Message Date
Drew Blessing e777710a10 Merge branch 'update_mail_docs' into 'master'
Update mailroom/postfix documentation [ci skip]

I worked with a customer to troubleshoot some strange Postfix and Mailroom issues. These doc updates aim to help other users avoid the same confusion.


See merge request !2430
2016-01-14 17:28:08 +00:00
Drew Blessing 98c689d968 Update mailroom/postfix documentation [ci skip] 2016-01-14 11:26:24 -06:00
Tomasz Maczukin 405b82af23 Merge branch 'master' into ci/api-builds
* master: (51 commits)
  Fix version
  Fix specs and rubocop warnings
  Improve the consistency of commit titles, branch names, tag names, issue/MR titles, on their respective project pages
  fixed LDAP activation on login to use new ldap_blocked state
  Fix Admin/Users view to position buttons without spacing magic
  Update to Go 1.5.3
  Fix the undefinded variable error in Project's safe_import_url method
  Update CHANGELOG [ci skip]
  Add some cosmetic changes to variables API documentation [ci skip]
  Fix misaligned edit button in milestone collection partial
  Update button styles for Milestones#show
  Modify builds API documentation style [ci skip]
  Modify :ci_variable factory
  Ensure the API doesn't return notes that the current user shouldn't see
  Add 'Build' prefix to Variables entry name in API docs index
  Fix some typos
  Add spec for Note#cross_reference_not_visible_for?
  Remove (invalid) timestamp formatting
  Move `BroadcastMessage#status` to a helper since it's presentational
  Update CHANGELOG
  ...

Conflicts:
	doc/api/README.md
	lib/api/api.rb
	lib/api/entities.rb
2016-01-14 13:30:18 +01:00
Douwe Maan 0014f19327 Merge branch 'master' into ci/api-variables 2016-01-14 12:04:28 +01:00
Douwe Maan 4d64a32c88 Merge branch 'feature/ldap-sync-edgecases' into 'master'
LDAP Sync blocked user edgecases

Allow GitLab admins to block otherwise valid GitLab LDAP users
(https://gitlab.com/gitlab-org/gitlab-ce/issues/3462)

Based on the discussion on the original issue, we are going to differentiate "normal" block operations to the ldap automatic ones in order to make some decisions when its one or the other.

Expected behavior:

- [x] "ldap_blocked" users respond to both `blocked?` and `ldap_blocked?`
- [x] "ldap_blocked" users can't be unblocked by the Admin UI
- [x] "ldap_blocked" users can't be unblocked by the API
- [x] Block operations that are originated from LDAP synchronization will flag user as "ldap_blocked"
- [x] Only "ldap_blocked" users will be automatically unblocked by LDAP synchronization
- [x] When LDAP identity is removed, we should convert `ldap_blocked` into `blocked`
 
Mockup for the Admin UI with both "ldap_blocked" and normal "blocked" users:
![image](/uploads/4f56fc17b73cb2c9e2a154a22e7ad291/image.png)

There will be another MR for the EE version.

See merge request !2242
2016-01-14 11:00:08 +00:00
Stan Hu c7f7a1ae92 Update to Go 1.5.3 2016-01-13 17:21:37 -08:00
Tomasz Maczukin 220c3a44c9 Merge branch '8-4-stable' into ci/api-variables
* 8-4-stable: (285 commits)
  Add Changelog entry for build traces data integrity fix
  Update doc_styleguide.md [ci skip]
  Added hint that you can search users by name, username, or email.
  Add changelog
  Version 8.4.0.rc1
  Randomize metrics sample intervals
  Make the metrics sampler interval configurable
  Don't automatically require awesome_print
  Disable colorization if STDOUT is not a tty
  Block the reported user before destroying the record
  changes `$quote-gray` to `$secondary-text`
  makes message plural for multiple MRs and removes from loop. Duh.
  Prepare Installation and Update docs for 8.4 RC1
  Mention channel/key bug in irkerd docs
  Revert "Remove the `:coffee` and `:coffeescript` Haml filters"
  gets merge request discussion working again
  adds back in discussion.haml.html for issues commenting and closing/reopening properly.
  removing last chunk of MR ajax changes, rest will be in another MR
  reverting more MR ajax files, will appear in different commit
  reverting MR ajax changes, which will be in a different MR
  ...
2016-01-13 23:59:00 +01:00
Tomasz Maczukin f11ba743a5 Add some cosmetic changes to variables API documentation [ci skip] 2016-01-13 23:16:10 +01:00
Tomasz Maczukin 4cdbb2f628 Modify builds API documentation style [ci skip] 2016-01-13 21:19:18 +01:00
Tomasz Maczukin c9a1661979 Merge branch 'master' into ci/api-builds
* master: (76 commits)
  Add Changelog entry for build traces data integrity fix
  Update doc_styleguide.md [ci skip]
  Added hint that you can search users by name, username, or email.
  Add changelog
  Randomize metrics sample intervals
  Make the metrics sampler interval configurable
  Don't automatically require awesome_print
  Disable colorization if STDOUT is not a tty
  Block the reported user before destroying the record
  changes `$quote-gray` to `$secondary-text`
  makes message plural for multiple MRs and removes from loop. Duh.
  Prepare Installation and Update docs for 8.4 RC1
  Mention channel/key bug in irkerd docs
  Revert "Remove the `:coffee` and `:coffeescript` Haml filters"
  gets merge request discussion working again
  adds back in discussion.haml.html for issues commenting and closing/reopening properly.
  removing last chunk of MR ajax changes, rest will be in another MR
  reverting more MR ajax files, will appear in different commit
  reverting MR ajax changes, which will be in a different MR
  reverting _mr_title.html.haml
  ...
2016-01-13 20:53:42 +01:00
Tomasz Maczukin 2b81248ad5 Modify builds API documentation style [ci skip] 2016-01-13 20:23:48 +01:00
Achilleas Pipinellis 1202355703 Merge branch 'doc_styleguide' into 'master'
Move doc_styleguide in the development directory

Reference #3841 

And also add many new styleguides:

- Naming
- Images
- Links
- Headings
- Formatting
- Notes
- API

See merge request !2386
2016-01-13 18:04:14 +00:00
Tomasz Maczukin d338087605 Add 'Build' prefix to Variables entry name in API docs index 2016-01-13 18:51:27 +01:00
Achilleas Pipinellis 4eae95c03c Update doc_styleguide.md [ci skip]
- Fix some syntax/grammar typos
- Link to GFM documentation on newlines
- Be less strict on the alphabetical order styleguide
- You can override the "numbers in headings" rule if you discuss it first
- Do not mention CE in notes if the feature is in both CE and EE
2016-01-13 18:24:08 +01:00
Tomasz Maczukin 9733849618 Add some fixes after review 2016-01-13 15:17:59 +01:00
Douwe Maan 9664424cab Merge branch 'ci/api-projects' into 'master'
Extend projects API with CI data

Reference #4264 

See merge request !2303
2016-01-13 13:32:35 +00:00
Dmitriy Zaporozhets 32a5b741c2 Merge branch 'add_username_to_user_system_hooks' of https://github.com/tbeadle/gitlabhq
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-01-13 10:12:30 +01:00
Robert Speicher 3dfb69a59f Prepare Installation and Update docs for 8.4 RC1
[ci skip]
2016-01-12 18:04:02 -05:00
Robert Speicher 025f061765 Merge branch 'gitlab-omnibus-really' into 'master'
Never heard of gitlab-omnibus

See merge request !2388
2016-01-12 16:59:10 +00:00
Jacob Vosmaer 9cbdc2d860 Merge branch 'gitlab-workhorse-0.5.4' into 'master'
Use gitlab-workhorse 0.5.4

Fixes routing errors for /api/v3/projects/

See merge request !2391
2016-01-12 15:55:11 +00:00
Achilleas Pipinellis 8f1c46d18a Merge branch 'add_make' into 'master'
added make command to docs

The gitlab-workhose update docs are missing a make command

See merge request !2281
2016-01-12 15:22:54 +00:00
Achilleas Pipinellis 20c327fcfd Clarify the naming guideline
[ci skip]
2016-01-12 16:19:11 +01:00
Jacob Vosmaer 0e769d2a48 Use gitlab-workhorse 0.5.4
Fixes routing errors for /api/v3/projects/
2016-01-12 15:18:17 +01:00
Jacob Vosmaer fac252c9a2 Never heard of gitlab-omnibus 2016-01-12 14:47:55 +01:00
Achilleas Pipinellis d0b2d278f4 Move doc_styleguide in the development directory
[ci skip]
2016-01-12 11:57:42 +01:00
Tomasz Maczukin 470b3a482a Fix doc/api/builds.md 2016-01-12 11:50:14 +01:00
Robert Schilling 3ea637ed5d Merge branch 'typo-fix' into 'master'
[ci skip] Fixed minor typo in docker documentation

This change is self-explanatory.

See merge request !2374
2016-01-12 01:24:00 +00:00
Robert Speicher 5d63ad21a6 Merge branch 'gitlab-workhorse-0.5.3' into 'master'
Use gitlab-workhorse 0.5.3

See merge request !2367
2016-01-11 17:43:35 +00:00
John Galt 0f113828fa [ci skip] Fixed minor typo in docker documentation 2016-01-11 10:02:39 -07:00
Tomasz Maczukin a30377c6f1 Merge branch 'master' into ci/api-builds
* master: (143 commits)
  Only load autocomplete data when actually needed
  Check for current user
  Add pencil icon to edit group settings
  Issue #5817 wording of the web hooks updated on issue and merge events
  use JavaScript instead of CoffeeScript in Views, the reason #9819
  Before project save ensure that a runners_token exists
  Fix Error 500 when visiting build page of project with nil runners_token
  Remove outdated gitlab-git-http-server reference from Install doc
  Fix typo in build page of projects
  Update docs for shared runner default settings
  Disable "Already Blocked" button in admin abuse report page
  Add CHANGELOG entry for reply-by-email fix
  Use WOFF versions of SourceSansPro
  Clean up document on adding users to a project
  Refactor ZenMode
  Fix caching issue where build status was not updating in project dashboard
  Add a CHANGELOG entry for The Most Important Feature of All Time(TM)
  changes verb `references` to noun `reference`.
  fixes new branch button positioning, when visible and not visible container
  DRY up upload and download services
  ...
2016-01-11 15:34:29 +01:00
Tomasz Maczukin fc4108b38b Modify CI features in projects API 2016-01-11 15:27:20 +01:00
Drew Blessing 67aa0b8c4c Optimize LDAP and add a search timeout 2016-01-11 08:17:32 -06:00
Jacob Vosmaer 13c3562217 Use gitlab-workhorse 0.5.3 2016-01-11 13:05:32 +01:00
Achilleas Pipinellis 5270cc6958 Merge branch 'doc-update' into 'master'
Update docs for shared runner default settings

GitLab 8.2 updated shared runners to default to `ENABLED` on all projects.

Fixes #5993

See merge request !2358
2016-01-11 11:32:10 +00:00
Tomasz Maczukin 4e70f2519b Update ./doc/api/builds.md 2016-01-11 11:15:04 +01:00
Robert Speicher 70cba8e9a8 Remove outdated gitlab-git-http-server reference from Install doc
[ci skip]
2016-01-10 19:59:40 -05:00
Luke Waite e6dbbafd0a Update docs for shared runner default settings
Fixes #5993
2016-01-10 08:29:50 -05:00
Achilleas Pipinellis 11b4c0d3cf Clean up document on adding users to a project
[ci skip]
2016-01-09 11:03:10 +01:00
Robert Speicher af68897acd Merge branch 'api-project-upload' into 'master'
Add API project upload endpoint

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

See merge request !2329
2016-01-08 20:29:43 +00:00
Gabriel Mazetto 6e7db8e23e Prevent ldap_blocked users from being blocked/unblocked by the API 2016-01-08 16:26:04 -02:00
Achilleas Pipinellis 255a63564b Merge branch 'docs_project_services' into 'master'
Project services and JIRA documentation clean up

Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/176

This was first aiming to fix the JIRA references to EE, but as I was going through it, I decided to revamp more.

@Haydn once merged here and then Valery merges CE into EE it should be fixed in doc.gitlab.com as well.

@dblessing the docs state that we support JIRA 6.x. I see that 7.x is out, should the docs be amended? Also we seem to have a place to document services (http://doc.gitlab.com/ce/project_services/project_services.html), but the JIRA doc is under integration :/ I'd like it to have it moved under `project_services/`, but I guess most customers know the current URL better.

See merge request !2345
2016-01-08 15:05:35 +00:00
Achilleas Pipinellis 65c474997d Add JIRA 7 to the supported versions
[ci skip]
2016-01-08 15:59:00 +01:00
Dmitriy Zaporozhets b64ec38aae Merge branch 'api-delete-tag' into 'master'
Delete tag via API

### What does this MR do?

Implements deleting a tag via the API.

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

On success, it returns the name of the deleted tag. This is similar to the [delete branch API](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/lib/api/branches.rb#L111).

###  What are the relevant issue numbers / Feature requests?

* This MR closes #1575 
* Closes http://feedback.gitlab.com/forums/176466-general/suggestions/6599203-delete-tags-through-the-api

@stanhu Could you do a review?

See merge request !1862
2016-01-08 13:47:42 +00:00
Tomasz Maczukin 549a2fa787 Modify builds scope filtering in builds API 2016-01-08 14:01:31 +01:00
Achilleas Pipinellis 1d48b180bc Clean up the JIRA integration document [ci skip]
- new images where needed
- move images to a separate img directory
- use table for the service fields
- link to new documents
2016-01-08 13:19:40 +01:00
Achilleas Pipinellis 629becde2f Split external issue tracker document
[ci skip]
2016-01-08 12:43:33 +01:00
Achilleas Pipinellis b059fa5509 Clean up integration README
[ci skip]
2016-01-08 10:40:45 +01:00
Achilleas Pipinellis e4411a9612 Merge branch 'docs_project_services' into 'master'
Update project services to include all supported ones

Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/80

See merge request !2297
2016-01-08 09:34:07 +00:00
Robert Schilling 4c90ed52fe Delete tag via API 2016-01-08 10:10:04 +01:00
Tommy Beadle 1f64332e11 Include user_username in user_(add_to/remove_from)_(project/group) system hooks. 2016-01-07 12:54:54 -05:00