home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-19 17:46:07 +10:00
Code Issues Packages Projects Releases Wiki Activity
11,181 Commits 48 Branches 340 Tags
eabbb7beb893833ff7d1ddc6f850e466fbcd9384
Commit Graph
11181 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitriy Zaporozhets eabbb7beb8 Merge branch 'session_timeout' into 'master' 
Expire Rack sessions after 1 week

This has the side effect of preventing Redis from clogging up with old sessions.

See merge request !1042
 2014-08-26 16:01:01 +00:00
Jacob Vosmaer 9b75d99d72 Merge branch 'release-doc-improvements' into 'master' 
Release doc improvements

Fixes #1527

@jacobvosmaer According to the docs the RC should be deployed on .com before being announced via twitter, so I think this is already covered in the docs.

/cc @all

See merge request !1041
 2014-08-26 13:51:54 +00:00
Sytse Sijbrandij 45d887ad1c Merge branch 'master' into release-doc-improvements 
Conflicts:
	doc/release/monthly.md
 2014-08-26 15:45:58 +02:00
Jacob Vosmaer 048adf7b62 Merge branch 'release-order-in-reality' into 'master' 
Release order in reality

/cc @all

See merge request !1037
 2014-08-26 13:31:19 +00:00
Dmitriy Zaporozhets 2c7e08745b Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-08-26 12:37:51 +03:00
Dmitriy Zaporozhets 24ecb6d467 Merge branch 'notes-timeline' into 'master' 
Notes timeline

Fixes #1496

![Screenshot 2014-08-26 09.55.27](https://dev.gitlab.org/uploads/gitlab/gitlabhq/07f0eafa78/Screenshot_2014-08-26_09.55.27.png)

See merge request !1023
 2014-08-26 09:37:36 +00:00
Jacob Vosmaer 99b81be887 Expire Rack sessions after 1 week 2014-08-26 10:58:16 +02:00
Dmitriy Zaporozhets 04a87cb5c4 Round avatars for notes timeline 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-26 11:30:15 +03:00
Dmitriy Zaporozhets a7dcf690fb Fix discussion style for timeline 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-26 11:30:14 +03:00
Dmitriy Zaporozhets 207d798dc4 Basic UI implememntation of comments in timeline style 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-26 11:30:14 +03:00
Sytse Sijbrandij 099e17038f Add note about testing the migrations. 2014-08-26 10:20:55 +02:00
Sytse Sijbrandij 075e5eeccb Change the version before creating the stable branch. 2014-08-26 10:04:57 +02:00
Robert Schilling 23d4fcbd2c Merge pull request #7600 from Razer6/doc/pkg-confif_dependency 
Add pkg-config as required dependency for rugged
 2014-08-26 06:14:49 +02:00
Robert Schilling 1646009724 Add pkg-config as required dependency for rugged 2014-08-26 06:10:53 +02:00
Dmitriy Zaporozhets b5cc813612 Merge branch 'drop_post_recieve_jobs' into 'master' 
Add rake task to drop a project's PostReceive jobs

If a user pushes so many branches/tags to a project that Sidekiq
gets clogged, you can use this script to drop _all_ PostReceive
jobs for a given project.

See merge request !1030
 2014-08-25 18:55:13 +00:00
Dmitriy Zaporozhets 5087f36d23 Merge branch 'annotate' into 'master' 
Annotate

See merge request !1040
 2014-08-25 10:33:53 +00:00
Dmitriy Zaporozhets 3fd929fd76 Merge branch 'fork-star-bug' into 'master' 
Fork star bug

Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/523

See merge request !1039
 2014-08-25 10:33:31 +00:00
Dmitriy Zaporozhets 92deb451da Annotate models 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-25 12:25:02 +03:00
Dmitriy Zaporozhets 2e497d8438 Prevent project stars duplication when fork project 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-08-25 12:19:52 +03:00
Sytse Sijbrandij 1a9b2a47a1 Merge pull request #7594 from bbodenmiller/patch-3 
Monthly active users -> Active users last 30 days
 2014-08-25 09:43:18 +02:00
Ben Bodenmiller c1eee5968f Monthly active users -> Active users last 30 days 
Clarify what `Monthly active users` means by changing to `Active users last 30 days`.
 2014-08-24 22:42:46 -07:00
Robert Schilling a25e6f725a Merge pull request #7593 from bbodenmiller/patch-3 
remove extra cd's to GitLab installation folder
 2014-08-24 22:40:49 +02:00
Ben Bodenmiller c8c2b49dfb remove extra cd's to GitLab installation folder 2014-08-24 13:31:25 -07:00
Sytse Sijbrandij 8b1fe5f4ff Merge pull request #7569 from offlinehoster/patch-2 
Added AsciiDoc support and changed to singlequotes
 2014-08-24 11:57:54 +02:00
Robert Schilling a820a15dc0 Merge pull request #7582 from bbodenmiller/patch-5 
[Documentation] more cleanup installation guide formatting
 2014-08-24 10:59:45 +02:00
Robert Schilling d66da1c35b Merge pull request #7575 from bbodenmiller/patch-3 
[Documentation] add nginx test
 2014-08-24 10:57:46 +02:00
Ben Bodenmiller 5ef4b3fb53 improve formatting 
* fix code blocks
* Make capitalization of titles consistent - missed some in
https://github.com/gitlabhq/gitlabhq/pull/7576
 2014-08-23 16:53:14 -07:00
Ben Bodenmiller 1b1ca3ee56 add Nginx test 2014-08-23 16:48:04 -07:00
Dmitriy Zaporozhets 0cfa8aaf79 Merge pull request #7518 from jvanbaarsen/snippet-charset-fix 
Set charset encoding to UTF-8 for snippets
 2014-08-23 23:51:13 +03:00
Dmitriy Zaporozhets eddfdc9edd Merge pull request #7558 from bbodenmiller/patch-4 
change X-Frame-Options to SAMEORIGIN for nginx SSL config
 2014-08-23 23:50:09 +03:00
Dmitriy Zaporozhets 3cbacad86c Merge branch 'blacklist/unsubscribes' into 'master' 
Add 'unsubscribes' to the paths blacklist

This is to prevent issues with the admin email feature in GitLab EE.

See merge request !1034
 2014-08-23 20:47:40 +00:00
Dmitriy Zaporozhets fcbf9841c7 Merge branch 'always_set_satellite_origin' into 'master' 
Always set satellite origin

See merge request !1036
 2014-08-23 20:46:36 +00:00
Dmitriy Zaporozhets 9b1bef54de Merge branch 'import_postgres_user' into 'master' 
Import the database as the `git` user

See merge request !762
 2014-08-23 20:44:54 +00:00
Dmitriy Zaporozhets b0c96ec5a3 Merge branch 'cleaner-login' into 'master' 
Cleaner UI for login and signup pages

![Screenshot 2014-08-15 17.51.52](https://dev.gitlab.org/uploads/dzaporozhets/gitlabhq/fc8bf3c4a4/Screenshot_2014-08-15_17.51.52.png)
![Screenshot 2014-08-15 17.52.39](https://dev.gitlab.org/uploads/dzaporozhets/gitlabhq/72706f55b0/Screenshot_2014-08-15_17.52.39.png)
![Screenshot 2014-08-15 17.51.33](https://dev.gitlab.org/uploads/dzaporozhets/gitlabhq/c46f972944/Screenshot_2014-08-15_17.51.33.png)

See merge request !1022
 2014-08-23 20:44:07 +00:00
Sytse Sijbrandij 0718d877b9 Merge pull request #7578 from bbodenmiller/patch-8 
Unify Nginx files to match as closely as possible
 2014-08-23 13:42:14 +02:00
Robert Schilling 9bdd30f422 Remove outdated 6.0 to 7.1 update guide 2014-08-23 12:16:18 +02:00
Robert Schilling 668c7d517a 7.3 started 2014-08-23 10:59:03 +02:00
Robert Schilling 33431c3e7d Merge pull request #7585 from bbodenmiller/patch-11 
clarify which configs should be updated
 2014-08-23 10:52:04 +02:00
Robert Schilling 9900c5bf81 Merge pull request #7584 from bbodenmiller/patch-9 
remove prerelease note from 6.0 to 7.2 guide
 2014-08-23 10:50:47 +02:00
Ben Bodenmiller aef3a5bf41 clarify which configs should be updated 2014-08-23 01:43:26 -07:00
Ben Bodenmiller 668e8aacfb remove prerelease note from 6.0 to 7.2 guide 2014-08-23 01:13:22 -07:00
Ben Bodenmiller 3663354cb9 unify nginx config files 2014-08-23 01:08:12 -07:00
Ben Bodenmiller a3953a46f4 change X-Frame-Options to SAMEORIGIN 
needed to allow sidekiq to load on background jobs tab
 2014-08-23 01:05:31 -07:00
Robert Schilling 30ea264b3b Merge pull request #7576 from bbodenmiller/patch-5 
[Documentation] cleanup installation guide formatting
 2014-08-23 02:33:44 +02:00
Robert Schilling 9c416ac2ff Merge pull request #7581 from bbodenmiller/patch-9 
make configuration comment spacing consistent
 2014-08-23 02:29:08 +02:00
Ben Bodenmiller 0a0cbe1274 make configuration comment spacing consistent 2014-08-22 17:20:31 -07:00
Robert Schilling 073cbc1c66 Merge pull request #7577 from bbodenmiller/patch-7 
[Documentation] GitLab 7.2 requires GitLab shell 1.9.7
 2014-08-22 23:08:09 +02:00
Ben Bodenmiller 40af6f9c23 gitlab 7.2 requires gitlab shell 1.9.7 2014-08-22 13:23:44 -07:00
Ben Bodenmiller e61b491ae1 cleanup installation guide formatting 
* Fix some formatting issues
* Make capitalization of titles consistent
* Update image that shows how to select branch
 2014-08-22 13:18:40 -07:00
Sytse Sijbrandij 18ec2f93a6 Don't forget to cherry pick into stable. 2014-08-22 21:49:39 +02:00