home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-13 14:46:05 +10:00
Code Issues Packages Projects Releases Wiki Activity
19,169 Commits 48 Branches 340 Tags
ebcd503e9372df6b5d3dfecbb548b0bd1e3d1ecb
Commit Graph
19169 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Speicher ebcd503e93 Only surface version information on help index to admins 
Closes #2721
 2015-09-23 16:01:35 -04:00
Robert Speicher fd6b5099fb Merge branch 'rs-changelog' into 'master' 
Update CHANGELOG to add unreleased 8.0.2 entry

[ci skip]

See merge request !1413
 2015-09-23 18:06:47 +00:00
Robert Speicher be696b72eb Update CHANGELOG to add unreleased 8.0.2 entry 
[ci skip]
 2015-09-23 13:39:58 -04:00
Robert Speicher 7bca8745fd Merge branch 'fix-ldap-attributes' into 'master' 
Fix LDAP attribute mapping

See merge request !1408
 2015-09-23 17:29:25 +00:00
Robert Speicher 0175769aa8 Merge branch 'fix-markdown-truncation-removing-links' into 'master' 
Fix cases where Markdown did not render links in activity feed

HTML would be stripped in `truncate_if_block` when a comment had multiple lines
and the first wasn't long enough to be truncated. The use of `node.content` would
strip all HTML tags. Using `node.inner_html` retains these tags and puts the
"..." in between paragraph tags.

Closes #2586

See merge request !1401
 2015-09-23 17:20:37 +00:00
Robert Speicher 3f2c0e94df Merge branch 'rs-sign-in-margin' into 'master' 
Fix top margin for sign-in button on public pages

Closes #2615

[ci skip]

See merge request !1412
 2015-09-23 17:00:19 +00:00
Robert Speicher 15bf2e4457 Fix top margin for sign-in button on public pages 
Closes #2615
 2015-09-23 12:58:00 -04:00
Dmitriy Zaporozhets b859506b03 Merge branch 'enable-ci-on-push' into 'master' 
Enable CI for gitlab when .gitlab-ci.yml is pushed 

Make enabling CI as easy as pushing file. 

Should be merged after !1402. 

Fixes #2650. Part of #2594 and internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2528

See merge request !1403
 2015-09-23 16:36:49 +00:00
Robert Speicher 32cb9d215d Merge branch 'make-commit-graphs-responsive' into 'master' 
Make commit graphs responsive to window width changes

Closes #2653

See merge request !1395
 2015-09-23 16:31:32 +00:00
Dmitriy Zaporozhets 0a57c3f610 Refactor Project#enable_ci method 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-23 16:52:26 +02:00
Douwe Maan 73a3df4de3 Fix LDAP attribute mapping 2015-09-23 16:37:59 +02:00
Dmitriy Zaporozhets aba9668ace Rescue rugged error when detect ci yml file 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-23 14:29:41 +02:00
Dmitriy Zaporozhets cfe6634078 Merge branch 'ad_coder' into 'master' 
Improve Markdown css



See merge request !1389
 2015-09-23 12:22:45 +00:00
Douwe Maan ff63a166e9 Merge branch 'rs-fix-help-links' into 'master' 
Prevent double-prefixing of help page paths

Closes #2679 

See merge request !1400
 2015-09-23 11:44:17 +00:00
Douwe Maan e63b64de34 Merge branch 'commits-page-ci-status' into 'master' 
Commits page CI status

Show CI status for each commit row on pages like: Commits, Merge request (commits tab), Compare etc

![Screenshot_2015-09-23_12.34.50](https://gitlab.com/gitlab-org/gitlab-ce/uploads/d40d6a69f76128e32d3a0cb641b3495b/Screenshot_2015-09-23_12.34.50.png)


Fixes #2632 

See merge request !1402
 2015-09-23 11:41:24 +00:00
Dmitriy Zaporozhets 2eb9a20f36 Enable CI for gitlab when .gitlab-ci.yml is pushed 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-23 13:11:40 +02:00
Hannes Rosenögger 486a647925 Merge branch 'correct-markdown-documentation' into 'master' 
Correct markdown.md docs RE use in commit messages.

This is an improvement to the situation covered in issue #1582. It corrects the markdown documentation to demonstrate that GFM cannot currently be used in commit messages.

See merge request !1343
 2015-09-23 10:35:48 +00:00
Dmitriy Zaporozhets 3b6915d891 Add tests for CiStatusHelper and changelog item 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-23 12:34:21 +02:00
Dmitriy Zaporozhets 21dfaa000d Show CI status on all pages where commits list is rendered 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-23 12:23:04 +02:00
Dmitriy Zaporozhets 64ec7a3e0e Bump version and changelog 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-23 12:21:22 +02:00
Marin Jankovski 241ec7a5ee Merge branch 'fix-mr-missing-source-branch-error' into 'master' 
Fix error when MR source branch no longer exists.



See merge request !1393
 2015-09-23 09:28:59 +00:00
Douwe Maan b4bedfdfb9 Merge branch 'fix-user-identities-api' into 'master' 
Fix user identities API

Added ability to update or set the identity of an existing user, like the documentation said it was possible, but actually wasn't.

@DouweM or @stanhu could you please take a look at my code, and see if its sound?

/cc @JobV 

See merge request !1398
 2015-09-23 09:13:23 +00:00
AndreyandDmitriy Zaporozhets 9103602620 Improve UI for rendered markdown 2015-09-23 10:58:28 +02:00
Stan Hu a7b0ee3fd1 Fix cases where Markdown did not render links in activity feed 
HTML would be stripped in `truncate_if_block` when a comment had multiple lines
and the first wasn't long enough to be truncated. The use of `node.content` would
strip all HTML tags. Using `node.inner_html` retains these tags and puts the
"..." in between paragraph tags.

Closes #2586
 2015-09-22 21:56:27 -07:00
Robert Speicher 95f73a68fa Simplify help path prefixing 2015-09-23 00:24:17 -04:00
Robert Speicher 64e0dfa530 Prevent double-prefixing of help page paths 
Prior, because the link "api/README.md" was matched twice, the first
link became "help/help/api/README.md". Now we do a negative lookahead to
make sure the link doesn't start with `help/`.

This fix is still not ideal, see TODO note.
 2015-09-22 18:26:51 -04:00
Robert Speicher c551c81e28 Fix "User permissions" help page path 2015-09-22 18:26:41 -04:00
Robert Schilling 03fd5919a3 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-09-22 23:32:35 +02:00
Patricio Cano f60eb60473 Added ability to update or set the identity of an existing user, like the documentation said it was possible, but actually wasn't. 2015-09-22 16:26:59 -05:00
Robert Speicher 4ad9b49a14 Merge branch 'clarify-text' into 'master' 
Clarify confirmation text on user deletion.

See #1699

Some users thought it was ok to delete the user because they'd only use the issues.  
This clarifies a bit better what's being deleted when you delete a user.

See merge request !1382
 2015-09-22 21:09:09 +00:00
Robert Speicher b64d81e9bf Merge branch 'rs-fix-migration-guide' into 'master' 
Fix CI backup step in migration guide

[ci skip]

See merge request !1397
 2015-09-22 20:27:41 +00:00
Robert Speicher 3c46ae1df3 Fix CI backup step in migration guide 
[ci skip]
 2015-09-22 16:25:23 -04:00
Douwe Maan e500be8310 Merge branch 'exclude_initd_rake_check_when_omnibus' into 'master' 
Skip check_initd_configured_correctly on omnibus installs

This was causing the task `gitlab-rake gitlab:incoming_email:check`
to fail.

See merge request !1396
 2015-09-22 20:16:51 +00:00
Sytse Sijbrandij 37ecae33ec Add better deprecation notice for the upgrader. Too easy to miss otherwise https://twitter.com/0x663030623472/status/646262552796594176 2015-09-22 19:56:51 +00:00
Achilleas Pipinellis 110e90c855 Skip check_initd_configured_correctly on omnibus installs 
This was causing the task `gitlab-rake gitlab:incoming_email:check`
to fail.
 2015-09-22 22:56:49 +03:00
Stan Hu ef2679d0b9 Make commit graphs responsive to window width changes 
Closes #2653
 2015-09-22 11:30:41 -07:00
Robert Speicher 9e1392553b Merge branch 'rs-changelog' into 'master' 
8.0.0 is released; add 8.0.1 entry to CHANGELOG

[ci skip]

See merge request !1394
 2015-09-22 16:32:20 +00:00
Robert Speicher 2cdd88e8ed 8.0.0 is released; add 8.0.1 entry to CHANGELOG 
[ci skip]
 2015-09-22 12:29:55 -04:00
Robert Schilling e34f18a8d8 Merge pull request #9654 from Tyrael/patch-1 
Update CHANGELOG
 2015-09-22 18:12:29 +02:00
Douwe Maan d80750b50f Fix error when MR source branch no longer exists. 2015-09-22 17:49:45 +02:00
Job van der Voort 70875a6aba Merge branch 'dont_want_the_data' into 'master' 
Add to migration on what to do if you don't want your data.

If you don't want to migrate your CI data , remove the old builds directory.

See merge request !1392
 2015-09-22 15:04:08 +00:00
Marin Jankovski e2be419c95 Add to migration on what to do if you don't want your data. 2015-09-22 16:57:43 +02:00
Job van der Voort 555c197643 Merge branch 'install-doc-reply-by-email' into 'master' 
Mention Reply by email in installation doc.

Added the "Enable Reply by email" section and moved the others around.

See merge request !1390
 2015-09-22 14:28:50 +00:00
Marin Jankovski 398092273b Merge branch 'ci-migration-doc-improvements' into 'master' 
Ci migration doc improvements

Use export improvements in CI 8.0.1, make upgrades a more prominent part of the process, do not shut down GitLab during CI data import.

See merge request !1387
 2015-09-22 14:10:24 +00:00
Douwe Maan a1b60003f0 Mention Reply by email to installation doc. 2015-09-22 15:36:40 +02:00
Jacob Vosmaer d2ab95d1f3 Make code block comments more verbose 2015-09-22 15:26:40 +02:00
Jacob Vosmaer 3e926c6eb0 Emphasize when Omnibus installs are done 2015-09-22 14:54:26 +02:00
Jacob Vosmaer 82d95c4612 Use headings to mark steps 2015-09-22 14:49:39 +02:00
Jacob Vosmaer f0f5be82b0 Add global numbering 2015-09-22 14:02:36 +02:00
Jacob Vosmaer e72ba928f9 Downtime expectations 2015-09-22 13:59:40 +02:00