home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-24 03:56:05 +10:00
Code Issues Packages Projects Releases Wiki Activity
13,452 Commits 48 Branches 340 Tags
12fa3e1b94de7232fe0337033f9dbc600248d0ec
Commit Graph
6502 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 89ecb19126 Merge branch 'ensure_default_fields' into 'master' 
Add values to default fields to prevent 500 error when migrate from MySQL to Postgres
 2014-04-10 07:20:45 +00:00
Hiroyuki Sato bca528a57c Better title format for wiki page 
The title format for wiki page may be unintelligible.
For example 'GitLab' is converted to 'Git Lab', 'MySQL' is converted to
'My Sql', etc.
 2014-04-10 15:14:02 +09:00
Dmitriy Zaporozhets 7793417206 Fix note body align 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-09 21:26:11 +03:00
Dmitriy Zaporozhets fd8a165df7 Reduce note header padding 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-09 21:20:54 +03:00
Dmitriy Zaporozhets 9f6a8ff4b5 Modify project default values 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-09 20:55:09 +03:00
Dmitriy Zaporozhets 4e9add7c2c Merge branch 'clean_old_archives' into 'master' 
Clean old archives from repository downloads directory
 2014-04-09 17:50:09 +00:00
Dmitriy Zaporozhets fae6eb6353 Merge branch 'wiki-refactoring' into 'master' 
Wiki refactoring

Better names for variables and classes
 2014-04-09 17:48:46 +00:00
Steffen Knoth 55cf6243a4 fix for project creation: group projects don't count towards user's project limit 2014-04-09 17:46:22 +02:00
Marin Jankovski b2959c4102 Remove archives older than 2 hours. 2014-04-09 15:09:11 +02:00
Dmitriy Zaporozhets 466f0fb762 Fix default value for project model 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-09 15:05:40 +03:00
Dmitriy Zaporozhets 36f861f1b1 Re-annotate models 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-09 15:05:03 +03:00
Dmitriy Zaporozhets 1bd28994cc Use ProjectWiki instead of GollumWiki in code 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-09 14:35:58 +03:00
Dmitriy Zaporozhets 26ec74c446 Refactor wiki model 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-09 14:35:26 +03:00
Dmitriy Zaporozhets b27c42be87 Rename wiki variables 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-09 14:35:01 +03:00
Dmitriy Zaporozhets c5cdd07899 Add values to default fields to prevent 500 error when migrate from MySQL to Postgres 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-09 13:36:25 +03:00
Dmitriy Zaporozhets 71678f08f8 Merge branch 'issue_on_empty_repo' into 'master' 
Fix for error 500 on create issue for empty repo
 2014-04-09 10:11:45 +00:00
Marin Jankovski e617cf95d4 Add issue to an empty repo, test. 2014-04-08 17:12:57 +02:00
Dmitriy Zaporozhets 9a02e27b84 Merge branch 'indicate-it-is-a-filter' into 'master' 
Indicate it is a filter
 2014-04-08 14:47:42 +00:00
Dmitriy Zaporozhets 3aee31c00d Gollum use own constant now 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-08 15:14:16 +03:00
dosire 16567af9f5 Use placeholder to prevent using the find box to add new members. 2014-04-08 11:11:14 +02:00
Dmitriy Zaporozhets 1e8ed9d514 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2014-04-08 09:32:26 +03:00
Dmitriy Zaporozhets 7f148385d4 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2014-04-08 09:30:49 +03:00
Marin Jankovski af5ea92cc4 Merge branch 'master' into login_page 
Conflicts:
	CHANGELOG
 2014-04-07 20:13:37 +02:00
Dmitriy Zaporozhets d238a21bcb Merge pull request #6708 from skv-headless/fix_url_error_on_invalid_hook 
Fix url generation error on hook invalid create
 2014-04-07 19:55:09 +03:00
Dmitriy Zaporozhets e36108f75b Merge branch 'grammer_fix' into 'master' 
Grammer Fix

Should read like:

```
Your project limit is 10 projects! Please contact your administrator to increase it
```
Instead of:

```
Your own projects limit is 10! Please contact administrator to increase it
```
 2014-04-07 16:52:08 +00:00
Dmitriy Zaporozhets d92e4830f7 Allow people to remove source branch of fork project in MR 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-07 19:11:02 +03:00
Dmitriy Zaporozhets d70939f680 Remove unnecessary sign * 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-07 18:59:10 +03:00
Dmitriy Zaporozhets 3befe6ec33 Fix show/hide discussion link 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-07 18:57:57 +03:00
Marin Jankovski aea3712e8d Add option for disable standard signin. 2014-04-07 17:11:06 +02:00
Dmitriy Zaporozhets 650d0bc695 Merge branch 'improve-oauth' 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
 2014-04-07 17:15:31 +03:00
Dmitriy Zaporozhets e6f58cb87d Avoid false validation when create user 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-07 16:47:37 +03:00
Dmitriy Zaporozhets 4ab32be8a7 Dont care about emails for oauth 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-07 15:20:40 +03:00
dosire 6e4dbde2e7 Improve actionability of notice. 2014-04-07 14:14:14 +02:00
Dmitriy Zaporozhets 84d17f7965 Skip require email for devise controllers 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-07 14:32:59 +03:00
Dmitriy Zaporozhets a73df4f72d Allow oauth signup without email 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-07 14:09:29 +03:00
Dmitriy Zaporozhets bfd4494890 Merge branch 'show_diff' into 'master' 
Show note diff if diff exists
 2014-04-06 17:01:15 +00:00
skv 4cc2afdf2e Fix url generation error on hook invalid create 2014-04-06 19:42:24 +04:00
Dmitriy Zaporozhets 8e7f80eed1 Restyle merge request accept and ci widget 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-06 17:10:37 +03:00
Dmitriy Zaporozhets bc40efa19d Merge pull request #6705 from razielgn/slack-service-attachments 
Improved Slack integration with message attachments.
 2014-04-06 14:27:02 +03:00
Dmitriy Zaporozhets 7ced2eb447 Use normal btn size for test service 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-06 14:26:24 +03:00
Dmitriy Zaporozhets ae2089a98e Fix autocomplete css 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-06 14:10:48 +03:00
Dmitriy Zaporozhets 1a17289bd3 Merge branch 'remove_source_branch_button' of https://github.com/jacob-carlborg/gitlabhq into jacob-carlborg-remove_source_branch_button 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/assets/javascripts/merge_requests.js.coffee
	app/assets/stylesheets/sections/merge_requests.scss
	app/controllers/projects/merge_requests_controller.rb
 2014-04-06 13:54:54 +03:00
Federico Ravasio 6a9eb4b231 Improved Slack integration with message attachments. 2014-04-06 11:57:48 +02:00
Dmitriy Zaporozhets 2ceef76917 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2014-04-06 10:16:44 +03:00
Timm Drevensek 4d1945028e Merge branch 'master' into request/relative_submodules 2014-04-04 23:50:39 +02:00
Josh Frye 89c942908c Fix project limit reached grammer. 2014-04-04 16:17:21 -04:00
Marin Jankovski 17bb700712 Only show diff it exists. 2014-04-04 19:12:23 +02:00
Dmitriy Zaporozhets 3d2c81856c Merge branch 'deduplicate-help' into 'master' 
Deduplicate help
 2014-04-04 15:18:42 +00:00
Dmitriy Zaporozhets 14b68586b8 Merge branch 'no_email_on_notification_level_change' into 'master' 
Don't send emails on notification level change
 2014-04-04 09:30:16 +00:00
dosire 6205b068cd Reduce the number of times people send emails or file issues out of the blue. 2014-04-04 08:05:09 +02:00