Commits · f009b6e256cbb9493883949abd87cd41920ba054 · nexedi / gitlab-ce

17 Oct, 2015 14 commits
- Tweak styling of project home files list. · f009b6e2
  Douwe Maan authored Oct 17, 2015
  
  f009b6e2
- Use same style for project readme, tree readme and regular blob. · a22fe254
  Douwe Maan authored Oct 17, 2015
  
  a22fe254
- Split up projects/tree/_tree partial. · 7b26414c
  Douwe Maan authored Oct 17, 2015
  
  7b26414c
- Set vars used by tree view in project show action. · 6bd9a9fb
  Douwe Maan authored Oct 17, 2015
  
  6bd9a9fb
- Remove redundant helper method. · 6f085653
  Douwe Maan authored Oct 17, 2015
  
  6f085653
- Move last push info at top of project page. · cfa3602a
  Douwe Maan authored Oct 17, 2015
  
  cfa3602a
- Merge branch 'master' into cristianbica/gitlab-ce-user-project-view-files · 70240f43
  Douwe Maan authored Oct 17, 2015
  
  70240f43
- Merge branch 'rs-redactor-filter' into 'master' · 5ad3a274
  Douwe Maan authored Oct 17, 2015
```
Separate rendering of Markdown reference links from redacting those the user doesn't have access to and extracting referenced objects

Related: !1014

See merge request !1090
```
  5ad3a274
- Merge branch 'redirect-ci-dash' into 'master' · 5d010ecd
  Dmitriy Zaporozhets authored Oct 17, 2015
```
Temporary bring /ci page page with help information
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

See merge request !1630
```
  5d010ecd
- Merge branch 'redirect-ci-page' into 'master' · 5e74c5c4
  Dmitriy Zaporozhets authored Oct 17, 2015
```
Redirect old CI project route to GitLab project
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

See merge request !1629
```
  5e74c5c4
- Temporary bring /ci page page with help information · e9be3ec8
  Dmitriy Zaporozhets authored Oct 17, 2015
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  e9be3ec8
- Merge branch 'hide-builds-tab' into 'master' · fbd9d3ec
  Dmitriy Zaporozhets authored Oct 17, 2015
```
Hide Builds tab is GitLab CI is not enabled
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

See merge request !1627
```
  fbd9d3ec
- Redirect old CI project route to GitLab project · 748631b5
  Dmitriy Zaporozhets authored Oct 17, 2015
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  748631b5
- Hide Builds tab is GitLab CI is not enabled · efd5472c
  Dmitriy Zaporozhets authored Oct 17, 2015
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  efd5472c
16 Oct, 2015 26 commits

Merge branch 'filter-label' into 'master' · c856a7a5
Robert Speicher authored Oct 16, 2015
```
Allow dashboard and group issues/MRs to be filtered by label

See merge request !1591
```
c856a7a5
Merge branch 'fix_svn_link' into 'master' · 292b9da5
Robert Speicher authored Oct 16, 2015
```
Fix import from SVN link

See merge request !1617
```
292b9da5
Merge branch 'friday-meltdown-indexes' into 'master' · 2e1e3c44
Yorick Peterse authored Oct 16, 2015
```
See merge request !1623
```
2e1e3c44
Merge branch 'gghs-0.3.0' into 'master' · f84ed86a
Robert Speicher authored Oct 16, 2015
```
Use gitlab-git-http-server 0.3.0 for GitLab 8.1

See merge request !1605
```
f84ed86a

Added indexes for notes.line_code and CI columns · f4059547

Yorick Peterse authored Oct 16, 2015

This adds indexes for the following columns:

* notes.line_code
* ci_projects.gitlab_id
* ci_projects.shared_runners_enabled
* ci_builds.type
* ci_builds.status

f4059547

Merge branch 'gitlab-git-http-server-version' into 'master' · b39860b0

Robert Speicher authored Oct 16, 2015

Track compatible gitlab-git-http-server version

The 'git archive' changes in GitLab 8.1 require a version of
gitlab-git-http-server that is incompatible with GitLab 8.0, so we
need to keep track of this now.

See merge request !1603

b39860b0

Merge branch 'improve-typography' into 'master' · dad30ec0
Dmitriy Zaporozhets authored Oct 16, 2015
```
Improve typography



See merge request !1622
```
dad30ec0

Merge branch 'fix-wiki-padding' into 'master' · 2ff13cb3

Dmitriy Zaporozhets authored Oct 16, 2015

Dont put padding on typography but on holder elements instead
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Fixes wrong padding of wiki content. 


cc @JobV @skyruler 

See merge request !1620

2ff13cb3

Merge branch 'compact-select' into 'master' · efc31446

Dmitriy Zaporozhets authored Oct 16, 2015

Make selectbox options more compact
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

See merge request !1619

efc31446

Increase dropdown padding a bit · f6664601
Dmitriy Zaporozhets authored Oct 16, 2015

f6664601

Merge branch 'comment-highlight' into 'master' · 5bf3906a

Dmitriy Zaporozhets authored Oct 16, 2015

Highlight comment based on anchor in URL
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Fix for #2954 

See merge request !1618

5bf3906a

Improve markdown typography scss · 1543989d
Dmitriy Zaporozhets authored Oct 16, 2015
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
1543989d
Add extra padding to some markdown pages · b4cc05e5
Dmitriy Zaporozhets authored Oct 16, 2015
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
b4cc05e5
Dont put padding on typography but on holder elements instead · db1e7fb8
Dmitriy Zaporozhets authored Oct 16, 2015
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
db1e7fb8
Merge branch 'ci-commits-gl-project-id-index' into 'master' · f0bfbd72
Yorick Peterse authored Oct 16, 2015
```
Add index on ci_commits.gl_project_id



See merge request !1616
```
f0bfbd72
Make selectbox options more compact · f5b9c3d5
Dmitriy Zaporozhets authored Oct 16, 2015
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
f5b9c3d5
Highlight comment based on anchor in URL · 46d748dc
Dmitriy Zaporozhets authored Oct 16, 2015
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
46d748dc
Fix import from SVN link · a7fafee5
Drew Blessing authored Oct 16, 2015

a7fafee5
Add index on ci_commits.gl_project_id · c6be5006
Yorick Peterse authored Oct 16, 2015
```
Fixes #3086
```
c6be5006

Merge branch 'last-commit-project-page' into 'master' · e10f5f4f

Dmitriy Zaporozhets authored Oct 16, 2015

Show last commit from default branch on project home page

Implements #2705 

Screenshot: 

![Screenshot_2015-10-15_19.03.29](https://gitlab.com/gitlab-org/gitlab-ce/uploads/ef1cfa6764ab0ec5e7584ae61980a47d/Screenshot_2015-10-15_19.03.29.png)
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

cc @skyruler 

See merge request !1610

e10f5f4f

Change order of sha and commit message on project home page · 47e17103
Dmitriy Zaporozhets authored Oct 16, 2015
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
47e17103
Merge branch 'master' into rs-redactor-filter · 34148d15
Douwe Maan authored Oct 16, 2015

34148d15
Add changelog item · 66584f72
Dmitriy Zaporozhets authored Oct 16, 2015
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
66584f72

Merge branch 'notify-mr-upon-branch-presence-change' into 'master' · 0c2df939

Douwe Maan authored Oct 16, 2015

Add a system note and update relevant merge requests when a branch is deleted or re-added

If a branch is deleted with an open merge request, amended offline, and then pushed again,
GitLab doesn't bother to update the merge request even though the last commit ID and/or
code may have changed. This MR ensures that each push will update any relevant merge
requests and adds a system note if this happens as well.

The new messages look like:

![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/6581eea069cd8e485b7fa4187ed4c043/image.png)

Closes #2926 

See merge request !1601

0c2df939

Add tests for last commit info on project home page · d1450af8
Dmitriy Zaporozhets authored Oct 16, 2015
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
d1450af8
Reorder system note verb to say "Restored source branch X" instead of "Source branch X restored" · f726df26
Stan Hu authored Oct 16, 2015

f726df26