home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-29 06:26:07 +10:00
Code Issues Packages Projects Releases Wiki Activity
22,224 Commits 48 Branches 340 Tags
d453b24aca178fe74dd673b94de50d1f14fb651a
Commit Graph
22224 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitriy Zaporozhets f7c948223d Fix access to attachments uploaded with 'Choose file' button for public 
access
 2015-02-24 09:08:34 -08:00
Sabba Petri ea31726781 Added a margin and a couple styles 
Added a background, rather than an outline, which should reduce
clutter on the screen.
 2015-02-24 09:06:59 -08:00
Douwe Maan 1bf9fa8c7f Exclude forks from profile contributions list. 2015-02-24 16:28:23 +01:00
Douwe Maan 769d1ce64b Fix spec. 2015-02-24 16:10:55 +01:00
Douwe Maan 46bcf40b2c Add ".org" back to Gitorious mentions. 2015-02-24 15:08:42 +01:00
Douwe Maan fcd3e626b0 Move CHANGELOG entry. 2015-02-24 15:07:25 +01:00
Douwe Maan 16c767814a Re-enable rescuing from Bitbucket OAuth errors. 2015-02-24 15:07:25 +01:00
Douwe Maan bc80efb1fd Bring Gitorious import page in line with others. 2015-02-24 15:07:25 +01:00
Douwe Maan 20691df230 Add Bitbucket integration docs. 2015-02-24 15:07:25 +01:00
Douwe Maan 3fde1dce1f Satisfy Rubocop. 2015-02-24 15:07:25 +01:00
Douwe Maan a938b3eeb4 Link to original repo on import status pages. 2015-02-24 15:07:24 +01:00
Douwe Maan 6979b3afd5 Delete deploy key from Bitbucket after importing. 2015-02-24 15:07:24 +01:00
Douwe Maan f2b37de54b Fix specs. 2015-02-24 15:07:24 +01:00
Douwe Maan 448817c4de Load public key in initializer. 2015-02-24 15:07:24 +01:00
Douwe Maan ad6d623234 Add Bitbucket importer. 2015-02-24 15:07:24 +01:00
Douwe Maan 0283fff591 Merge branch 'master' into extend_markdown_upload 
# Conflicts:
#	app/views/projects/issues/_form.html.haml
#	app/views/projects/merge_requests/_form.html.haml
#	app/views/projects/merge_requests/_new_submit.html.haml
#	app/views/projects/milestones/_form.html.haml
#	app/views/projects/notes/_form.html.haml
#	app/views/projects/wikis/_form.html.haml
#	config/routes.rb
#	spec/controllers/projects_controller_spec.rb
 2015-02-24 14:54:39 +01:00
Robert Schilling b4fd2602be Merge pull request #8854 from Bugagazavr/patch-3 
Update Changelog
 2015-02-24 13:55:46 +01:00
Bugagazavr 1e1a95f5c3 Update Changelog 2015-02-24 15:12:25 +03:00
kfei 9338c63252 Gracefully shutdown services in Docker container 
The problem is `docker stop` only sends SIGTERM to the PID 1 inside the
container, and the PID 1 (`/bin/sh -c ...`) does not take care of
signals. Hence the services (e.g., postgresql, redis, sidekiq, etc)
never have chances to graceful shutdown. Docker just kills the container
after its 10 seconds timeout by default.

What this commit does:

1) Add a wrapper as the default executable of Docker container. Which
   starts services through `runit`, reconfigure Gitlab by `gitlab-ctl`
   and gracefully shutdown all services when a SIGTERM is received.
2) Create an `assets` directory for assets.
3) Add `.dockerignore` file.

Now you'll see the following log messages after `docker stop`:
```
SIGTERM signal received, try to gracefully shutdown all services...
ok: down: logrotate: 1s, normally up
ok: down: nginx: 0s, normally up
ok: down: postgresql: 1s, normally up
ok: down: redis: 0s, normally up
ok: down: sidekiq: 0s, normally up
ok: down: unicorn: 0s, normally up
```

Signed-off-by: kfei <kfei@kfei.net>
 2015-02-24 19:20:57 +08:00
Valery Sizov 63c4f3ca76 update gitlab-grack to 2.0.0.rc2 2015-02-24 13:20:04 +02:00
Robert Schilling c8e9eac25f Merge pull request #8852 from niosus/patch-1 
typo fixed
 2015-02-24 11:15:46 +01:00
Igor Bogoslavskyi 51b18fe6f6 typo fixed 
fixed a typo in an url to gitlab-ssl. Now it does not return the 404 error
 2015-02-24 10:50:18 +01:00
Valery Sizov 3177693c6f WebEditor: save to new branch: spinach 2015-02-24 11:43:20 +02:00
Valery Sizov 71a844cdae Web Editor: save to new branch 2015-02-24 11:43:20 +02:00
Marcin Kulik f6add983d3 Use proper Gitorious icons on import pages 2015-02-24 09:42:07 +00:00
Marin Jankovski 7561b1c2a4 Merge branch 'profile_tooltip_addition' into 'master' 
Added Profile tooltip

For consistency sake, the profile in the navbar has a tooltip.

Fixes #2007

See merge request !1572
 2015-02-24 08:06:22 +00:00
Dmitriy Zaporozhets 5e2098feb4 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-02-23 23:50:18 -08:00
Dmitriy Zaporozhets 93447c4b14 Merge pull request #8760 from yglukhov/diff-sticky-headers 
Diff headers made sticky
 2015-02-23 23:50:07 -08:00
Dmitriy Zaporozhets 8461c4b4d3 Merge pull request #8180 from Bugagazavr/mr_update 
Trigger merge request hook when source updated
 2015-02-23 23:48:46 -08:00
Dmitriy Zaporozhets 9f9a79abe0 Merge pull request #8782 from jvanbaarsen/no-test-class-caching 
Don't cache classes in tests
 2015-02-23 23:47:23 -08:00
Dmitriy Zaporozhets 4932accb3f Merge pull request #8783 from jvanbaarsen/spring-update 
Updated spring
 2015-02-23 23:46:53 -08:00
Dmitriy Zaporozhets 2f8e6311e2 Merge pull request #8798 from jirutka/update-charlock_holmes 
Update charlock_holmes to 0.7.3
 2015-02-23 23:46:33 -08:00
Dmitriy Zaporozhets 8b9348e80d Merge branch 'improve-sidebar' into 'master' 
Improve sidebar menu for project settings

See merge request !1582
 2015-02-24 07:46:03 +00:00
Dmitriy Zaporozhets 894f73783c Merge branch 'bump-gitlab-shell-2-5-4' into 'master' 
Bump gitlab-shell to 2.5.4

For #2042

See merge request !1584
 2015-02-24 07:19:13 +00:00
Marin Jankovski 2feaa69cd5 Update version of gitlab-shell in the installation and update documentation. 2015-02-23 23:10:35 -08:00
Dmitriy Zaporozhets bd6550a512 Bump gitlab-shell to 2.5.4 2015-02-23 22:54:32 -08:00
Marin Jankovski ac918a5cdb Merge branch 'ldap-need-no-password' into 'master' 
LDAP users don't need to set a password to Git over HTTP.

Fixes https://github.com/gitlabhq/gitlabhq/issues/8846.

See merge request !1575
 2015-02-24 06:52:29 +00:00
Stan Hu e363f2e675 Fix merge request URL passed to Webhooks. 
Previously the symbol "url" in the object_attributes hash would always be nil.
 2015-02-24 06:51:24 +00:00
Dmitriy Zaporozhets 17296b932b Merge branch 'fix_url_links_for_gitlab_issue_tracker' into 'master' 
Using gitlab url to build links for gitlab issue tracker and add a spec.

Fix for https://gitlab.com/gitlab-org/gitlab-ce/issues/1107

This needs to go to master as the paths changed since rails upgrade

Fix for stable branch is in https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/1574/

See merge request !1573
 2015-02-24 05:50:32 +00:00
Marin Jankovski 24c8381de2 Merge branch 'improve-services-migration' into 'master' 
Make services migration more reliable

Fix for #2045 . I did not use SQL because its hard to convert SQL fields into json with interpolation and without errors. SO I just improved current migration with next:

* skip validation to prevent exception because of new `template` field in validation
* check column for existance before adding them.
  It should allow people who already failed this migration to re-run ti
* select objects with 500 batch size for better memory usage

Tested on migration from 7.0 to 7.9.0.pre

See merge request !1581
 2015-02-24 05:30:25 +00:00
Dmitriy Zaporozhets 14117c23af Merge branch 'fix-avatar-access' into 'master' 
Allow non authenticated access to avatars

For #2047

cc @douwe

See merge request !1583
 2015-02-24 05:29:38 +00:00
Dmitriy Zaporozhets 64ca07c3b9 Better readme title 2015-02-23 21:27:41 -08:00
Douwe MaanandMarin Jankovski c9829146f8 LDAP users don't need to set a password to Git over HTTP. 2015-02-23 20:04:18 -08:00
Dmitriy Zaporozhets 897a2de54c Allow non authenticated access to avatars 2015-02-23 19:35:42 -08:00
Dmitriy Zaporozhets 12589d3390 Improve sidebar menu for project settings 2015-02-23 18:43:39 -08:00
Marin Jankovski b0dfe434c6 Using gitlab url to build links for gitlab issue tracker and add a spec. Fix rubocop warnings in path. 2015-02-23 18:43:26 -08:00
Dmitriy Zaporozhets a4118ca445 Merge branch 'warn-against-stable-branch-changelog' into 'master' 
Ensure that people don't view the changelog on the stable branch because we don't update that one.

See merge request !1568
 2015-02-24 02:18:08 +00:00
Dmitriy Zaporozhets c87c1cb3b9 Merge branch 'api-empty-commit' into 'master' 
Improve error messages when file editing fails

Give more specific errors in API responses and web UI flash messages when a file update fails.  See #1479.

Instead of returning false from `Gitlab::Satellite::Files::EditFileAction#commit!` when a `Grit::Git::CommandFailed` error is raised, now `#commit!` raises a different error depending on whether the failure happened during checkout, commit, or push.

@dzaporozhets Please let me know if you want to change the HTTP status codes or the error messages in `Files::UpdateService`

cc @sytse

See merge request !1569
 2015-02-24 02:17:23 +00:00
Dmitriy Zaporozhets 8601c502e8 Merge branch 'fix-commit-zen-mode' into 'master' 
Fix ZenMode on commit show and milestone edit pages.

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/1110

See merge request !1557
 2015-02-24 02:02:44 +00:00
Dmitriy Zaporozhets 0f6221e736 Make services migration more reliable 2015-02-23 17:56:05 -08:00