home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-18 17:16:08 +10:00
Code Issues Packages Projects Releases Wiki Activity
6,290 Commits 48 Branches 340 Tags
e8975207535decfca0f8bc53d3a91ece6be146dd
Commit Graph
6290 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitriy Zaporozhets e897520753 Merge pull request #4904 from axilleas/master 
Clear redis cache and precompile assets during update to 6.0. Fix #4874 #4840
 2013-08-26 08:27:19 -07:00
Axilleas Pipinellis c4bf88f96f Clear redis cache and precompile assets during update to 6.0. Fix #4874 #4840 
As a consequence on the namespaces change from 5.4 to 6.0, after upgrade
lots of links on the dashboard were not working (pointing to projects
without the group part on the url).
Also, after upgrading to 6.0-stable, the network (branch history) function
does not work. The progress bar rotates forever, but the network graph cannot
be generated.

Clearing redis cache fixes those issues.
 2013-08-26 18:06:15 +03:00
Dmitriy Zaporozhets 01c8aae8f2 Add br for new sentense in Compare view 2013-08-26 16:46:03 +03:00
Dmitriy Zaporozhets 241286a7b3 Merge pull request #4897 from rtripault/iids 
[#4821] - Fix some missing iids
 2013-08-26 06:32:15 -07:00
Dmitriy Zaporozhets 17af835387 Add event filter for group and project show pages 2013-08-26 16:30:03 +03:00
Romain 3d8f38c683 [#4821] - Fix some missing iids 2013-08-26 14:54:07 +02:00
Dmitriy Zaporozhets 4675ff46e8 Remove bottom margin for text in event note 2013-08-26 15:49:11 +03:00
Dmitriy Zaporozhets 77a9b1449e Fix md help table header 2013-08-26 15:09:33 +03:00
Dmitriy Zaporozhets 0093554ad6 Add test and docs for markdown tables 2013-08-26 15:07:07 +03:00
Dmitriy Zaporozhets 3cc26654d5 Remove old migration tasks 
You should update to 6.0 before proceed with update to higher version.
So its no reason to keep old tasks any more.
It should be still available in 6-0-stable but not in master
 2013-08-26 14:53:36 +03:00
Dmitriy Zaporozhets 6b206c9d96 Allow markdown tables 2013-08-26 14:27:19 +03:00
Dmitriy Zaporozhets dc016fef39 Add redirect from Issue#id to Issue#iid 2013-08-26 14:15:21 +03:00
Dmitriy Zaporozhets c8e3d31925 Merge pull request #4892 from Aigeruth/feature/api-add-diff 
Feature: get the diff of a commit via API.
 2013-08-26 04:02:09 -07:00
Dmitriy Zaporozhets 45c3925020 Better style for blockquote text in comments 2013-08-26 13:50:13 +03:00
Dmitriy Zaporozhets 86d92bdae7 Merge branch 'userfriendly-compare-page' of /home/git/repositories/gitlab/gitlabhq 2013-08-26 10:38:27 +00:00
Dmitriy Zaporozhets bda409c4c8 Add placeholders from and to 2013-08-26 10:37:58 +00:00
Dmitriy Zaporozhets cc4b638c34 Set iid in fixtures. Add rake dev:setup for development 2013-08-26 13:20:45 +03:00
Dmitriy Zaporozhets b5593683af Mars theme for generated admin account 2013-08-26 13:06:41 +03:00
Dmitriy Zaporozhets 48ce80a60c Fix issue when developers are able to push to protected branch 
When that branch contain a '/' in the branch name.
Fix for git over HTTP
 2013-08-26 12:54:57 +03:00
Dmitriy Zaporozhets 551946a34e Merge pull request #4507 from smashwilson/linking-issues 
Linking objects from GFM references
 2013-08-26 02:31:57 -07:00
ash wilson c8a115c0e3 Link issues from comments and automatically close them 
Any mention of Issues, MergeRequests, or Commits via GitLab-flavored markdown
references in descriptions, titles, or attached Notes creates a back-reference
Note that links to the original referencer. Furthermore, pushing commits with
commit messages that match a (configurable) regexp to a project's default
branch will close any issues mentioned by GFM in the matched closing phrase.
If accepting a merge request would close any Issues in this way, a banner is
appended to the merge request's main panel to indicate this.
 2013-08-25 18:58:41 -04:00
Gabor Nagy d139cc6b32 Adds feature: get a diff via API. 2013-08-25 23:48:11 +02:00
Dmitriy Zaporozhets 2b36dee644 Merge pull request #4815 from MegaDiablo/patch-1 
add link on realisation api for java client
 2013-08-25 12:22:04 -07:00
Dmitriy Zaporozhets ac13960943 Merge pull request #4841 from Razer6/update_path_blacklist 
Add 'hooks' to path blacklist.
 2013-08-25 12:21:22 -07:00
Dmitriy Zaporozhets 999c4888fd Merge pull request #4845 from mmoll/unicorn_localhost 
bind unicorn listener to 127.0.0.1
 2013-08-25 12:21:11 -07:00
Dmitriy Zaporozhets 23d443a512 Merge pull request #4854 from aus/patch-1 
Fix GitLab Shell version check
 2013-08-25 12:20:26 -07:00
Dmitriy Zaporozhets 481c37200c Merge pull request #4879 from sugarmo/master 
Select files with diff filter for graph log
 2013-08-25 12:13:53 -07:00
Dmitriy Zaporozhets 8d6343b3ad Merge pull request #4860 from gitlabhq/fix_service_gitlab_restart 
Fix the `service gitlab restart` command
 2013-08-25 11:49:06 -07:00
dsekretovandDmitriy Zaporozhets b1358639c8 Update 20130419190306_allow_merges_for_forks.rb 
Postgress db migrate fails.(5.4=>6.0)
 2013-08-25 21:47:04 +03:00
Dmitriy Zaporozhets f834385a1d Merge branch 'master' of github.com:gitlabhq/gitlabhq 2013-08-24 22:43:35 +03:00
Dmitriy Zaporozhets 5a3d4cb634 Fixed 500 error when try to remove group 2013-08-24 22:42:52 +03:00
Steven Mok 6f70d6977a Select files with diff filter for graph log 2013-08-24 11:27:08 +08:00
Sytse Sijbrandij dc3e1d6392 People like Karen and myself are confused by the placeholder, it seems like you don't have to change the master value. Also the to and from should be more prominent. 2013-08-23 15:52:49 +02:00
Jacob Vosmaer 2b9d48ccd0 Fix the service gitlab restart command 
This commit addresses two related issues:
- Sidekiq should shut down completely before we restart it;
- If we restart unicorn with USR2 we need to kill the old master and
  worker processes.
 2013-08-23 10:31:32 +02:00
Austin Robertson b74a50451c Fix GitLab Shell version check 2013-08-22 13:10:18 -05:00
Jacob Vosmaer 21e3d848b4 Merge pull request #4847 from Stayallive/patch-1 
Added assets:precompile in upgrade guide 5.4 -> 6.0
 2013-08-22 07:04:10 -07:00
Alex Bouma b30909c269 Added assets:precompile in upgrade guide 5.4 -> 6.0 2013-08-22 16:00:42 +02:00
Dmitriy Zaporozhets 9a00bbda89 Show reopen milestone button if milestone was closed 2013-08-22 15:45:36 +03:00
Dmitriy Zaporozhets 0fcd89e3ac Show iids for issues/mr in email subject 2013-08-22 15:40:48 +03:00
Dmitriy Zaporozhets d2aa48c0d5 Recreate project satellite on rename or transfer 2013-08-22 14:49:57 +03:00
Michael Moll b3e07ec334 bind unicorn listener to 127.0.0.1 
otherwise it will listen on 0.0.0.0
 2013-08-22 13:17:58 +02:00
Dmitriy Zaporozhets 79b76d2cb6 Merge branch '25_000_installations' of /home/git/repositories/gitlab/gitlabhq 2013-08-22 08:04:04 +00:00
Robert Schilling c69637df9a Add 'hooks' to path blacklist. 2013-08-22 08:18:50 +02:00
Jacob Vosmaer c7713cafce Increase estimated number of GitLab installations 2013-08-21 17:38:59 +02:00
Dmitriy Zaporozhets 668358439e Fix tests after can_create_team was removed 2013-08-21 15:07:09 +03:00
Dmitriy Zaporozhets 08be25eb4b Merge pull request #4826 from amouhzi/patch-1 
Fix bug in ace-src-noconflict with Relative url.
 2013-08-21 04:12:46 -07:00
Dmitriy Zaporozhets e67574fe77 Merge pull request #4829 from hiroponz/render-not-found-when-failing-to-look-for-commit 
Render not found when failing to look for commit
 2013-08-21 04:11:52 -07:00
Hiroyuki Sato 1101ceb3f4 A little improvement 
1. Replace params key 'q' with 'extended_sha1'. A extended SHA1 syntax is explained in 'man gitrevisions'.
2. Change the placeholder of looking for commit.
3. Change the label of ref filter.
 2013-08-21 19:20:29 +09:00
Dmitriy Zaporozhets fede36f089 Add z-index to flash message 2013-08-21 12:40:02 +03:00
Dmitriy Zaporozhets 8dd37afe34 Reannotate 2013-08-21 12:34:02 +03:00