 Robert Speicher
|
ed2a8ba600
|
Merge 8-2-stable into 8-2-stable-ee
Conflicts remaining:
- app/controllers/groups/group_members_controller.rb
- app/controllers/projects/project_members_controller.rb
- app/models/ability.rb
- app/models/member.rb
- app/models/project.rb
|
2015-11-19 10:33:18 -05:00 |
|
 Valery Sizov
|
8766c54bf2
|
Merge remote-tracking branch 'origin/master' into ce_upstream_15_10
|
2015-10-15 16:46:48 +03:00 |
|
 Dale Noe
|
4ee8888498
|
removed extra_sign_in_text examples for gitlab.rb [ci skip]
|
2015-10-11 12:19:05 +00:00 |
|
 Dmitriy Zaporozhets
|
680b087764
|
Merge master from CE
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
|
2015-08-17 14:01:32 +02:00 |
|
 Jan Tojnar
|
9195d65602
|
Doc: Fix link to gravatar.com
|
2015-08-10 23:47:32 +02:00 |
|
 Karen Carias
|
8a0221c7bd
|
changed the document name to make it more useful
|
2015-05-27 18:44:47 +00:00 |
|
 Douwe Maan
|
68ac20604b
|
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ce-to-ee
# Conflicts:
# app/controllers/groups/application_controller.rb
# app/services/test_hook_service.rb
# app/views/admin/groups/show.html.haml
# app/views/groups/_settings_nav.html.haml
# app/views/groups/show.html.haml
# app/views/layouts/_head.html.haml
# app/views/projects/_settings_nav.html.haml
# db/schema.rb
# features/project/project.feature
# features/steps/project/project.rb
|
2015-05-05 10:18:27 +02:00 |
|
|
Karen Carias
|
a8956e8850
|
Added phrase "Here's how to close multiple issues in one commit message" so that doc is easier to find by users
|
2015-04-28 23:45:44 +00:00 |
|
|
Dmitriy Zaporozhets
|
ef8d96e5de
|
Merge branch 'ce-to-ee-2' of dev.gitlab.org:gitlab/gitlabhq into ce-to-ee
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Conflicts:
LICENSE
app/assets/javascripts/dispatcher.js.coffee
app/controllers/help_controller.rb
app/models/user.rb
app/views/groups/group_members/_new_group_member.html.haml
config/gitlab.yml.example
config/routes.rb
features/groups.feature
features/steps/dashboard/help.rb
|
2015-04-14 15:08:19 +03:00 |
|
 Achilleas Pipinellis
|
64cd7ebf39
|
Update documentation on issue closing pattern.
|
2015-03-30 22:31:07 +03:00 |
|
 Marin Jankovski
|
5a17fae42a
|
Add documentation about help txt page.
|
2015-03-02 16:01:18 -08:00 |
|
|
Dmitriy Zaporozhets
|
9b140b22fb
|
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-into-ee
Conflicts:
Gemfile.lock
app/helpers/tab_helper.rb
config/routes.rb
db/schema.rb
|
2015-02-04 18:19:22 -08:00 |
|
 Ewan Edwards
|
e6e337088b
|
Make all non-config/non-operational mentions of URL consistently
capitalized.
Make the plural version consistently "URLs".
Fix an instance where the article "the" before URL was missing.
|
2015-01-30 10:24:45 -08:00 |
|
|
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 |
|