home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-24 12:06:11 +10:00
Code Issues Packages Projects Releases Wiki Activity
5,354 Commits 48 Branches 340 Tags
01a8f3886e0071bc65e4516f3b3c949dfd33a55e
Commit Graph
5354 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitriy Zaporozhets 01a8f3886e Merge pull request #3970 from jacargentina/notes-highlight 
Style target notes for easy visual identification
 2013-05-29 23:52:12 -07:00
Dmitriy Zaporozhets a52936f36a Renames resque resource to background_jobs 2013-05-30 09:46:28 +03:00
Dmitriy Zaporozhets 84e4cfc6bb Prevent mailer error when note with code highlight 2013-05-30 09:46:02 +03:00
Dmitriy Zaporozhets abea712526 Merge pull request #3980 from hiroponz/fix-not-displaying-slash-of-namespace 
Fix not displaying a slash after namespace.
 2013-05-29 23:29:34 -07:00
Dmitriy Zaporozhets c698bc7d9e Merge pull request #4037 from mitchty/master 
Remove user directory path assumptions
 2013-05-29 23:28:17 -07:00
Dmitriy Zaporozhets cd5685ca8c Merge pull request #4115 from bke-drewb/apidocs 
Update api docs and remove old attribute from User entity.
 2013-05-29 23:25:40 -07:00
Dmitriy Zaporozhets 56ddf93f8e Merge pull request #4101 from bassrock/master 
Update suggestion for Check.rake
 2013-05-29 23:24:56 -07:00
Dmitriy Zaporozhets 962ccce3d1 Merge pull request #4113 from peterlefanulumsdaine/master 
grammar fix in an error message (very minor change)
 2013-05-29 23:23:29 -07:00
Dmitriy Zaporozhets 88176dad56 Merge pull request #4130 from TrevorS/fix-update-docs-5.0-5.1 
adding update info regarding gitlab-shell config.yml (re: dashboard update problems)
 2013-05-29 23:17:29 -07:00
Trevor Strieber 8f50eb7467 adding update info regarding gitlab-shell config.yml 2013-05-29 15:03:54 -06:00
Dmitriy Zaporozhets 6393757707 Better styling for event pre block 2013-05-29 23:26:24 +03:00
Dmitriy Zaporozhets 73f9474b10 Fix dashboard event filter when navigate via turbolinks 2013-05-29 21:41:12 +03:00
Drew Blessing 07fd95f384 Update api docs and remove old attribute from User entity. 
The API docs incorrectly referenced a few attributes associated with users. The 'blocked' attribute has been replaced with 'state'. Also, 'dark_scheme' seems to no longer be available in the User model so it should be removed from the exposed attributes in the API User entity.

Add color scheme ID to API User entity
 2013-05-29 05:40:17 -05:00
Dmitriy Zaporozhets 6e96120337 Merge pull request #4098 from pguridi/jira 
Jira - Fixed Jira Issue tracker support
 2013-05-29 03:20:13 -07:00
Dmitriy Zaporozhets 04cc6dd67a Assign to me link on issue form 2013-05-29 13:16:30 +03:00
Dmitriy Zaporozhets 003f18c2a6 Merge branch 'spelling-error' of /home/git/repositories/gitlab/gitlabhq 2013-05-29 08:59:23 +00:00
Dmitriy Zaporozhets e79f757fdd Merge branch 'accurate-deploy-key-message' of /home/git/repositories/gitlab/gitlabhq 2013-05-29 08:57:48 +00:00
Sytse Sijbrandij 67a3dc4e74 Correct spelling error. 2013-05-29 09:41:17 +02:00
Sytse Sijbrandij 091c21e0e4 Improve accuracy of deploy key message. 2013-05-29 09:07:14 +02:00
Peter LeFanu Lumsdaine 6b4602a733 Grammar fix in error message for blocked login (in "application_controller.rb") 2013-05-28 14:48:51 -03:00
Dmitriy Zaporozhets 45f9cca9b3 Unbind document scroll on page:fetch to disable endlessScroll on pages where it is not used 2013-05-28 18:59:01 +03:00
Dmitriy Zaporozhets 98cf0ae338 Correct indentation in readme, fixed display of social accounts in profile 2013-05-28 18:00:44 +03:00
Dmitriy Zaporozhets 07aa6e5963 Warn users to change password after account was created 2013-05-28 17:37:23 +03:00
Dmitriy Zaporozhets e5e3e0d9e6 Version up to 5.3.0 2013-05-28 17:24:23 +03:00
Dmitriy Zaporozhets df67b25bc2 init.d: Ensure socket is removed before starting service 2013-05-28 17:09:01 +03:00
Yves Senn 1ed92561b2 Merge pull request #4093 from bbodenmiller/breaking-tests 
update pull request guidelines, allow for submitting of tests that expos...
 2013-05-28 00:14:29 -07:00
Pedro GuridiandPedro Guridi 5ec3129ea6 Changed regex to support Jira issue numbering format 
Jira issues numbering format are like: "PROJECT-1234".
Changed the regular expression to support Jira issues linking, in addition to the normal #123.

Added Jira Issue tracker configuration example
 2013-05-27 16:51:37 -03:00
bassrock 3db67ff09c Update check.rake 2013-05-27 13:30:54 -06:00
Dmitriy Zaporozhets 987b51b911 Fix 500 error on group.settings page 2013-05-27 21:02:42 +03:00
Dmitriy Zaporozhets 8b64df58b9 Merge pull request #4067 from bbodenmiller/patch-5 
add code comment about backing up folder when restoring
 2013-05-27 08:26:51 -07:00
Dmitriy Zaporozhets 9351a295c1 Up grape version. Fix issue with raw content being escaped 2013-05-27 17:14:47 +03:00
Dmitriy Zaporozhets e26d149cd8 Merge branch 'double-check-after-start' of /home/git/repositories/gitlab/gitlabhq 2013-05-27 12:47:20 +00:00
Dmitriy Zaporozhets 246989bcca more descriptive confirmation messages 2013-05-27 15:43:44 +03:00
Dmitriy Zaporozhets 8ab44f688f Merge pull request #4009 from hiroponz/use-default-cursor-on-network-graph 
Use default cursor on network graph.
 2013-05-27 05:18:59 -07:00
Dmitriy Zaporozhets 4caaea824c Merge branch 'dmedvinsky-add-defaults-create-group-team' 2013-05-27 15:17:36 +03:00
Dmitriy Zaporozhets ec1055076c Merge branch 'add-defaults-create-group-team' of https://github.com/dmedvinsky/gitlabhq into dmedvinsky-add-defaults-create-group-team 
Conflicts:
	config/gitlab.yml.example
 2013-05-27 15:17:06 +03:00
Dmitriy Zaporozhets 01d8c7d6dd Merge pull request #4000 from babatakao/fix_link_404 
Fix link 404.
 2013-05-27 05:12:21 -07:00
Dmitriy Zaporozhets d5d0c00e7f Merge branch 'former03-feature_teams_api' 2013-05-27 15:05:12 +03:00
Dmitriy Zaporozhets c3ba0ee64b Merge branch 'feature_teams_api' of https://github.com/former03/gitlabhq into former03-feature_teams_api 
Conflicts:
	doc/api/README.md
 2013-05-27 15:05:01 +03:00
Ben Bodenmiller fb31790064 update pull request guidelines, allow for submitting of tests that expose existing failures 2013-05-27 04:58:09 -07:00
Dmitriy Zaporozhets 69d70400cc Merge pull request #4076 from bke-drewb/4023 
Fix regression caused by using newer version of Grape
 2013-05-27 04:56:07 -07:00
Ben Bodenmiller d0b04b03b4 clarify restore 2013-05-27 04:35:54 -07:00
Yves Senn 2e297c1ec2 Merge pull request #4092 from bbodenmiller/update-issue-guidelines 
improved issue reporting guidelines
 2013-05-27 04:01:46 -07:00
Ben Bodenmiller c401e5b9b1 improved issue reporting guidelines 2013-05-27 03:39:59 -07:00
Dmitriy Zaporozhets f44bd269ee Merge pull request #4072 from ndpgroup/import_w_groups 
Include groups in import with import repos rake task
 2013-05-27 03:03:30 -07:00
Dmitriy Zaporozhets b3bb558501 Merge pull request #4075 from bbodenmiller/patch-6 
remove branch dependencies in README where not necessary
 2013-05-27 02:47:16 -07:00
Dmitriy Zaporozhets b945f57fdf Merge pull request #4077 from bbodenmiller/patch-7 
clarify when issue tracker is to be used so as to not contradict issue t...
 2013-05-27 02:46:33 -07:00
Dmitriy Zaporozhets 83d68ef9fa Merge pull request #4090 from bbodenmiller/master 
add stack overflow to help page
 2013-05-27 02:45:46 -07:00
Dmitriy Zaporozhets 1194531e8e Merge pull request #4079 from bbodenmiller/patch-8 
details on looking for correct installation guide
 2013-05-27 02:45:15 -07:00
Ben Bodenmiller ac77f5ff1f add stack overflow to help page 2013-05-27 02:46:51 -06:00