Commit Graph
18490 Commits
Author SHA1 Message Date
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
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
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
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
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
Jacob Vosmaer 1081a322f1 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.
2015-08-27 16:35:00 +02:00
Valery Sizov ff30b40754 Make all profile public 2015-08-27 13:06:14 +03:00
Dmitriy Zaporozhets abb5b9f6e5 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-08-27 10:16:17 +02:00
Dmitriy Zaporozhets 8cc47bbf3c Merge branch 'ui-improvements' into 'master'
UI improvements

* use shared partials for repeating rendering of projects, groups, snippets etc
* more consistency in way how projects, snippets and groups lists are rendered
* fix 500 error when submit project snippet without body
* remove some old and unused css
* more compact search page

See merge request !1214
2015-08-27 08:09:53 +00:00
Sytse Sijbrandij 397ebc5fc1 Doesn't refer to participating in watch. 2015-08-26 19:29:37 -07:00
Douwe Maan ea5da30326 Don't notify users without access to the project when they are (accidentally) mentioned in a note. 2015-08-26 17:23:22 -07:00
Dmitriy Zaporozhets 6a889572fa Add changelog items
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-27 00:53:00 +02:00
Dmitriy Zaporozhets e06fe6b7e1 Make search bar on search page more noticeable
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-27 00:50:17 +02:00
Dmitriy Zaporozhets dcdf214fd1 More compact search page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-27 00:22:36 +02:00
Dmitriy Zaporozhets 3d02ead924 Use same snippets icon everywhere. Fix list style for bordered-list
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-27 00:06:48 +02:00
Dmitriy Zaporozhets 4ac7f5c949 Restyle snippets rendering
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-27 00:00:06 +02:00
Dmitriy Zaporozhets daa90e1182 Fix 500 error when try to create project snippet without content
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-26 23:59:52 +02:00
Dmitriy Zaporozhets 5ea5e8f5d6 Standartize how we render group rows
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-26 23:41:56 +02:00
Dmitriy Zaporozhets e0b4222fa6 Small improvements to center top menu
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-26 23:12:24 +02:00
Dmitriy Zaporozhets 174e4424a5 Remove unused css
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-26 22:52:52 +02:00
Dmitriy Zaporozhets b54358b457 Refactor project list rendering
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-26 22:44:02 +02:00
Dmitriy Zaporozhets c27c813311 Improve trending projects finder
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-08-26 22:43:04 +02:00
Robert Speicher ce0a0feff4 Make snippet_blob highlight server-side as well 2015-08-26 11:43:25 -07:00
Robert Speicher 54771100eb Add user_color_scheme class to file_highlight
Prevents an unstyled flash that occurs when we were only applying the
syntax highlighting class in Javascript. Now for these uncached blobs
the server can add the syntax class, and for (possibly) cached fenced
code blocks, the Javascript will add it as needed.
2015-08-26 11:34:28 -07:00
Robert Speicher 7a81dc65d9 Re-add user_color_scheme helper
Update PreferencesHelper specs
2015-08-26 11:33:44 -07:00
Robert Speicher 2d72efcd9f Add count to Themes and ColorSchemes 2015-08-26 11:30:38 -07:00
Robert Speicher 6d43308b5a Add Gitlab::Themes.for_user 2015-08-26 11:30:11 -07:00
Robert Speicher de3b7d9c52 Merge branch 'update-mail-room' into 'master'
Update mail_room

See merge request !1213
2015-08-26 16:23:51 +00:00
Dmitriy Zaporozhets ef0149dd44 Merge branch 'enable_ssl_verification_web_hook' into 'master'
Enable SSL verification for Webhooks

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

See merge request !1135
2015-08-26 16:06:02 +00:00
Douwe Maan bc683a5904 Update mail_room 2015-08-26 08:58:46 -07:00
Robert Speicher 5b93c5579f Merge branch 'update-changelog-for-7.14.1' into 'master'
Update CHANGELOG for released 7.14.1

[ci skip]

See merge request !1211
2015-08-26 15:52:20 +00:00
Dmitriy Zaporozhets fc66e1cc94 Merge branch 'prevent-too-many-redirects-on-signin' into 'master'
Prevent too many redirects error when home page URL set to external_urll

Many users naively set the home page URL setting to external_url
(e.g. https://mydomain.com). When an unauthenticated user signs in, this
causes endless redirections. For example, this is occuring:

1. Unauthenticated user attempts to access https://mydomain.com/dashboard
2. Application redirects to the home page URL: https://mydomain.com
3. Repeat step 2

In step 3, ApplicationController should have redirected the user to
https://mydomain.com/users/sign_in. Disabling the redirection if home
page URL is the same as external_url prevents users from messing up.

* Closes https://github.com/gitlabhq/gitlabhq/issues/8843
* Closes #2057

See merge request !1210
2015-08-26 15:23:53 +00:00
Dmitriy Zaporozhets 6c23fd389f Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-08-26 17:06:32 +02:00
Dmitriy Zaporozhets ef1776b823 Merge branch 'fluid-fixed-layout' into 'master'
Limit content width for big screens except certain pages

- [x] limit content width to 1200px
- [x] align header with head
- [x] set full-width for split diff pages

Fixes #2353

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

See merge request !1207
2015-08-26 14:56:04 +00:00