Dmitriy Zaporozhets
bbcb70a9dc
Add group filtering by name for API
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-12-30 11:30:56 +02:00
Dmitriy Zaporozhets
fd1f54b8ab
Merge branch 'master' into ee-from-ce
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
Conflicts:
Gemfile
app/controllers/application_controller.rb
app/views/admin/groups/_form.html.haml
app/views/groups/edit.html.haml
app/views/groups/show.html.haml
app/views/layouts/nav/_admin.html.haml
app/views/projects/_settings_nav.html.haml
db/schema.rb
doc/install/installation.md
doc/update/6.x-or-7.x-to-7.6.md
2014-12-26 15:05:43 +02:00
Patricio Cano
0b4b9e432b
Added the new 7.6 packages links
2014-12-24 10:58:49 -05:00
Dmitriy Zaporozhets
fe68c45aa5
Merge branch 'master' of github.com:gitlabhq/gitlabhq
2014-12-24 15:19:44 +02:00
Sytse Sijbrandij
cdd8adcb10
Link to LDAP doc.
2014-12-24 12:48:40 +01:00
Patricio Cano
4386c210a1
Updated the monthly release steps
2014-12-23 17:28:09 -05:00
Jeroen van Baarsen
334f240899
Merge pull request #8362 from bbodenmiller/patch-3
...
add missing password prompt to mysqldump
2014-12-23 16:41:20 +01:00
Dmitriy Zaporozhets
91bb995029
Merge branch 'note-env-variables-in-installation' into 'master'
...
Note env variables in installation
See merge request !1342
2014-12-23 14:44:15 +00:00
Job van der Voort
d4f89dfc62
add 7.6.2 packages
2014-12-23 14:55:04 +01:00
Sytse Sijbrandij
6f4332725d
Release manager should doublecheck the everyone has been mentioned in the blog post.
2014-12-23 13:39:31 +01:00
Job van der Voort
3eb239d6fc
Merge branch 'release-announcement' into 'master'
...
Release announcement
@dzaporozhets wants a hashtag https://gitlab.slack.com/archives/general/p1419317692000272
See merge request !1340
2014-12-23 09:54:21 +00:00
Sytse Sijbrandij
e2c9a486d7
Note that it is default on Ubuntu.
2014-12-23 10:11:56 +01:00
Sytse Sijbrandij
b5d0f90e30
Warn people about not exposing at a time they can still do something about it.
2014-12-23 09:48:43 +01:00
Sytse Sijbrandij
9c7a7d4349
Add libkrb5-dev dependency.
2014-12-23 09:23:19 +01:00
Sytse Sijbrandij
e8818da305
Shorter tweet so there is space for a hashtag.
2014-12-23 08:37:26 +01:00
Job van der Voort
cc2f14ea0b
Merge branch 'mention-the-team' into 'master'
...
Mention the team
See merge request !1339
2014-12-22 20:03:04 +00:00
Sytse Sijbrandij
e99ea1146a
Clear responsibility to mention the team.
2014-12-22 20:58:22 +01:00
Patricio Cano
8de60c45f0
Added the new 7.6 packages links
2014-12-22 14:29:08 -05:00
Dmitriy Zaporozhets
5aeb80537e
Merge branch 'master' of github.com:gitlabhq/gitlabhq
2014-12-20 19:47:03 +02:00
Drew Blessing
3f13a0466f
Merge pull request #8469 from xperseguers/patch-1
...
[BUGFIX] Invalid branch in comparison
2014-12-20 09:25:56 -06:00
Jeroen van Baarsen
13104450cf
Merge pull request #8466 from cirosantilli/raketasks-doc
...
Fix Rake tasks doc README: add top level h1
2014-12-20 14:00:28 +01:00
Xavier Perseguers
1e22b494e2
[BUGFIX] Invalid branch in comparison
2014-12-19 13:49:33 +01:00
Patricio Cano
6d747cfd3a
Added link to the configuration sample for OmniAuth providers when using Omnibus.
2014-12-18 09:50:20 -05:00
Ciro Santilli
a55feb14f1
Fix Rake tasks doc README: add top level h1
...
and link to missing to features.md.
2014-12-18 09:22:34 +01:00
Patricio Cano
7813363fd7
Fixed version reference
2014-12-17 18:02:58 -05:00
Patricio Cano
918245094c
Added update guide for updating to 7.6
2014-12-17 18:00:43 -05:00
Patricio Cano
7e048d5772
Updated the installation and update documentation for the 7.6 release.
2014-12-17 12:15:38 -05:00
Dmitriy Zaporozhets
6ab9d678d7
Merge branch 'master' of github.com:gitlabhq/gitlabhq
2014-12-17 11:51:27 +02:00
Dmitriy Zaporozhets
2fef5c1323
Merge branch 'dev-docs-in-gdk' into 'master'
...
Dev docs in gdk
Also see https://gitlab.com/gitlab-org/gitlab-development-kit/merge_requests/31
See merge request !1331
2014-12-17 09:49:10 +00:00
Jeroen van Baarsen
df32ad6c15
Merge pull request #8375 from bbodenmiller/process-fix
...
update order of upgrade guide
2014-12-17 09:37:07 +01:00
Sytse Sijbrandij
98e64610b2
Move development information to the GitLab Development Kit.
2014-12-17 08:27:03 +01:00
Marin Jankovski
6ab5127bfa
Merge branch 'master' into group_membership_lock
...
Conflicts:
db/schema.rb
2014-12-16 14:34:32 +01:00
Dmitriy Zaporozhets
8d71e4e0d0
Merge branch 'doc/sidekiq_memory_killer' into 'master'
...
Add documentation for the Sidekiq MemoryKiller
We already merged the code, and we are already using it on gitlab.com. This MR adds documentation.
See merge request !1325
2014-12-16 11:23:52 +00:00
Dmitriy Zaporozhets
dc0e6d06c5
Merge branch 'master' into ce-7-6
2014-12-16 13:21:18 +02:00
Marin Jankovski
0e9f0a1cdd
Limit to only additions and block at project team level.
2014-12-16 10:01:37 +01:00
Valery Sizov
73c0dfd265
Kerberos: username as identifier
2014-12-15 18:07:03 +02:00
Valery Sizov
cbabc0b2f3
Kerberos: update docs
2014-12-15 18:07:03 +02:00
Jacob Vosmaer
d117927131
Add link to 'operations' README
2014-12-15 15:17:10 +01:00
Marin Jankovski
4ec4bd29c6
Add to member lock to changelog and documentation.
2014-12-15 14:55:55 +01:00
Jacob Vosmaer
e61e7a17b4
Remove unfinished file with the wrong name
2014-12-15 13:44:47 +01:00
Jacob Vosmaer
71789468d3
Add documentation for the Sidekiq MemoryKiller
2014-12-15 13:43:36 +01:00
Valery Sizov
83de96ae3a
add kerberos dependency
2014-12-15 14:01:55 +02:00
Jeroen van Baarsen
be206a5142
Merge pull request #8410 from tricknotes/add-webhook-doc-for-tag-event
...
Add missing webhook doc for tag event
2014-12-14 18:35:31 +01:00
Jeroen van Baarsen
ba4fe47606
Merge pull request #8374 from bbodenmiller/7-5-update-fix
...
remove extra upgrade details, add missing config
2014-12-14 18:31:37 +01:00
Ryunosuke SATO
d11e048d7f
Add missing webhook doc for tag event
2014-12-14 23:47:13 +09:00
Jeroen van Baarsen
3615b4de24
Merge pull request #8359 from bbodenmiller/patch-1
...
add details on backing up your SSH host keys
2014-12-13 17:24:56 +01:00
Dmitriy Zaporozhets
177c89b8b8
Merge branch 'ce-changes' into 'master'
...
CE changes from upstream
See merge request !266
2014-12-12 12:25:36 +00:00
Dmitriy Zaporozhets
1c93d0df7a
Merge branch 'master' into ce-changes
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
Conflicts:
db/schema.rb
2014-12-11 18:12:45 +02:00
Job van der Voort
030a71b780
use new syntax in ldap doc
2014-12-11 15:15:33 +01:00
Dmitriy Zaporozhets
0f07c18a9f
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
2014-12-11 13:26:11 +02:00