home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-13 22:59:19 +10:00
Code Issues Packages Projects Releases Wiki Activity
18,520 Commits 48 Branches 340 Tags
1ec68ea9c208317b6d981da4bf7d022ccd62bb3e
Commit Graph
18520 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Speicher 1ec68ea9c2 Default user_can_reference? to true when no attributes match 
Now, a reference link with a `.gfm` class but without one of our
`data-*-id` attributes should be shown to the user rather than hidden.
 2015-09-01 17:59:08 -04:00
Robert Speicher 7f75300573 Add RedactorFilter 2015-09-01 17:00:29 -04:00
Robert Speicher 454d227b45 Remove all permission checking from Reference filters 2015-09-01 16:58:38 -04:00
Douwe Maan afb2e6f485 Merge branch 'rs-cleanup-redcarpet-renderer' into 'master' 
Decouple Gitlab::Markdown from the GitlabMarkdownHelper

This module is now the sole source of knowledge for *how* we render
Markdown (and GFM).

See merge request !1223
 2015-09-01 20:13:44 +00:00
Robert Speicher 1bcfe4d2ff Remove PreferencesHelper include from GitlabMarkdownHelper 2015-09-01 13:37:05 -04:00
Douwe Maan 2236e9d617 Merge branch 'fix-bitbucket-import-issue-order' into 'master' 
Import all Bitbucket issues and sort issues by creation date

Previously only the first 15 Bitbucket issues would be imported. Other issues in the API return call also calls import errors.

Tested by importing 400+ issues from this repo: https://bitbucket.org/ned/coveragepy

API reference here: https://bitbucket.org/site/master/issues/3571/api-issues-sorting-bb-3518

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

See merge request !1226
 2015-09-01 17:29:08 +00:00
Robert Speicher f43e48a1ce Require gitlab/markdown in ReferenceExtractor 2015-09-01 13:28:19 -04:00
Stan Hu 2e9c922dd1 Fix bug where only the first 15 Bitbucket issues would be imported. 
Also fix a number of issues where author/reporter names were not available.
 2015-09-01 08:50:20 -07:00
Stan Hu 31e4654b1f Sort issues by creation date in Bitbucket importer 
API reference here: https://bitbucket.org/site/master/issues/3571/api-issues-sorting-bb-3518

Closes https://github.com/gitlabhq/gitlabhq/issues/9519
 2015-09-01 08:46:42 -07:00
Dmitriy Zaporozhets 2ef16e7660 Merge branch 'gitlab-git-http-server' into 'master' 
Replace grack with gitlab-git-http-server

See merge request !1229
 2015-09-01 14:21:45 +00:00
Dmitriy Zaporozhets 26be65337c Merge branch 'profile-settings' into 'master' 
Rename profile settings navigation to "Profile Settings" 

Fixes #2555 

See merge request !1926
 2015-09-01 12:33:04 +00:00
Dmitriy Zaporozhets f0aa6986fa Update db schema 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-01 14:01:56 +02:00
Dmitriy Zaporozhets f07273f6f6 Rename profile settings navigation to "Profile Settings" 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-01 13:35:03 +02:00
Marin Jankovski aa1c321459 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-09-01 12:51:57 +02:00
Valery Sizov 96b55a0e90 Merge branch 'master' into 'master' 
Update Racc to 1.4.12

The primary reason for this is that this would let me debug #2343 using Rubinius' `-Xic.debug` option.

See merge request !1201
 2015-09-01 10:38:46 +00:00
Job van der Voort bbfa65ac30 Merge branch 'add-commands' into 'master' 
Added new commands to GitLab Basics docs



See merge request !1924
 2015-09-01 09:32:18 +00:00
Valery Sizov bb86df1bd2 Merge branch 'fix-branches-cache-after-merge' into 'master' 
Expire cache when merge request source branch was removed

Re-implement !1160 for 8.0. Also we have tests for MergeWorker now! Yay ✨

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

See merge request !1224
 2015-09-01 09:09:03 +00:00
Dmitriy Zaporozhets 86dd1bd7ab Merge branch 'oauth_token_with_ldap' into 'master' 
Retrieving oauth token with LDAP credentials

https://dev.gitlab.org/gitlab/gitlabhq/issues/2529

See merge request !1220
 2015-09-01 09:06:14 +00:00
karen Carias c924a3a8d7 deleted additional info 2015-08-31 22:50:32 -07:00
Robert Speicher 2930041886 Make sure the gfm helper passes the required options 
This adds some duplication, but this helper is temporary.
 2015-08-31 18:09:18 -04:00
Robert Speicher c104f4d590 Remove unnecessary strip from reference_class method 2015-08-31 16:23:46 -04:00
Robert Speicher 08ca941186 Move REDCARPET_OPTIONS to a private method 
There wasn't really a reason to have them as a constant, and we were
getting "already defined" warnings which are always annoying.
 2015-08-31 16:22:34 -04:00
Robert Speicher 805693bfea Remove invalid spec for GitlabMarkdownHelper 2015-08-31 16:22:14 -04:00
Robert Speicher 90ab92621f Make gfm delegate to Gitlab::Markdown.gfm instead of markdown 
Some usages of the `gfm` helper depend on the text not being rendered as
standard Markdown. Ugh.
 2015-08-31 16:16:26 -04:00
Robert Speicher 7816b22360 Fix context options in markdown helper 
We need to send `path`, not `requested_path`.
 2015-08-31 16:16:03 -04:00
Dmitriy Zaporozhets c767e2e0fd Merge branch 'fix-headers-blocking-anchors' into 'master' 
Prevent anchors from being hidden by header upon a new page load

Browsers change the scroll position after the page is loaded, and the current 1 ms
delay wasn't long enough for the browser to jump to the anchor. Even then, it appears
another 100ms delay is necessary to adjust the scroll properly:

http://stackoverflow.com/questions/19057731/scrolltop-on-page-reload-doesnt-work-possible-script-conflict

Add a little more of an offset to see a few lines before the anchor.

* Closes #1614
* Closes #1024

See merge request !1225
 2015-08-31 17:11:41 +00:00
Jacob Vosmaer 780bac1026 Be more defensive when running 'kill' 2015-08-31 16:15:41 +02:00
Jacob Vosmaer 90b1ecfa01 Merge remote-tracking branch 'gitlab.com/master' into gitlab-git-http-server 2015-08-31 15:51:41 +02:00
Jacob Vosmaer 4027a26e7b Replace grack with gitlab-git-http-server 2015-08-31 15:30:15 +02:00
Valery Sizov 6f785d584b retrieving oauth token with LDAP credentials 2015-08-31 15:10:01 +03:00
Achilleas Pipinellis e334ec0683 Ordering of GitHub issues import is now fixed 
See https://gitlab.com/gitlab-org/gitlab-ce/commit/4a203aab57c69ea402939cf8fc423a0e5aaa1cab
 2015-08-31 08:24:50 +03:00
Robert Speicher 8c0565b7ca Merge branch 'dont-notify-users-without-project-access' into 'master' 
Don't notify users without access to the project when they are (accidentally) mentioned in a note.

Addresses #2366.

See merge request !1216
 2015-08-30 23:56:34 +00:00
Douwe Maan c388f3db56 Merge branch 'joelkoglin/gitlab-ce-feature_fix_ldap_auth_issue_993' 2015-08-29 11:51:46 -07:00
Douwe Maan 12d8b01eb2 Move changelog item 2015-08-29 11:49:59 -07:00
Douwe Maan fe86c8dfbd Merge branch 'master' into joelkoglin/gitlab-ce-feature_fix_ldap_auth_issue_993 2015-08-29 11:49:14 -07:00
Douwe Maan d92f428024 Minor refactor 2015-08-29 11:48:54 -07:00
Stan Hu 1fdf56c95d Prevent anchors from being hidden by header upon a new page load. 
Browsers change the scroll position after the page is loaded, and the current 1 ms
delay wasn't long enough for the browser to jump to the anchor. Even then, it appears
another 100ms delay is necessary to adjust the scroll properly:

http://stackoverflow.com/questions/19057731/scrolltop-on-page-reload-doesnt-work-possible-script-conflict

Add a little more of an offset to see a few lines before the anchor.

Closes #1614
Closes #1024
 2015-08-29 02:05:37 -07:00
Dmitriy Zaporozhets 39ee52f1b1 Expire cache when merge request source branch was removed 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-08-28 10:23:56 +02:00
Stan Hu a429eb4d45 Merge branch 'fix-session_expire_delay' into 'master' 
read session_expire_delay from database if table & column exists;

Previous code only ends up using the default value for session_expire_delay, not the value stored in the database, making the session always 1 week.

See merge request !1217
 2015-08-28 07:55:51 +00:00
Eric Maziade 23aee0ca8a fixed connection detection so settings can be read from the database 2015-08-27 21:21:31 -04:00
Robert Speicher 9bb06ae9ef Make sure the main Gitlab::Markdown module gets loaded before filters 2015-08-27 16:02:49 -07:00
Robert Speicher 62117becb9 Add a temporary gfm helper that just delegates to markdown 
Some views are still calling `gfm` directly. We'll need to update them
to instead call `markdown` with a `pipeline: ...` argument.
 2015-08-27 15:36:56 -07:00
Robert Speicher 8e7111f79d Reference filters no longer take a custom class context option 2015-08-27 15:36:26 -07:00
Dmitriy Zaporozhets 53698401fb Merge branch 'make_all_profile_public' into 'master' 
Make all profile public

https://dev.gitlab.org/gitlab/gitlabhq/issues/1361

See merge request !1219
 2015-08-27 21:55:00 +00:00
Douwe Maan 04d5d26552 Merge branch 'upgrade-gitlab-git-7.2.15' into 'master' 
Upgrade gitlab_git to 7.2.15 to fix `git blame` errors with ISO-encoded files

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

See merge request !1222
 2015-08-27 21:49:23 +00:00
Robert Speicher a4e4fde3e6 Restore the forwarded HTML options in link_to_gfm 2015-08-27 14:28:45 -07:00
Robert Speicher 4340dd3eeb Decouple Gitlab::Markdown from the GitlabMarkdownHelper 
This module is now the sole source of knowledge for *how* we render
Markdown (and GFM).
 2015-08-27 14:17:26 -07:00
Stan Hu ef6c06c0f3 Upgrade gitlab_git to 7.2.15 to fix git blame errors with ISO-encoded files 
Closes https://github.com/gitlabhq/gitlabhq/issues/9577
 2015-08-27 13:08:15 -07:00
Douwe Maan 10ee826847 Merge branch 'improve-mail_room-wrapper' into 'master' 
Properly daemonize the mail_room process

The old invocation only worked by accident because we have a '&'
somewhere in the init script for expediency. When ran from a terminal,
the mail_room daemon process ended up in the session of the terminal.
This commit adds a small wrapper that tries to do the textbook
daemonization steps (double fork, setsid etc.) while also taking
care that the pidfile is written before the 'start' process exits.

See merge request !1221
 2015-08-27 16:56:43 +00:00
Douwe Maan 30555c1d24 Merge branch 'rs-remove-user-color-scheme-class' into 'master' 
Apply syntax highlighting to fenced code blocks client-side

Instead of applying the syntax highlighting scheme class to these blocks
server-side, we use Javascript and Gon to apply the user's color scheme
(or the default) client-side.

This will make it easier to cache these blocks in the future because
they're no longer state-dependent.

See merge request !1203
 2015-08-27 16:24:51 +00:00