Commit Graph
4909 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 993fc84855 Use sign icon style for help link
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-05-02 22:00:23 +03:00
Dmitriy Zaporozhets c608a5dcea Add sort dropdown for admin projects page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-05-02 17:02:57 +03:00
Dmitriy Zaporozhets 9dfc4fe6ac Merge branch 'repo-size-in-db' into 'master'
Save repository size to projects table

This will allow us to get largest repos by simple sql query.

Also it increase loading of `admin/projects` page a lot because right now it calculate 20x project sizes per page
2014-05-02 13:48:26 +00:00
Dmitriy Zaporozhets d10b34a685 Save repository size to projects table
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-05-02 16:05:08 +03:00
Dmitriy Zaporozhets 0242124525 Fix 404 on jquery ui images
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-05-02 14:48:32 +03:00
Dmitriy Zaporozhets 7660290b37 Merge pull request #6892 from cirosantilli/remove-signin-link-front-page
Remove redundant signin link from signin page.
2014-05-01 22:58:48 +03:00
Alexander Mills cc9b7cba38 Updated CI error message so that it makes more sense 2014-05-01 15:42:28 +01:00
Dmitriy Zaporozhets d4b4088321 Merge pull request #6897 from cirosantilli/help-every-page
Add help link to header.
2014-05-01 11:58:55 +03:00
Ciro Santilli 469077e55d Add help link to header. 2014-05-01 09:14:52 +02:00
Dmitriy Zaporozhets 86726662e7 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-05-01 09:06:04 +03:00
Jacob Vosmaer 0b914e7ceb Refresh notes when the page becomes visible 2014-04-29 17:21:58 +02:00
Jacob Vosmaer e52f50c22f Do not refresh notes on hidden tabs 2014-04-29 17:21:58 +02:00
Dmitriy Zaporozhets 9eeb96846f Merge pull request #6877 from Nighoo/repository_push_email.text
do not html encode plaintext part of emails for push notifications
2014-04-29 18:07:55 +03:00
Dmitriy Zaporozhets dba913aa38 Merge pull request #6876 from dblessing/fix_broadcast_text
Fix unclear text in broadcast message view.
2014-04-29 18:07:26 +03:00
Ciro Santilli 513dbdbff3 Remove redundant signin link from signin page. 2014-04-29 11:49:42 +02:00
Dmitriy Zaporozhets c51ac0484f Merge pull request #5962 from skv-headless/editing-preview
editing preview
2014-04-29 10:00:29 +03:00
Jacob Vosmaer bd8b2b7fd9 Default last_fetched_at to 0 for old clients
Users who have not refreshed their browser tab will poll GitLab using
outdated JS. This change makes the server fall back to the old behavior
(send all comments) for old clients, instead of throwing an exception
for old clients.
2014-04-28 16:39:42 +02:00
Jacob Vosmaer 285926918b Serialize last_fetched_at as a string with seconds 2014-04-28 12:42:01 +02:00
Jacob Vosmaer 7ec5ff4dba Pass last_fetched_at for notes to javascript 2014-04-28 12:21:49 +02:00
Jacob Vosmaer 0b615eb0e2 Filter out old notes in NotesFinder 2014-04-28 12:13:29 +02:00
Jacob Vosmaer 7339464e77 Fail faster on an invalid target_type 2014-04-28 11:55:13 +02:00
Nico Suhl 25cc5fbf78 do not html encode plaintext part of emails for push notifications
Also-by: Andrew Karpow <andy@ndyk.de>
2014-04-26 03:43:24 +02:00
Drew Blessing 4618ec8791 Fix unclear text in broadcast message view. 2014-04-25 15:31:30 -05:00
Dmitriy Zaporozhets 1f84518ab7 Merge branch 'index_on_iid' into 'master'
Add uniq db index on project_id+iid

Because:
* its faster
* it solves problem with repeating iid's in one project
2014-04-25 06:03:03 +00:00
Dmitriy Zaporozhets ae7bd9f7c0 Migrate invalid rows with missing iids or duplicates 2014-04-24 19:39:33 +02:00
Dmitriy Zaporozhets 728bdfc504 Merge pull request #6843 from evanlucas/bug/6546
Fix syntax highlighting
2014-04-24 09:38:44 +03:00
Dmitriy Zaporozhets 1feaa336ed Merge pull request #6848 from hszcg/master
Fix diff height
2014-04-24 09:22:31 +03:00
Chenguang Zhang 7dd0860e5a Remove fixed height for diff table 2014-04-23 23:02:25 +08:00
Dmitriy Zaporozhets 7c1c03888c Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce 2014-04-23 09:21:52 +00:00
Dmitriy Zaporozhets 3295a4db9d Merge branch 'email_in_gravatar_urls' into 'master'
allow passing user's email address in custom Gravatar urls

Some custom avatar systems use the user's email address rather than its hash. This merge request will allow the administrator to configure gitlab-ce to use the user's email address gravatar.plain_url and  gravatar.ssl_url in the config file like this:

```
gravatar:
    enabled: true
    plain_url: "http://company.com/avatar/?mail=%{email}&size=%{size}"
    ssl_url: "https://company.com/avatar/?mail=%{email}&size=%{size}"
```

It's a only a 2 word patch.
2014-04-23 08:52:15 +00:00
Dmitriy Zaporozhets 2f726a11e6 Merge pull request #6775 from cirosantilli/glob-include-sass-dirs
Include SASS in subdirectories with glob.
2014-04-23 10:01:38 +03:00
Evan Lucas 4134b38a84 Fix syntax highlighting
Don't break highlighting on multi-line spans (multi-line comments for
example)
2014-04-22 17:06:16 -05:00
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
skv-headless d859d08094 Editing preview 2014-04-15 19:02:02 +04: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 6b068dccbb Include SASS in subdirectories with glob. 2014-04-14 23:49:16 +02: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