home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-22 19:16:39 +10:00
Code Issues Packages Projects Releases Wiki Activity
14,039 Commits 48 Branches 340 Tags
1343b2dfac288eb60d536cc3d1a94de1eb178b51
Commit Graph
14039 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Ben Bodenmiller f818218359 add current sign-in date 
add current sign-in date to admin section profile view
 2014-08-24 23:52:31 -07:00
Ben Bodenmiller 92160789aa add sign-in count 
add sign-in count to admin section profile view
 2014-08-24 23:47:19 -07: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
johannes b5481afd73 Use a ? after the $request_uri to perform a valid Redirect while cloning. 
fixes #6203

before:

❯ curl -I http://gitlab/namespace/repo.git/info/refs?service=git-upload-pack
HTTP/1.1 301 Moved Permanently
Server: nginx
Date: Sat, 26 Jul 2014 18:20:27 GMT
Content-Type: text/html
Content-Length: 178
Connection: keep-alive
Location: https://gitlab/namespace/repo.git/info/refs?service=git-upload-pack?service=git-upload-pack

after:

❯ curl -I http://gitlab/namespace/repo.git/info/refs\?service=git-upload-pack
HTTP/1.1 301 Moved Permanently
Server: nginx
Date: Sat, 26 Jul 2014 18:23:54 GMT
Content-Type: text/html
Content-Length: 178
Connection: keep-alive
Location: https://gitlab/namespace/repo.git/info/refs?service=git-upload-pack

[ci skip]
 2014-08-23 08:36:25 +02: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 dd875243e9 Update highlight.js to 8.2, fixes #519 2014-08-23 02:19:17 +02: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
Sytse Sijbrandij 47b5b3d5fa Tar before omnibus build, we all have master access on dev, don't forget to update installation.md 2014-08-22 21:46:12 +02:00
Sytse Sijbrandij 6a0ea920a5 Merge branch 'fix_installation_version' into 'master' 
Fix installation version, we have 7.2 now

Change the branch name of cloning source to 7.2!! This also needs to be cherry picked to 7.2 stable branch

/cc @JobV @jacobvosmaer @marin

ps: unfortunately, there is mo 🤘 gemoji :(

See merge request !174
 2014-08-22 19:31:51 +00:00
Robert Schilling 5418c61747 We have 7.2 now 🤘 2014-08-22 20:36:03 +02:00
Sytse Sijbrandij 06fade7545 Simplify the description of single hash lines based on comments of Ben Bodenmiller. 2014-08-22 19:10:07 +02:00
Vinnie Okada 8ed7391cb0 Handle undefined text area values 
Check to see if a text area's `val` is defined before trying to call
`replace()` on it.
 2014-08-22 10:40:25 -05:00
Job van der Voort 230c52f76a update upgrader documentation to mention dependencies 2014-08-22 16:33:36 +02:00
Jacob Vosmaer 3dbd8d2293 Always set the origin remote in satellite actions 
This prevents issues with satellites containing outdated origin remotes
after administrators move the git repositories directory.
 2014-08-22 14:32:04 +02:00
Christian Sarazin 4a14b5900b Added AsciiDoc support and changed to singlequotes 
extension to https://github.com/gitlabhq/gitlabhq/pull/7568
 2014-08-22 12:33:58 +02:00
Jacob Vosmaer abb415276f Add 'unsubscribes' to the paths blacklist 
GitLab EE has a /unsubscribes/ route.
 2014-08-22 10:25:13 +02:00
Jacob Vosmaer e4f75fd262 Use one word per line in Gitlab::Blacklist 2014-08-22 10:21:04 +02:00
Jacob Vosmaer abda2dab43 Merge branch 'rack_attack/unsubscribes' into 'master' 
Protect unsubscribe path

See merge request !1033
 2014-08-22 08:00:12 +00:00
Jacob Vosmaer b70606287b Create one big regular expresion for Rack::Attack 2014-08-22 09:56:39 +02:00
Marin JankovskiandJacob Vosmaer 52e903e99f Change rack attack example. 2014-08-22 09:56:39 +02:00
Jacob Vosmaer e328668f29 Merge branch 'backticks-cause-quote' into 'master' 
Backticks cause quote

See merge request !704
 2014-08-21 15:30:35 +00:00
Sytse Sijbrandij eea595971f Remove backticks in markdown links that cause ugly code blocks in GitLab. 2014-08-21 17:25:14 +02:00
Sytse Sijbrandij a83451a5c0 Merge branch 'doc/memory_recommendations' into 'master' 
Swap is required on servers with 1GB RAM

See merge request !1032
 2014-08-21 15:15:31 +00:00