Commit Graph
2020 Commits
Author SHA1 Message Date
Jacob Vosmaer f04134becd New source installs should use 7-12-stable
Even though the 7-12-stable branch does not exist yet.
2015-06-12 14:29:18 +02:00
Jacob Vosmaer d26ae29149 Install git 2.4.3
Git 2.1.2 does not protect against pushes trying the '.Git/config'
attack (CVE-2014-9390). Going to 2.4.3 is perhaps a big jump but why not
use the latest? (Famous last words.)
2015-06-12 14:24:22 +02:00
Jacob Vosmaer f0ecdf5e24 Fix link to howto_rc1.md
The relative link that was there before breaks when you copy-paste the
issue template into an actual issue.
2015-06-12 12:09:50 +02:00
Sytse Sijbrandij 8f142c4aae Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-06-11 18:06:57 +02:00
Job van der Voort a7a4ae69d4 Merge branch 'info_about_namespaces' into 'master'
Info about namespaces

Added info about namespaces in groups.

Because of tweet https://twitter.com/kaystrobach/status/603912904757420032

See merge request !1835
2015-06-11 15:21:28 +00:00
Dmitriy Zaporozhets 148178fb98 Merge branch 'rs-issue-1758' into 'master'
Update grids for 2FA details

Also adds a link to the documentation.

Closes #1758

See merge request !795
2015-06-11 15:00:08 +00:00
Job van der Voort 7872c7ff62 fix and minify images 2015-06-11 15:12:47 +02:00
Job van der Voort 9a4886f0a0 move and fix links importing docs 2015-06-11 14:45:48 +02:00
Robert Speicher fbdcaebcd1 Fix "Acount" typo in 2FA docs
[ci skip]
2015-06-10 17:11:04 -04:00
Karen Carias 41a21912c6 added links to API calls 2015-06-10 17:07:55 +00:00
Karen Carias fd9849ebba fixed links 2015-06-10 03:19:40 +00:00
Sytse Sijbrandij 3d219ca395 Merge branch 'release-time' into 'master'
set the release time

See merge request !1843
2015-06-09 19:55:50 +00:00
Karen Carias ed42be4019 fixed link 2015-06-08 21:03:57 +00:00
Karen Carias 60ac9253ad fixed link 2015-06-08 21:01:56 +00:00
Karen Carias b4116e76cb Removed link "importing to gitlab" because it's in "Documentation". Organized links in alphabetical order. 2015-06-08 20:55:42 +00:00
Karen Carias 0ea9c962a4 added link to "importing to GitLab". Also organized docs in alphabetical order. 2015-06-08 20:48:06 +00:00
Karen Carias 44aaf40ad3 fixed numbers 2015-06-08 20:37:28 +00:00
Karen Carias 0c538cd8b5 fixed numbers 2015-06-08 20:36:28 +00:00
Karen Carias fc9d90c379 fixed numbers 2015-06-08 20:35:53 +00:00
Karen Carias e150ab9cee Added info about milestones and wiki pages not imported from Bitbucket 2015-06-08 20:31:02 +00:00
Karen Carias ce7831ae39 fixed importing link 2015-06-08 20:26:58 +00:00
Job van der Voort b368d4a1d1 fix spacing in document 2015-06-08 16:37:04 +02:00
Job van der Voort 8a32c46e6e importing documents renewed 2015-06-08 16:35:03 +02:00
Job van der Voort bcde45893b update with suggestions 2015-06-08 16:23:37 +02:00
Job van der Voort c5555e9b21 set the release time 2015-06-08 14:45:24 +02:00
Sytse Sijbrandij 509fe1159a Merge branch 'master' into 'master'
Doc: Added FreeOTP to 2FA

I have just added a note about a free alternative to Google Authenticator to the documentation of your two factor authentication.

See merge request !777
2015-06-06 13:11:01 +00:00
rugk 975d110688 Changed spelling 2015-06-06 12:34:40 +00:00
Jacob Vosmaer 7c09da9e8f Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2015-06-05 19:23:38 +02:00
Jacob Vosmaer 0e8296fd56 Make unicorn docs discoverable 2015-06-05 19:23:10 +02:00
Dmitriy Zaporozhets b6aa7cbccd Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-06-05 18:19:17 +02:00
rugk 507ebb701a Escaped(?) 2015-06-05 13:18:05 +00:00
rugk 193f019f61 Added free alternative to Google Authenticator (FreeOTP). 2015-06-05 13:16:47 +00:00
Jacob Vosmaer d98bcb9ca9 Try to explain Unicorn and unicorn-worker-killer 2015-06-05 14:23:35 +02:00
Douwe Maan bdfd163aa1 Add info about WIP merge requests to docs. 2015-06-05 13:12:55 +02:00
Douwe Maan 1f78aeba40 Merge branch 'improve_bitbucket_docs' into 'master'
Improve BitBucket integration documentation [ci skip]

This MR will improve the BitBucket integration documentation by

- mentioning the need to reconfigure GitLab after changing the configuration file, if you're using the omnibus package.
- adding a section about configuring a Host entry for bitbucket.org.
- switching additional steps 1 and 2, because connecting to BitBucket will only work after you added the SSH key and the Host entry.
- using sudo for the ssh connection in step 2, so that it is more obvious, that the git account should be used to establish the connection.

See merge request !670
2015-06-05 10:05:09 +00:00
Dmitriy Zaporozhets b9219469f7 Merge branch 'make-namespaces-api-available-to-all-users' into 'master'
Make namespace API available to all users

### What does this MR do?

This MR makes it possible for a user to query namespaces to which he/she has access. Also, it adds documentation for the existing API.

### Why was this MR needed?

Even though the `groups` API exists, it might still be useful to have an endpoint that tells the namespace type (e.g. `user` vs. `group`), especially if a user has access to a number of different projects.

### What are the relevant issue numbers?

Closes https://github.com/gitlabhq/gitlabhq/issues/9328

See merge request !708
2015-06-04 15:59:17 +00:00
Job van der Voort 83e59db55e Merge branch 'rs-2fa-docs' into 'master'
Add 2FA docs

See merge request !757
2015-06-03 15:05:54 +00:00
Dmitriy Zaporozhets 8046b69761 Merge branch 'remove_unecessary_rake_task' into 'master'
Remove gitlab:env:check task.

Rake task that checks for git user git settings is a leftover from early days.

It is not being used by the web editor(and web editor is also being redone atm) so this rake task just causes confusion.

Adresses internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2362

See merge request !758
2015-06-03 14:59:38 +00:00
Marin Jankovski 7044d649a3 Add autocrlf back to installation docs, add a check for it. 2015-06-03 15:42:22 +02:00
Job van der Voort 41ee2aa2d7 fix typo and add screenshots 2015-06-03 15:35:13 +02:00
Jacob Vosmaer 98ff4131cd LDAP users should not control their LDAP email 2015-06-03 13:40:47 +02:00
Marin Jankovski 5f7d6c7d74 Remove gitlab:env:check task. 2015-06-03 11:26:57 +02:00
Robert Speicher 42f3626862 Add 2FA docs
[ci skip]
2015-06-02 18:39:30 -04:00
Stan Hu 85145d1d77 Disable changing of the source branch in merge request update API 2015-05-29 09:40:35 -07:00
Douwe Maan 70b29c3576 Merge branch 'feature/saml_support' into 'master'
Add SAML support via Omniauth

Split of !669, with doc

See merge request !722
2015-05-29 10:37:27 +00:00
Stan Hu 67992b9be6 Make namespace API available to all users
Closes https://github.com/gitlabhq/gitlabhq/issues/9328
2015-05-28 11:39:12 -07:00
Karen Carias 41469e5c5d fixed namespaces info 2015-05-28 16:49:08 +00:00
Karen Carias 80b76e0847 added info about namespaces 2015-05-28 16:48:12 +00:00
Alex Lossent 22de5443c5 Add SAML support via Omniauth 2015-05-27 16:38:10 +02:00
Stefan Schweter 8313aa6da8 Adds new section for changing time zone in GitLab configuration file. New section added for changing time zone in Omnibus installations. 2015-05-27 14:06:40 +02:00