Jeroen van Baarsen
891b67c800
Removed missing sass selectors
2014-04-15 20:50:16 +02:00
Dmitriy Zaporozhets
cad9572ee9
Merge pull request #6780 from cbordei/hotfix/issue-6615
...
Fixed multiple close issue #6615
2014-04-15 18:37:45 +03:00
Cristian Bordei
8e278cfe75
Fixed multiple close issue #6615
2014-04-15 16:55:07 +03:00
Dmitriy Zaporozhets
da4c13f11d
Merge branch 'active-users' into 'master'
...
Active users
Show the number of active users in the dashboard.
2014-04-15 10:36:41 +00:00
Dmitriy Zaporozhets
ca0691ca8e
Merge branch 'prevent-two-links-in-emails' into 'master'
...
Prevent-two-links-in-emails
Only one link per email to prevent clicking the wrong one.
2014-04-15 10:36:25 +00:00
GitLab
b011486731
Add monthly active users to the admin dashboard.
2014-04-15 10:23:37 +02:00
Dmitriy Zaporozhets
0d3ba71bcb
Merge pull request #6774 from cirosantilli/issue-form-rename-fields
...
Rename issue form tags Subject -> Title and Details -> Description
2014-04-15 09:39:29 +03:00
Dmitriy Zaporozhets
9c7a9d92ff
Merge pull request #6773 from tsigo/rs-tag-page-sorting
...
Use VersionSorter on the Project > Tags page
2014-04-15 09:30:39 +03:00
Ciro Santilli
d2b4948a1f
Rename issue form tags to match MR and params.
2014-04-14 23:36:12 +02:00
Dmitriy Zaporozhets
6be82c5e3b
Merge branch 'master' of github.com:gitlabhq/gitlabhq
2014-04-14 22:11:47 +03:00
Drew Blessing
f34972358c
Show actual commit count on project dashboard
2014-04-14 12:01:18 -05:00
Robert Speicher
c803e78fd0
Use VersionSorter on the Project > Tags page
2014-04-14 12:40:27 -04:00
Dmitriy Zaporozhets
448e5c133a
Merge branch 'satellite_exists_in_automerge_check' into 'master'
...
Satellite exists in automerge check
2014-04-14 13:21:49 +00:00
Dmitriy Zaporozhets
2ed56ce9d4
Merge branch 'speed_up_wiki_pages' into 'master'
...
Speed up wiki pages page
2014-04-14 13:20:35 +00:00
dosire
c5bbb15d0c
100k organizations use GitLab.
2014-04-14 13:50:31 +02:00
Dmitriy Zaporozhets
2152fa0f8c
Merge pull request #6768 from omkelderman/master
...
Replace $your_email with actual email-address in ssh-help-page
2014-04-14 09:40:27 +03:00
Dmitriy Zaporozhets
28e6e1b1ab
Merge branch '161-emails-on-push-service' of https://gitlab.com/jsternberg/gitlab-ce into jsternberg/gitlab-ce-161-emails-on-push-service
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
Conflicts:
CHANGELOG
2014-04-14 09:27:11 +03:00
Olle Kelderman
ca6978dfc5
Replace $your_email with actual email-address. Fixes #6714
2014-04-14 05:00:48 +02:00
Dmitriy Zaporozhets
352bb97266
Merge pull request #6731 from hiroponz/better-title-format-for-wiki-page
...
Better title format for wiki page
2014-04-13 20:13:02 +03:00
Brett Bukowski
c1c9e11457
Fix "project-name" span classname typo
2014-04-11 16:00:58 -06:00
Jeroen van Baarsen
28f1a5d7d8
Determine label color based on lowercase name
2014-04-11 19:06:27 +02:00
Jonathan A. Sternberg
9cb2a4ac8a
Fix emails on push service when a single commit is pushed
...
This fixes issue #161 .
2014-04-11 11:54:02 -04:00
Marin Jankovski
aa6426f46d
Satellite will exist when doing automerge_check.
2014-04-11 10:22:32 +02:00
Marin Jankovski
872482678b
Speed up loading and add pagination to wiki pages page.
2014-04-11 10:02:52 +02:00
Dmitriy Zaporozhets
415c0f4bbe
Fix download link for huge MR diffs
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com >
2014-04-10 13:45:02 +03:00
Thomas Moschny and Marin Jankovski
5b123dbf7f
Fix avatars in the network graph for relative-url setups.
2014-04-10 10:05:40 +02:00
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
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