home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-23 03:26:07 +10:00
Code Issues Packages Projects Releases Wiki Activity
10,598 Commits 48 Branches 340 Tags
cb4d8eff4cb158fbef4d59bf64e04e776e29eaed
Commit Graph
609 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 119b02877d Merge branch 'bugfix/305/dashboard_feed_summaries' into 'master' 
Incorporate Summaries for Notes and Merge Requests Into Dashboard Feed

This MR fixes #305 by adding summaries for notes and merge requests into the dashboard feed.
 2014-07-02 07:00:16 +00:00
Dmitriy Zaporozhets f12967ced7 Merge branch 'bugfix/304/dashboard_feed_note_urls' into 'master' 
Fix Dashboard Feed URLs For Notes

This MR fixes issue #304 by updating the app/helpers/events_helper.rb event_feed_url() function to also return a URL for the various types of notes. Without this change, no URL is returned, which causes any note events on the feed to link directly back to the feed.
 2014-07-01 11:46:23 +00:00
Marin Jankovski 4ca8a175a2 Filter group milestones. 2014-06-30 09:44:30 +02:00
Marin Jankovski aaba993352 Skeleton of the group milestone index page. 2014-06-30 09:44:30 +02:00
Dmitriy Zaporozhets 1e673c72a1 Improve markdown parsing 
* dont try to build links for anchors like `#title-anchor`
* dont build relative url for project with empty repo

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-26 10:13:38 +03:00
Kyle Fazzari 420b46eedf Update events helper to remove wall-related sections. 2014-06-25 10:56:56 -04:00
Dmitriy Zaporozhets e93f6b030a Improve discussions 
* check for outdated discussions by comparing diff
* improve discussion UI

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-24 22:19:35 +03:00
Dmitriy Zaporozhets 8c67c339dc Dont show reply button if user is not signed in 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-24 13:35:50 +03:00
Dmitriy Zaporozhets a49d45db41 Move reply button to helper from view 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-24 13:34:46 +03:00
Dmitriy Zaporozhets 5c23bb1171 Merge branch 'bugfix/303/dashboard_feed_ids' into 'master' 
Move Event Helper To Use Project-level IDs Instead of Global IDs

This MR fixes issue #303 by updating app/helpers/event_helper.rb to use project-level IDs within the event title as opposed to global IDs (i.e. use target_iid instead of target_id).

This ties the issue and merge request numbers on the feed together with the numbers used throughout the rest of the site.
 2014-06-24 06:41:56 +00:00
Dmitriy Zaporozhets 085a93d4a5 Replace ok with circle for boolean icon 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-16 22:31:15 +03:00
Dmitriy Zaporozhets d29bb23a68 Update gitlab-grit to newer version with normal diff collection. Show if file mode was changed 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-14 22:54:56 +03:00
Dmitriy Zaporozhets 55795b7c29 Improve breadcrumbs 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-14 19:02:16 +03:00
Dmitriy Zaporozhets 55d4e2647d Merge branch 'ce_issues_sentence' into 'master' 
Issues sentence helper

This will make merging CE into EE later easier.
 2014-06-14 09:39:19 +00:00
Jacob Vosmaer d698535854 Add a test for issue sentence generation 2014-06-13 18:10:28 +02:00
Dmitriy Zaporozhets ae564c97d4 Dont expose user email via API 
To prevent leaking of users info we reduce amount of user information
retrieved via API for normal users.

What user can get via API:

* if not admin: only id, state, name, username and avatar_url
* if admin: all user information
* about himself: all informaion

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-13 17:46:48 +03:00
Dmitriy Zaporozhets 1355ede49d Wipe wall notes feature 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-13 14:24:54 +03:00
Dmitriy Zaporozhets afa4a075e4 Show spinner on network graph while it loading 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-11 22:22:58 +03:00
Dmitriy Zaporozhets f881e43677 Merge pull request #7024 from skv-headless/linkto_issues_on_main_dashboard 
links to issues on main dashboard
 2014-06-11 15:02:48 +03:00
Marvin Frick 587502390b fixes gitlab.com issue #229 
Changes .js.coffe files to not use a hardcoded path to
`no_avatar.png` but instead stick with the asset pipeline.

renames coffee.erb back to coffee
 2014-06-10 22:28:11 +02:00
Dmitriy Zaporozhets 0d13abb1c8 Specify language detection for highlight.js 
Because I am tired of CHANGELOG highlighted as sql file :)

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-07 15:46:58 +03:00
Dmitriy Zaporozhets 2aef3b00cf Refactor link to new diff note rendering 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-06 23:15:54 +03:00
Dmitriy Zaporozhets 0fdce4a52b Refactor some search scopes to prevent wierd behaviour and PG::Error issues 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-05 20:37:35 +03:00
Dmitriy Zaporozhets 55ab7a2a95 Remove color-named css classes 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-03 14:49:50 +03:00
Dmitriy Zaporozhets 4656ef957a Replace files icons with fontawesome 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-03 13:40:07 +03:00
Dmitriy Zaporozhets d514833a15 Dont show new file link on protected branch for developers 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-06-02 16:18:16 +03:00
Dmitriy Zaporozhets f9dd140280 Merge branch 'add_noreferrer_to_all_links' into 'master' 
Add nofollow to all external links

Fixes #1224
 2014-06-02 11:52:03 +00:00
Marin Jankovski 4a03bbe483 Add nofollow to all internal links. 2014-05-30 17:09:31 +02:00
Kyle Fazzari c1b1c32196 Add summaries for notes and merge requests to dashboard feed. 
This fixes #305.
 2014-05-29 07:55:55 -07:00
Kyle Fazzari 2e03ccff02 Update event helper to display target_iid in event title instead of target_id. 
The event helper is used extensively within the dashboard atom feed, so by
fixing this, we fixed #303.
 2014-05-29 07:46:45 -07:00
Kyle Fazzari 97e06bcfe6 Update events helper to also return a URL for notes. 
This fixes #304 since it was linking back to the dashboard feed
only as a result of it being given no URL at all for notes.
 2014-05-29 07:37:28 -07:00
Marin Jankovski 3910b5917c Extend default link_to helper to add noreferrer html_option. 2014-05-29 12:49:15 +02:00
Marin Jankovski a9580a157a Use the correct links, replace in search. 2014-05-29 08:44:25 +02:00
Dmitriy Zaporozhets 1932f902d5 Allow masters to create projects in groups 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-28 19:04:42 +03:00
Dmitriy Zaporozhets a18ae13e98 Backport CI service refactoring from EE 
It allows easier contribution of different CI services

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-28 11:35:43 +03:00
Marin Jankovski 603e04bc21 Make sure slashes are handled properly. 2014-05-26 20:43:58 +02:00
Marin Jankovski 52c3179be9 Do not replace links inside code blocks, less code for the same amount of work. 2014-05-26 20:43:58 +02:00
skvandGitLab 9c046fea67 links to issues on main dashboard 2014-05-26 13:24:21 +00:00
Dmitriy Zaporozhets 695fd3cf2c Move protected branches to Project settings 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-23 14:25:55 +03:00
Dmitriy Zaporozhets e089b11b7a Add BranchesHelper 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-22 14:38:48 +03:00
Dmitriy Zaporozhets 2da289cf22 Add assignee and milestone to 2nd step 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-05-08 15:52:59 +03:00
Dmitriy Zaporozhets 5ce1418406 Merge pull request #6799 from Datacom/bug/parallel_diff_missing_lines_pr 
Fix missing lines in Parallel Diff
 2014-05-06 15:34:33 +03: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 c51ac0484f Merge pull request #5962 from skv-headless/editing-preview 
editing preview
 2014-04-29 10:00:29 +03: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
George Dewar 5ef7fdbd54 Fix bug in which a line count without empty lines was incorrectly used 2014-04-17 14:42:05 +12:00
skv-headless d859d08094 Editing preview 2014-04-15 19:02:02 +04: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