 Dmitriy Zaporozhets
|
f4d43ed3b1
|
Merge branch 'master' into ce-upstream
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Conflicts:
app/controllers/projects/services_controller.rb
app/models/concerns/mentionable.rb
app/models/project.rb
app/models/user.rb
app/views/admin/users/index.html.haml
app/views/projects/services/_form.html.haml
config/gitlab.yml.example
config/initializers/1_settings.rb
lib/gitlab/git_access.rb
lib/gitlab/ldap/access.rb
lib/gitlab/ldap/person.rb
lib/gitlab/reference_extractor.rb
spec/lib/gitlab/ldap/access_spec.rb
|
2014-10-14 18:23:51 +03:00 |
|
 Marin Jankovski
|
9abe5d36d7
|
Add libravatar documentation.
|
2014-10-14 11:23:33 +02:00 |
|
|
Dmitriy Zaporozhets
|
a5972170ad
|
Merge remote-tracking branch 'origin/master' into ee-7-4
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Conflicts:
app/controllers/projects/team_members_controller.rb
app/finders/projects_finder.rb
app/models/group.rb
app/models/project_team.rb
app/models/users_group.rb
config/gitlab.yml.example
config/initializers/1_settings.rb
config/routes.rb
db/schema.rb
doc/integration/ldap.md
features/steps/group.rb
features/steps/project/project.rb
|
2014-10-02 13:24:59 +03:00 |
|
 Sytse Sijbrandij
|
5b68a9adaf
|
Add docs for the issue closing pattern.
|
2014-10-02 10:53:33 +02:00 |
|
 Marin Jankovski
|
36a9e47d70
|
Merge remote-tracking branch 'CE/master' into merge_ce_rc1
Conflicts:
Gemfile.lock
VERSION
doc/README.md
doc/install/installation.md
|
2014-09-17 18:36:14 +02:00 |
|
 Jacob Vosmaer
|
e72b7cc250
|
Document the extra.sign_in_text setting for CE
|
2014-08-20 11:56:52 +02:00 |
|
|
Marin Jankovski
|
300b7c19ea
|
Move the branded login page documentation to customization directory.
|
2014-06-18 11:51:44 +02:00 |
|