 Marin Jankovski
|
7d9ef1124e
|
Merge remote-tracking branch 'ce/master' into merge_ce
Conflicts:
README.md
app/assets/javascripts/project.js.coffee
app/models/concerns/mentionable.rb
app/models/project.rb
app/models/project_services/jira_service.rb
app/models/service.rb
app/models/user.rb
app/services/git_push_service.rb
config/initializers/1_settings.rb
config/routes.rb
db/schema.rb
doc/integration/README.md
doc/integration/external-issue-tracker.md
doc/integration/github.md
spec/controllers/import/github_controller_spec.rb
spec/helpers/merge_requests_helper.rb
spec/lib/gitlab/upgrader_spec.rb
spec/models/note_spec.rb
spec/requests/api/groups_spec.rb
spec/services/git_push_service_spec.rb
|
2015-02-16 11:50:30 -08:00 |
|
 Patricio Cano
|
2df8a91c82
|
Rephrased wording in the documentation to say "installation from source" instead of "manual installation" or similar.
|
2015-02-16 09:10:07 -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
|
ad6c372eee
|
Fix a number of discovered typos, capitalization of developer and
product names, plus a couple of instances of bad Markdown markup.
|
2015-02-03 15:18:40 -08:00 |
|
|
Dmitriy Zaporozhets
|
eafac5932f
|
Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ee-7-4
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Conflicts:
app/helpers/merge_requests_helper.rb
doc/update/README.md
lib/gitlab/reference_extractor.rb
|
2014-10-03 16:18:40 +03:00 |
|
 Achilleas Pipinellis
|
1489b8d50e
|
Update the help/update docs to include omnibus as well.
|
2014-10-02 13:39:26 +03:00 |
|
 Sytse Sijbrandij
|
8d47137a62
|
Merge branch 'master' into better-link-to-ce-to-ee-upgrade-scripts
Conflicts:
doc/update/README.md
|
2014-07-07 17:12:54 +02:00 |
|
 Job van der Voort
|
086ec40184
|
remove ruby upgrade guide
|
2014-06-25 11:45:19 +02:00 |
|
|
Sytse Sijbrandij
|
b8ccc67e68
|
Link to the CE to EE update as well.
|
2014-06-25 10:30:37 +02:00 |
|
 Ciro Santilli
|
fd348de76d
|
Update docs to markdown style guide.
|
2014-06-03 23:16:31 +02:00 |
|
 robertd
|
b3e5b12e9b
|
Fix minor typo in docs
|
2014-04-17 10:15:05 -06:00 |
|
|
dosire
|
f43a6339d7
|
Different filename.
|
2014-03-30 17:36:32 +02:00 |
|
|
dosire
|
417c0cb2d3
|
New doc site needs indexes.
|
2014-03-27 12:17:27 +01:00 |
|