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
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
Marin Jankovski c4b1a5f5ea Allow nested files in wiki. 2014-04-28 16:22:31 +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
Chenguang Zhang 84870438f9 Add support for side-by-side inline comments 2014-04-24 21:18:10 +08:00
Marin Jankovski 0050c07fdd Serve a file if in wiki. 2014-04-24 15:00:18 +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
George Dewar 5ef7fdbd54 Fix bug in which a line count without empty lines was incorrectly used 2014-04-17 14:42:05 +12:00
Ciro Santillli 07a9d44de7 Commit message textareas have 72 char mark line. 2014-04-16 21:55:36 +02: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
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
Arnaud ABELARD 5d7bdf7642 allow using the user's email address as a http parameter in gravatar urls for custom avatar systems. For example: 
plain_url: "http://avatar.company.com/avatar/?mail=%{email}&size=%{size}"

add mention of the different placeholders possible for gravatar urls, mentionning the new %{email}
 2014-04-12 23:10:45 +02: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 MoschnyandMarin Jankovski 5b123dbf7f Fix avatars in the network graph for relative-url setups. 2014-04-10 10:05:40 +02:00