Commits · e64343d6e190e5a6acd7d94b79add8d8ffaa7f15 · nexedi / gitlab-ce

26 Jun, 2014 16 commits
- Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-changes · e64343d6
  Dmitriy Zaporozhets authored Jun 26, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	VERSION
	app/views/layouts/devise.html.haml
	features/project/project.feature
	features/steps/project/project.rb
```
  e64343d6
- Add html meta tag with software description · 024e0577
  Dmitriy Zaporozhets authored Jun 26, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  024e0577
- Merge branch 'small-changes' into 'master' · 7abd1fd6
  Dmitriy Zaporozhets authored Jun 26, 2014
```
Small changes
```
  7abd1fd6
- Merge branch 'rename-home-tabs' into 'master' · 548209c5
  Dmitriy Zaporozhets authored Jun 26, 2014
```
Rename home tabs

* Dashboard Home -> Activity
* Project Home -> Activity
* Group Home -> Activity
* Profile Home -> Profile
* Admin Home -> Dashboard

Related to #1351
```
  548209c5
- Fix tests · 1e3c9eb4
  Dmitriy Zaporozhets authored Jun 26, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  1e3c9eb4
- Better name for admin home page. Move groups tab after users · 3a4b6b39
  Dmitriy Zaporozhets authored Jun 26, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  3a4b6b39
- Merge branch 'commit-log-25' into 'master' · 439c0c38
  Dmitriy Zaporozhets authored Jun 26, 2014
```
Commit log 25

Related to #1381
```
  439c0c38
- Merge branch 'improve-markdwon-render' into 'master' · fdb0d197
  Dmitriy Zaporozhets authored Jun 26, 2014
```
Improve markdwon parsing

Fix 500 error when try to use relative links in project issues if repository is empty
```
  fdb0d197
- Small fixes to the requirements doc. · b80e98f4
  Sytse Sijbrandij authored Jun 26, 2014
  
  b80e98f4
- Simplify the supported/unsupported sections of the requirements guide. · a34dabd8
  Sytse Sijbrandij authored Jun 26, 2014
  
  a34dabd8
- Change newlines in requirements doc. · 340ed1dd
  Sytse Sijbrandij authored Jun 26, 2014
  
  340ed1dd
- Replace home icon with tab names · ba7b4630
  Dmitriy Zaporozhets authored Jun 26, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  ba7b4630
- Increase commit log amount for tree view from 10 to 25 · 3900eee3
  Dmitriy Zaporozhets authored Jun 26, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  3900eee3
- Merge branch 'dash-between-description-and-readme-link' into 'master' · 3f8e6cf3
  Dmitriy Zaporozhets authored Jun 26, 2014
```
Dash between description and readme link
```
  3f8e6cf3
- Merge branch 'remove_group_filter' into 'master' · d6649605
  Dmitriy Zaporozhets authored Jun 26, 2014
```
Remove unused group filter
```
  d6649605
- Improve markdown parsing · 1e673c72
  Dmitriy Zaporozhets authored Jun 26, 2014
```
* dont try to build links for anchors like `#title-anchor`
* dont build relative url for project with empty repo
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  1e673c72
25 Jun, 2014 23 commits
- Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce · 654e8407
  Dmitriy Zaporozhets authored Jun 26, 2014
  
  654e8407
- Merge branch 'master' of github.com:gitlabhq/gitlabhq · 1e313dcf
  Dmitriy Zaporozhets authored Jun 26, 2014
  
  1e313dcf
- Merge pull request #7190 from Nighoo/gravatar_profile_avatar · 7e3e4c41
  Dmitriy Zaporozhets authored Jun 26, 2014
```
do not advertise gravatar in profile if disabled
```
  7e3e4c41
- Merge branch 'doc/groups' into 'master' · adf7dd36
  Sytse Sijbrandij authored Jun 25, 2014
```
Document the basics of working with Groups
```
  adf7dd36
- Fix broken image link · 4d77d4e1
  Jacob Vosmaer authored Jun 25, 2014
  
  4d77d4e1
- Document the basics of working with Groups · 9549be5f
  Jacob Vosmaer authored Jun 25, 2014
  
  9549be5f
- Create image tags for screenshots · 750f63ba
  Jacob Vosmaer authored Jun 25, 2014
  
  750f63ba
- Merge pull request #7197 from jbrooksuk/patch-1 · fb3104da
  Sytse Sijbrandij authored Jun 25, 2014
```
Fix the PullReview tool link
```
  fb3104da
- Put a dash before the readme link so it doesn't look like it is part of the description. · 9ab38825
  Sytse Sijbrandij authored Jun 25, 2014
  
  9ab38825
- Fix the PullReview tool link · 401f958e
  James Brooks authored Jun 25, 2014
  
  401f958e
- Merge branch 'small-contributions-no-rebase' into 'master' · 68603904
  Sytse Sijbrandij authored Jun 25, 2014
```
Small contributions no rebase

Based on https://github.com/gitlabhq/gitlabhq/pull/7067#issuecomment-45060241

/cc @dzaporozhets
```
  68603904
- Merge branch 'version-file' into 'master' · 4d482b3b
  Dmitriy Zaporozhets authored Jun 25, 2014
```
Version file

Fixes #1345
```
  4d482b3b
- Remove unused group filter · d45b627a
  Marin Jankovski authored Jun 25, 2014
  
  d45b627a
- Merge branch 'remove-ruby-update-guide' into 'master' · 10a33f0f
  Sytse Sijbrandij authored Jun 25, 2014
```
Remove ruby update guide

#1371
```
  10a33f0f
- remove ruby upgrade guide · 086ec401
  Job van der Voort authored Jun 25, 2014
  
  086ec401
- Merge branch 'ruby-update-in-guide' into 'master' · 4116588f
  Sytse Sijbrandij authored Jun 25, 2014
```
Ruby update in guide

Fixes #1371
```
  4116588f
- update ruby in update guide · 313e4966
  Job van der Voort authored Jun 25, 2014
```
textual changes
```
  313e4966
- Show VERSION information on project sidebar · af7e7798
  Dmitriy Zaporozhets authored Jun 25, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  af7e7798
- Merge branch 'master' of github.com:gitlabhq/gitlabhq · 79ee94ec
  Dmitriy Zaporozhets authored Jun 25, 2014
  
  79ee94ec
- Fix diff comments toggle button · 674cbe15
  Dmitriy Zaporozhets authored Jun 25, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  674cbe15
- Merge pull request #7195 from cirosantilli/patch-1 · 14f7646a
  Sytse Sijbrandij authored Jun 25, 2014
```
Typo.
```
  14f7646a
- dont render discussion diff unless note is for diff · 907548a0
  Dmitriy Zaporozhets authored Jun 25, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  907548a0
- Typo. · 8e7a5cda
  Ciro Santilli authored Jun 25, 2014
  
  8e7a5cda
24 Jun, 2014 1 commit
- 7.1.0 started · f91f230c
  Dmitriy Zaporozhets authored Jun 24, 2014
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  f91f230c