Commit Graph
14039 Commits
Author SHA1 Message Date
Robert Schilling b3a88a0fdc Merge pull request #7528 from exromany/patch-1
Update user_management.md
2014-09-13 23:12:21 +02:00
Dmitriy Zaporozhets e19c1f71d3 Merge pull request #7749 from wesgurn/master
Adding ability to configure webhook timeout via gitlab.yml
2014-09-13 22:47:23 +03:00
Marin Jankovski 9b59570c8e Fix diff_helper spec. 2014-09-12 21:02:50 +02:00
Marin Jankovski 75fbca83e3 Add one feature test. 2014-09-12 20:12:31 +02:00
Marco Cyriacks 8d0bc76487 Change gitlab/log permissions in installation.md
This patch changes default permission of the gitlab/log directory to
u+rwX,go-w. This is done to make the directory NOT readable by group and
others and to avoid logrotate complaining about it. chmod 755 is not
used to avoid setting executable bit on file within the log dir.
2014-09-12 19:56:25 +02:00
Marin Jankovski 9945e8c424 Move organizing of comments to helper. 2014-09-12 19:51:44 +02:00
Marin Jankovski e84861d510 Remove unecesarry array operations. 2014-09-12 19:41:32 +02:00
Marin Jankovski 7d3daa4dfb Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-09-12 19:03:59 +02:00
Marin Jankovski 1fd58c84a0 Merge pull request #7741 from Razer6/refactor/remove_duplicate_steps
[Refactor] Remove duplicated labels step
2014-09-12 19:03:47 +02:00
Marin Jankovski 4bf24d239f Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2014-09-12 19:03:10 +02:00
Marin Jankovski 5564fe3149 Add comments on the side-by-side diff. 2014-09-12 18:44:53 +02:00
Robert Schilling 5ac019946f Merge pull request #7743 from bbodenmiller/patch-12
formatting changes, table->database
2014-09-12 18:43:28 +02:00
Dmitriy Zaporozhets 29f990002c Merge branch 'backlog_socket' into 'master'
Use the default Unicorn socket backlog value: 1024

See merge request !1087
2014-09-12 16:22:01 +00:00
Dmitriy Zaporozhets 72d3d67a18 Merge pull request #7712 from bbodenmiller/patch-1
set fail_timeout=0 as recommended by Unicorn
2014-09-12 18:55:42 +03:00
Wes Gurney 81a70bf515 Adding ability to configure webhook timeout via gitlab.yml 2014-09-12 11:38:14 -04:00
uran 7d9cdc2d37 Source repo is now clickable. 2014-09-12 17:53:08 +03:00
Jacob Vosmaer 5704e6fee9 Use sockets to connect to Redis 2014-09-12 14:59:58 +02:00
Jacob Vosmaer e645b9a9d5 Use the default Unicorn socket backlog value: 1024 2014-09-12 13:43:52 +02:00
uran 02eca79ef1 Changed activity notes to display first MEANINGFUL line. 2014-09-12 14:22:15 +03:00
Dmitriy Zaporozhets cbb44b9da3 Merge pull request #7662 from Razer6/disable_buttons_on_empty_form
[UX] Disable buttons if form is empty
2014-09-12 13:41:48 +03:00
Dmitriy Zaporozhets 318d5d93e3 Merge pull request #7522 from Razer6/fix_tags_count
[UX] Update tag count if tag gets deleted via web interface
2014-09-12 13:39:56 +03:00
Robert Schilling a6084a7608 Merge pull request #7439 from bbodenmiller/patch-6
set the number of workers to # of cores
2014-09-12 11:37:54 +02:00
Sytse Sijbrandij 21134df202 Merge pull request #7713 from bbodenmiller/patch-5
Add Feedback link
2014-09-12 11:32:41 +02:00
Ben Bodenmiller ee6ec5bd6d set the number of workers to # of cores 2014-09-12 02:22:43 -07:00
Ben Bodenmiller 25ee53c3ae fail_timeout=0 as recommended by Unicorn
Set's fail_timeout=0 as recommended by
http://unicorn.bogomips.org/Unicorn/Configurator.html#method-i-timeout
when Unicorn is running behind nginx.
2014-09-12 02:19:38 -07:00
Ben Bodenmiller 47171aab3d add requests link
Add requests link for feature requests.
2014-09-12 02:07:17 -07:00
Ben Bodenmiller 377a5bd521 formatting changes, table->database
Make formatting consistent on page.

Change table -> database as they are database permissions.
2014-09-12 01:03:11 -07:00
Dmitriy Zaporozhets a034a46652 Merge pull request #7737 from Razer6/feature/zenmaster
Zen Mode for issues/MR/notes
2014-09-12 08:54:52 +03:00
Dmitriy Zaporozhets 3704e146ba Merge pull request #7738 from dblessing/serialize_migration_fix
Fix serialize migration
2014-09-12 08:49:46 +03:00
Robert Schilling 37a274a568 update tags count if tag gets deleted 2014-09-12 07:35:57 +02:00
Robert Schilling 8321a4d41f Remove duplicated labels step 2014-09-12 07:22:30 +02:00
Drew Blessing 09cdd94322 Fix serialize migration. Fixes #7734 2014-09-11 18:41:03 -05:00
Robert Schilling 233d89a9e7 Disable buttons if required forms are empty 2014-09-11 19:48:02 +02:00
Robert Schilling 0d5958c729 Close Zen mode by ESC, foward/backward 2014-09-11 19:24:51 +02:00
Robert Schilling 58c0a4f5cf Implement zen mode for issues/MRs/notes
Close Zen mode by ESC, foward/backward
2014-09-11 19:24:51 +02:00
Robert Schilling 6c9cb565f1 Merge pull request #7733 from bbodenmiller/patch-12
update grant command to match how mysql shows
2014-09-11 18:34:41 +02:00
Dmitriy Zaporozhets 80174c16d6 Merge branch 'feature-oauth-refactoring' into 'master'
Feature oauth refactoring

Only use class methods when needed. In addition, make a proper extension of Gitlab::Oauth::User.

See merge request !1062
2014-09-11 13:33:06 +00:00
Dmitriy Zaporozhets 699ffeb878 Merge branch 'clickable-labels' into 'master'
Clickable labels

When I open issue with label `Ready for Merge` I usually want to see more issues with this label. I should visit project issues page and click on such label to see issues filtered. With this MR labels are clickable so you can get in one click from Issue show page to all issues with same labels

See merge request !1085
2014-09-11 13:02:14 +00:00
Dmitriy Zaporozhets 5913f74446 Clickable labels feature test
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-09-11 14:31:19 +03:00
Dmitriy Zaporozhets 350f557479 Make labels clickable
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-09-11 14:18:00 +03:00
Dmitriy Zaporozhets 412780cc60 Modified Gemfile.lock
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-09-11 14:12:20 +03:00
Jan-Willem van der Meer 2c047642f5 Update Gemfile.lock 2014-09-11 12:59:42 +02:00
Jan-Willem van der Meer bf0de1a500 Merge remote-tracking branch 'origin/master' into feature-oauth-refactoring 2014-09-11 11:46:08 +02:00
Ben Bodenmiller 7a6857adfb update grant command to match how mysql shows
When looking up the granted permissions for users in MySQL using `show grants for 'git'@'localhost';` it shows the permissions in this order regardless of how you enter them. Changing so that comparing your actual permissions vs. what installation guide says is easier.
2014-09-11 01:43:00 -07:00
Dmitriy Zaporozhets 78ec7d9c9d Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2014-09-11 11:22:33 +03:00
Dmitriy Zaporozhets 745f262c16 Merge branch 'root_password_configurable' into 'master'
Root password configurable through environmental variable

Fixes #1522

See merge request !1084
2014-09-11 08:22:06 +00:00
Marin Jankovski 09e64ae605 Add an option to supply root password through an environmental variable. 2014-09-11 10:06:56 +02:00
Dmitriy Zaporozhets 17fd28468e Merge branch 'project-destroy-redirect' into 'master'
Redirect users to Projects Admin Page after removing a project

Fixes issue #543 by redirecting the user to "admin_projects_path" and displaying the flash alert "Project removed."

See merge request !178
2014-09-11 06:45:52 +00:00
Dmitriy Zaporozhets d7ab859b91 Merge pull request #7728 from bbodenmiller/patch-7
cleanup MySQL doc wording
2014-09-11 09:24:26 +03:00
Dmitriy Zaporozhets 59187157b1 Merge pull request #7730 from bbodenmiller/patch-12
url -> URL
2014-09-11 09:24:11 +03:00