Commit Graph
19824 Commits
Author SHA1 Message Date
Dmitriy ZaporozhetsandRobert Speicher c956ecd9cc Merge branch 'outdated-discussion-padding' into 'master'
Fix padding of outdated discussion item.

Old:

![Screen_Shot_2015-10-16_at_09.29.17](https://gitlab.com/gitlab-org/gitlab-ce/uploads/d715debebe54d27c2eed7c22843e886c/Screen_Shot_2015-10-16_at_09.29.17.png)

New:

![Screen_Shot_2015-10-16_at_09.29.23](https://gitlab.com/gitlab-org/gitlab-ce/uploads/7c0c033adade92cb16406c027cb4c010/Screen_Shot_2015-10-16_at_09.29.23.png)

It still looks the same when the discussion is expanded.

See merge request !1614
2015-10-17 17:41:58 -04:00
Dmitriy ZaporozhetsandRobert Speicher 73547ae613 Merge branch 'redirect-ci-dash' into 'master'
Temporary bring /ci page page with help information

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

See merge request !1630
2015-10-17 17:40:33 -04:00
Douwe Maan d80a4d3c15 Merge branch 'rs-redactor-filter' into 'master'
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
2015-10-17 13:57:22 +02:00
Robert SpeicherandRobert Speicher f4d3639a0d Merge branch 'filter-label' into 'master'
Allow dashboard and group issues/MRs to be filtered by label

See merge request !1591
2015-10-16 17:31:38 -04:00
Drew BlessingandRobert Speicher e047e13a79 Fix import from SVN link 2015-10-16 17:18:36 -04:00
Robert SpeicherandRobert Speicher 64edacd9f6 Merge branch 'gghs-0.3.0' into 'master'
Use gitlab-git-http-server 0.3.0 for GitLab 8.1

See merge request !1605
2015-10-16 16:16:59 -04:00
Robert SpeicherandRobert Speicher c3f5cc5367 Merge branch 'gitlab-git-http-server-version' into 'master'
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
2015-10-16 16:16:56 -04:00
Dmitriy ZaporozhetsandRobert Speicher 10d64038e3 Merge branch 'improve-typography' into 'master'
Improve typography



See merge request !1622
2015-10-16 16:12:15 -04:00
Dmitriy ZaporozhetsandRobert Speicher 4a3f0f9517 Merge branch 'fix-wiki-padding' into 'master'
Dont put padding on typography but on holder elements instead

Fixes wrong padding of wiki content.

See merge request !1620
2015-10-16 16:11:40 -04:00
Dmitriy ZaporozhetsandRobert Speicher 201d265b47 Merge branch 'compact-select' into 'master'
Make selectbox options more compact

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

See merge request !1619
2015-10-16 16:09:05 -04:00
Dmitriy ZaporozhetsandRobert Speicher d4a20a6aa8 Merge branch 'comment-highlight' into 'master'
Highlight comment based on anchor in URL

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Fix for #2954 

See merge request !1618
2015-10-16 16:08:49 -04:00
Yorick PeterseandRobert Speicher 3234e800a0 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 16:05:53 -04:00
Ashley HindleandRobert Speicher 13931ec577 Changed loose to lose 2015-10-16 16:04:54 -04:00
Douwe MaanandRobert Speicher fd2d295b6b 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 16:03:48 -04:00
Robert Speicher bc0ee41a27 Version 8.1.0.rc1 v8.1.0.rc1 2015-10-16 00:15:44 -04: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
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
Kamil Trzcinski 567460d16d Added missing comma [ci skip] 2015-10-15 18:11:46 +02:00
Dmitriy Zaporozhets c82755f539 Update redcarpet gem. Fixes gem memory leak
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-10-15 18:01:24 +02:00
Kamil Trzcinski 71d0cfcff6 Make the builds view and warning notice nicer 2015-10-15 17:14:01 +02:00
Dmitriy Zaporozhets 19cfa86aa3 Merge branch 'rs-markdown-typography' into 'master'
Markdown typography CSS fixes

The `!important` flags recently added to the `md-typography`
mixin's `pre` elements were overriding the background and
foreground colors for syntax highlighting.

| Before | After |
|:------:|:-----:|
| ![Screen_Shot_2015-09-25_at_3.32.32_PM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/802163bd9f46864ac89e7be165951f07/Screen_Shot_2015-09-25_at_3.32.32_PM.png) | ![Screen_Shot_2015-09-25_at_3.33.30_PM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/6be72036653378405320085324dff5ad/Screen_Shot_2015-09-25_at_3.33.30_PM.png) |

See merge request !1442
2015-10-15 14:11:13 +00:00
Dmitriy Zaporozhets 353ddbc795 Merge branch 'stanhu/gitlab-ce-fix-api-mr-comment-notifications' 2015-10-15 15:56:43 +02:00
Kamil Trzcinski 0d09b5fefc Fix builds view count indicator 2015-10-15 15:50:40 +02:00
Valery Sizov 62bf2eb862 Merge branch 'fix/improve_reset_service_password_v2' into 'master'
Improve invalidation of stored service password if the endpoint URL is changed (V2)

New version of !1583, using the same failproof logic but this time mirroring the name and behaviour of the change-tracking methods of ActiveModel::Dirty in order to make it clearer and more natural.

Added more tests to clarify the expected behaviour.

This is an alternative to !1594

/cc @vsizov @rspeicher

See merge request !1600
2015-10-15 13:47:37 +00:00
Yorick Peterse 5ce933599c Merge branch 'user-by-login-performance' into 'master'
Improve User.by_login performance

This greatly speeds up the performance of `User.by_login`. I adopted some changes from @haynes in this patch, the credits go to him for coming up with those originally.

Fixes #2341

See merge request !1545
2015-10-15 13:41:17 +00:00
Dmitriy Zaporozhets c0a6836be4 Merge branch 'view-issue-performance' 2015-10-15 14:37:04 +02:00
Douwe Maan d843cbe08d Sentences end in periods. 2015-10-15 13:44:32 +02:00
Douwe Maan 4b28f2d999 Merge branch 'git-archive-golang' into 'master'
Let gitlab-git-http-server handle archive downloads

This change relies on changes in gitlab_git and gitlab-git-http-server.

fixes #2429

See merge request !1548
2015-10-15 11:43:14 +00:00
Kamil Trzciński daccc54d25 Merge branch 'builds-view' into 'master'
Added builds view

![Screen_Shot_2015-10-13_at_19.02.48](https://gitlab.com/gitlab-org/gitlab-ce/uploads/95bb3a7d9d603678fdd077558637045d/Screen_Shot_2015-10-13_at_19.02.48.png)

/cc @dzaporozhets @vsizov 


See merge request !1593
2015-10-15 11:35:57 +00:00
Dmitriy Zaporozhets 524b3db30c Merge branch 'fix-path-with-leading-dot-error' into 'master'
Fix error preventing displaying of commit data for a directory with a leading dot

Directories with leading dots erroneously get rejected by the route controller if git
ref regex is used in constraints. This prevents commit data from being loaded. The regex verification is now done in controller.

Closes https://github.com/gitlabhq/gitlabhq/issues/8763


See merge request !1574
2015-10-15 10:36:24 +00:00
Dmitriy Zaporozhets 465a20888a Merge branch 'rs-remove-guard' into 'master'
Remove guard-rspec and its supporting gems



See merge request !1551
2015-10-15 10:34:28 +00:00
Yorick Peterse 97e02f4bc9 Added documentation on the various profiling tools 2015-10-15 12:15:18 +02:00
Alex Lossent 98e666ab6a Improve invalidation of stored service password if the endpoint URL is changed
Password can now be specified at the same time as the new URL, and the service
template admin pages now work.
2015-10-15 12:07:59 +02:00
Yorick Peterse bed29940ef Fixed Rubocop styling issues 2015-10-15 12:05:01 +02:00
Yorick Peterse e5925d073e Renamed Note.inc_associations to with_associations 2015-10-15 12:05:01 +02:00
Yorick Peterse 9f5811116c Changelog entry for issue page speedups 2015-10-15 12:05:01 +02:00
Yorick Peterse f3980e230f Don't use link_to/image_tag where not needed
In these particular instances we can just use HAML tags directly. This
can shave off some time spent loading issue pages, though this depends
on the amount of comments being displayed.

When viewing https://gitlab.com/gitlab-org/gitlab-ce/issues/2164 locally
these changes reduce loading time by about 400 ms in total.
2015-10-15 12:05:01 +02:00