home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-20 10:06:04 +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
Jacob Vosmaer 4a389e7616 Another comment fix 2014-12-16 12:46:55 +01:00
Jacob Vosmaer 49f4fe8c6e Fix copy-paste error in comment 2014-12-16 12:43:38 +01:00
Jacob Vosmaer 764eaedf81 Improve Redis::Store monkey-patch robustness 2014-12-16 12:38:44 +01:00
Dmitriy Zaporozhets 8d71e4e0d0 Merge branch 'doc/sidekiq_memory_killer' into 'master' 
Add documentation for the Sidekiq MemoryKiller

We already merged the code, and we are already using it on gitlab.com. This MR adds documentation.

See merge request !1325
 2014-12-16 11:23:52 +00:00
Patricio Cano f023db2b47 Merge branch 'update_changelog_7_6' into 'master' 
Update changelog 7.6

See merge request !1327
 2014-12-15 19:45:28 +00:00
Drew Blessing f06f69b9da Add theme type css class 2014-12-15 13:21:26 -06:00
Valery Sizov 842ac35ae4 Update changelog 2014-12-15 20:22:18 +02:00
Dmitriy Zaporozhets 7b71a9e221 Add icons to project sidenav 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-15 20:00:44 +02:00
Jacob Vosmaer 62ea02740d Block Git HTTP Basic Auth after 10 failed attempts 2014-12-15 18:57:42 +01:00
Dmitriy Zaporozhets 5f797be0e8 Mobile UI fixes for sidebar nav 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-15 18:06:03 +02:00
Dmitriy Zaporozhets 5f63c00598 Fix graph and settings highlight 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-15 17:46:36 +02:00
Dmitriy Zaporozhets a64d0f7917 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2014-12-15 17:25:50 +02:00
Dmitriy Zaporozhets ee54e56f7d Merge branch 'kerberos_dependency' into 'master' 
Kerberos dependency

See merge request !1324
 2014-12-15 15:17:37 +00:00
Dmitriy Zaporozhets f8ea016486 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-12-15 17:06:11 +02:00
Dmitriy Zaporozhets 14ab0228a8 Merge branch 'fix-note-update' into 'master' 
Fix note update

In some strange cases Ruby thinks `system` is not AR field but
Kernel.system call and raises exception during save. It should prevent
this random wierd behaviour.

Exception log:

```
ArgumentError (wrong number of arguments (0 for 1+)):
  app/models/note.rb:505:in `system'
  app/models/note.rb:505:in `editable?'
  app/controllers/projects/notes_controller.rb:33:in `update'
```

See merge request !1326
 2014-12-15 15:05:22 +00:00
Jacob Vosmaer 7512016d51 Update rack-attack to 4.2.0 
If we are going to monkey-patch something it might as well be the
latest version.
 2014-12-15 15:59:16 +01:00
Dmitriy Zaporozhets 4ab728bfe8 Fix random Argument error when update note 
In some strange cases Ruby thinks `system` is not AR field but
Kernel.system call and raises exception during save. It should prevent
this random wierd behaviour

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-15 16:31:23 +02:00
Jacob Vosmaer d117927131 Add link to 'operations' README 2014-12-15 15:17:10 +01:00
skv-headless c4a56797a4 transfer error handler 2014-12-15 16:10:56 +03:00
Jacob Vosmaer e61e7a17b4 Remove unfinished file with the wrong name 2014-12-15 13:44:47 +01:00
Jacob Vosmaer 71789468d3 Add documentation for the Sidekiq MemoryKiller 2014-12-15 13:43:36 +01:00
Christian E. Hopps 0ed4ae7295 Add []s around user@ipv6addr (e.g., "[git@::1]/repo.git") 2014-12-15 07:02:07 -05:00
Valery Sizov 83de96ae3a add kerberos dependency 2014-12-15 14:01:55 +02:00
Sytse Sijbrandij d37bdd0ccd Merge pull request #8446 from jvanbaarsen/added-process-for-green-tests 
Added process for green tests
 2014-12-15 10:52:08 +01:00
Jeroen van Baarsen 5ad463e0e8 Rephrase of the text 
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
 2014-12-15 10:41:30 +01:00
Dmitriy Zaporozhets 19865b7cfd Merge pull request #8448 from jvanbaarsen/fixed-already-defined-messages 
Fixed a lot of already defined notices
 2014-12-15 11:14:31 +02:00
Sytse Sijbrandij 7fcd0e8367 Require the ruby racer only in production since installing it on dev machines can cause a lot of problems. Hat tip to Jeroen van Baarsen 2014-12-15 09:44:29 +01:00
Sytse Sijbrandij 9fc739e5d0 Merge pull request #8447 from jvanbaarsen/added-code-of-conduct 
Added Code of Conduct
 2014-12-15 09:34:54 +01:00
Chulki Lee d6840542a7 ruby 2.1.5 in .ruby-version 2014-12-14 12:45:49 -08:00
Jeroen van Baarsen be206a5142 Merge pull request #8410 from tricknotes/add-webhook-doc-for-tag-event 
Add missing webhook doc for tag event
 2014-12-14 18:35:31 +01:00
Jeroen van Baarsen 6b1f2e4339 Added Code of Conduct 
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
 2014-12-14 18:34:23 +01:00
Jeroen van Baarsen ba4fe47606 Merge pull request #8374 from bbodenmiller/7-5-update-fix 
remove extra upgrade details, add missing config
 2014-12-14 18:31:37 +01:00
Ryunosuke SATO d11e048d7f Add missing webhook doc for tag event 2014-12-14 23:47:13 +09:00
Jeroen van Baarsen 4eb3c47d4e Fixed a lot of already defined notices 
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
 2014-12-14 15:13:09 +01:00
Jeroen van Baarsen ed7b3f84ae Merge pull request #8429 from zertrin/fix-typo-in-docker-readme-1 
Fix typo in the README.md for docker
 2014-12-14 14:49:48 +01:00
Jeroen van Baarsen 0cfca15292 Added process for green tests 
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
 2014-12-13 20:09:26 +01:00
Jeroen van Baarsen 3615b4de24 Merge pull request #8359 from bbodenmiller/patch-1 
add details on backing up your SSH host keys
 2014-12-13 17:24:56 +01:00
Dmitriy Zaporozhets 6ef75dc778 Style app logo for sidenav 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-12 22:13:59 +02:00
Dmitriy Zaporozhets 2f13d4daa3 Implement sidebar navigation for project area 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-12 21:49:51 +02:00
Dmitriy Zaporozhets 2497273030 Update CHANGELOG with snippet validation change 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-12 16:35:05 +02:00
Dmitriy Zaporozhets ff65e55694 Merge branch 'sanitize-snippet-file-name' into 'master' 
Validate and sanitize snippet file name

Fixes #1816

See merge request !1322
 2014-12-12 14:31:51 +00:00
Dmitriy Zaporozhets bfebab1c10 Fix snippet factory 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-12 15:55:06 +02:00
Dmitriy Zaporozhets 118bd7178b Sanitize snippet file name in raw headers 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-12 13:28:48 +02:00
Dmitriy Zaporozhets f28a12a559 Add strict validation to snippet file names 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-12 13:15:42 +02:00
Jacob Vosmaer b205db6300 Merge branch 'fix_shell_commands_in_shell_install' into 'master' 
Fix shell commands in shell install

Fixes #1610

See merge request !1320
 2014-12-12 11:08:52 +00:00
Marin Jankovski e5951cf4ae Don't forget to splat. 2014-12-12 10:42:55 +01:00
Marin Jankovski bd43cf0653 Use system where only return result is needed. 2014-12-12 10:17:07 +01:00
Dmitriy Zaporozhets 9a3ae331ad Merge branch 'dropdown_icon_not_clickable' into 'master' 
Dropdown icon not clickable

Fixes #1642 by using `pointer-events` property supported by [modern browsers](http://caniuse.com/#search=pointer-events)

See merge request !1319
 2014-12-11 15:02:01 +00:00
Dmitriy Zaporozhets 65b858a776 Merge branch 'show_files_with_diff_name' into 'master' 
Show files named diff

Fixes #1749

See merge request !1318
 2014-12-11 14:07:12 +00:00
Sytse Sijbrandij feb7c2bcce Merge branch 'contributing-md-file-read' into 'master' 
Add an extra reference to the 'shell commands' guide

The 'shell commands' guide now also has tips on opening/reading files and handling paths.

See merge request !1321
 2014-12-11 12:44:36 +00:00