Commit Graph
22224 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets b4cc05e56e Add extra padding to some markdown pages
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-10-16 16:36:37 +02:00
Dmitriy Zaporozhets db1e7fb8dd Dont put padding on typography but on holder elements instead
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-10-16 16:25:57 +02:00
Yorick Peterse f0bfbd72bc Merge branch 'ci-commits-gl-project-id-index' into 'master'
Add index on ci_commits.gl_project_id



See merge request !1616
2015-10-16 14:21:11 +00:00
Dmitriy Zaporozhets f5b9c3d59d Make selectbox options more compact
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-10-16 16:15:30 +02:00
Dmitriy Zaporozhets 46d748dc2e Highlight comment based on anchor in URL
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-10-16 16:06:11 +02:00
Drew Blessing a7fafee521 Fix import from SVN link 2015-10-16 08:45:50 -05:00
Yorick Peterse c6be5006da Add index on ci_commits.gl_project_id
Fixes #3086
2015-10-16 15:29:50 +02:00
Dmitriy Zaporozhets e10f5f4f56 Merge branch 'last-commit-project-page' into 'master'
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
2015-10-16 13:21:37 +00:00
Dmitriy Zaporozhets 47e17103f5 Change order of sha and commit message on project home page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-10-16 13:36:48 +02:00
Dmitriy Zaporozhets 7c85ebf6dc Partly implement new UI for user page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-10-16 13:24:28 +02:00
Zeger-Jan van de Weg be10eea956 Merge branch 'master' into cross-reference-mr-on-issues 2015-10-16 11:49:23 +02:00
Douwe Maan 0108cdf495 Improve performance of filtering issues by milestone 2015-10-16 11:43:26 +02:00
Zeger-Jan van de Weg 9127ae5ca8 Improve performance of queries
Credits to Douwe Maan
2015-10-16 11:30:26 +02:00
Zeger-Jan van de Weg ac44e3844d Add project scope to milestone search 2015-10-16 11:30:26 +02:00
Zeger-Jan van de Weg b5762104ab Minor refactoring in seeding 2015-10-16 11:30:26 +02:00
Zeger-Jan van de Weg 64504b6364 Add an index to milestones title and label title 2015-10-16 11:30:26 +02:00
Douwe Maan 34148d1576 Merge branch 'master' into rs-redactor-filter 2015-10-16 11:26:48 +02:00
Dmitriy Zaporozhets 66584f72fd Add changelog item
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-10-16 11:15:12 +02:00
Douwe Maan 0c2df939df Merge branch 'notify-mr-upon-branch-presence-change' into 'master'
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
2015-10-16 09:03:24 +00:00
Dmitriy Zaporozhets d1450af81f Add tests for last commit info on project home page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-10-16 10:10:33 +02:00
Zeger-Jan van de Weg 94a788f66d Only accept open issues and merge requests 2015-10-16 09:59:32 +02:00
Stan Hu f726df26c2 Reorder system note verb to say "Restored source branch X" instead of "Source branch X restored" 2015-10-16 00:51:25 -07:00
Zeger-Jan van de Weg 9f9f0c35ec Show merge requests which close current issue 2015-10-16 09:46:59 +02:00
Stan Hu 888c1a3fc5 Add spec for refresh service adding notes to restored branches 2015-10-16 00:33:58 -07:00
Douwe Maan 33574c0278 Fix padding of outdated discussion item. 2015-10-16 09:31:35 +02:00
Stan Hu bf290a52b7 Rubocop fix 2015-10-15 23:54:13 -07:00
Stan Hu 577565d939 Add system notes for restored branches 2015-10-15 23:54:13 -07:00
Stan Hu 9c67f4fb51 Memoize merge request source branches 2015-10-15 23:54:13 -07:00
Stan Hu effa94bb87 Improve SystemNote interface for branch add/restore case 2015-10-15 23:54:13 -07:00
Stan Hu 22775c596f Preserve target branch 2015-10-15 23:54:13 -07:00
Stan Hu 2611d9f63c 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.

Closes #2926
2015-10-15 23:54:13 -07:00
Stan Hu bd3689e9e0 Merge pull request #9740 from ashleyhindle/patch-1
Changed loose to lose
2015-10-15 23:38:15 -07:00
Ashley Hindle a317c5296e Changed loose to lose 2015-10-16 07:36:20 +01:00
Robert Speicher 94ec666923 Merge branch 'when-syntax' into 'master'
Implement when syntax in .gitlab-ci.yml

See merge request !1606
2015-10-16 03:01:24 +00:00
Robert Speicher 64352d25b3 Correct spec description typo
[ci skip]
2015-10-15 21:30:47 -04:00
Robert Speicher 6fe2a679a7 Update CI YAML docs 2015-10-15 19:46:01 -04:00
Robert Speicher 62377d1754 Shut up, Rubocop 2015-10-15 19:44:15 -04:00
Robert Speicher c2c9f6d52d Remove 8.0-only steps from the 8.1 update guide
Also adds a preamble note that a working 8.0 installation (i.e.,
gitlab-git-http-server, updated Nginx/Apache configs) is required before
proceeding.

[ci skip]
2015-10-15 18:59:28 -04:00
Robert Speicher 6232bb1ef3 Remove notes about CI migration from 8.1 update guide
[ci skip]
2015-10-15 18:18:41 -04:00
Kamil Trzcinski 374ea21f32 Backticks around when types 2015-10-15 23:56:42 +02:00
Kamil Trzcinski 9419046196 Fix specs 2015-10-15 23:51:45 +02:00
Kamil Trzcinski 0aa6061d6a Implement when syntax in .gitlab-ci.yml 2015-10-15 23:49:39 +02:00
Robert Speicher 3d76390798 Merge branch 'sentences-end-in-periods' into 'master'
Sentences end in periods.

[ci skip]

See merge request !1604
2015-10-15 20:21:10 +00:00
Robert Speicher 9900a8531a Merge branch 'rs-prepare-8-1-0' into 'master'
Prepare 8.1 documentation

[ci skip]

See merge request !1612
2015-10-15 20:16:29 +00:00
Robert Speicher 8b54063453 Merge branch 'update-redcarpet' into 'master'
Update redcarpet gem. Fixes gem memory leak

Fixes #2773 

See merge request !1607
2015-10-15 20:14:42 +00:00
Robert Speicher facf8826da Add 8.0-to-8.1 update guide 2015-10-15 16:06:34 -04:00
Robert Speicher 6348f654cd Update Installation doc for 8-1-stable 2015-10-15 15:59:06 -04:00
Zeger-Jan van de WegandZeger-Jan van de Weg 3f08e4b186 Add specs on #license 2015-10-15 21:50:15 +02:00
Dmitriy Zaporozhets 9fd4822986 Show last commit from default branch on project home page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-10-15 19:02:29 +02:00
Kamil Trzciński 6df06ded12 Merge branch 'build-view-ui-fixes' into 'master'
Build View UI fixes



See merge request !1608
2015-10-15 16:18:01 +00:00