home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-19 09:36:47 +10:00
Code Issues Packages Projects Releases Wiki Activity
14,812 Commits 48 Branches 340 Tags
dffa2fa9e92e37a664afa2807fd5b01fbbd87ef2
Commit Graph
843 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 2fe69158f0 Merge branch 'group-icon-performance' into 'master' 
Prevent database query each time we render group avatar

Fixes #2118

See merge request !1688
 2015-03-12 22:28:47 +00:00
Marin Jankovski 1c3997a747 Merge branch 'replace_passwords_with_asterisk' into 'master' 
Show asterisks instead of password in service edit form.

See merge request !1686
 2015-03-12 22:27:46 +00:00
Dmitriy Zaporozhets 7ac62388a5 Prevent database query each time we render group avatar 2015-03-12 13:56:53 -07:00
Marin Jankovski a1f5ae98e2 Show asterisks instead of password in service edit form. 2015-03-12 10:10:19 -07:00
Hannes Rosenögger 3c7e0f45c2 replace images in emails with inline images 
This adds the functionality of replacing all images that were uploaded
to gitlab with inline images(base64) in emails.
This change fixes the broken images in emails that 7.8 introduced
 2015-03-12 09:26:06 +01:00
Dmitriy Zaporozhets f29a7ce51f Merge branch 'markdown-smb-link' into 'master' 
Allow smb:// links in Markdown text.

As requested by Sam McLeod at https://gitlab.com/gitlab-org/gitlab-ce/issues/1184

See merge request !1669
 2015-03-12 03:57:52 +00:00
Marin Jankovski 1647994ada Merge branch 'fix-code-preview' into 'master' 
Fix code preview theme setting for comments, issues, merge requests, and snippets

User color scheme was not being used: default white color scheme was always chosen. Also, default background for code in notes was always overriding the user color scheme.

Closes #1139

See merge request !357
 2015-03-11 18:41:36 +00:00
Dmitriy Zaporozhets 83f7e98d9a Add project filter by visibility and tag to explore page 2015-03-10 15:59:14 -07:00
Stan Hu 4218a2bfcf Fix code preview theme setting for comments, issues, merge requests, and snippets. 
Also preserve code preview color scheme in events dashboard.

Assign default colors to all code blocks shown as <pre class="code highlight [color_scheme]">

Closes #1139
 2015-03-10 08:11:20 -07:00
Douwe Maan ca9aca9279 Allow smb:// links in Markdown text. 2015-03-10 13:32:28 +01:00
Dmitriy Zaporozhets c6b2421127 Render milestone progress with one helper method 2015-03-09 15:20:32 -07:00
Stan Hu 7e204cf389 Added comment notification events to HipChat and Slack services. 
Supports four different event types all bundled under the "note" event type:

- comments on a commit
- comments on an issue
- comments on a merge request
- comments on a code snippet
 2015-03-06 06:54:00 -08:00
Dmitriy Zaporozhets e916f1c295 Merge branch 'dashboard-milestones' into 'master' 
Add dashboard milestones.

Closes #1422.

![Screen_Shot_2015-03-03_at_16.20.36](https://dev.gitlab.org/gitlab/gitlabhq/uploads/795b480a2552e1d26436c3db2158cb81/Screen_Shot_2015-03-03_at_16.20.36.png)

See merge request !1621
 2015-03-04 19:12:47 +00:00
Douwe Maan fbc3cb69c3 Add dashboard milestones. 2015-03-03 16:19:37 +01:00
Stan Hu b8c9257fb1 Fix bug where editing a comment with "+1" or "-1" would cause a server error 
Closes #1151
 2015-03-02 15:26:00 -08:00
Stan Hu 4bc5c66fe1 Fix broken project_url routing when protected branches are accessed with an empty repo 2015-03-01 20:26:21 -08:00
Jeroen van Baarsen 93bacb03e5 Merge pull request #8890 from sue445/feature/project_api_avatar_url 
Expose avatar_url in projects API
 2015-03-01 10:54:42 +01:00
sue445 51abeaa1bc Expose avatar_url in projects API 
* Impl Project#avatar_url
* Refactor ApplicationHelper: Use Project#avatar_url
* Update changelog
 2015-03-01 10:13:01 +09:00
Dmitriy Zaporozhets 42387b733b Merge branch 'route-helper' into 'master' 
Introduce shortcuts for routing helpers

See merge request !1600
 2015-02-27 07:03:01 +00:00
Marin Jankovski 6146e2940d Merge branch 'event_tooltip_addition' into 'master' 
Added information to tooltips

Tooltips now have meaning by mentioning their function ("Filter by..."). Fixes #1992

See merge request !1571
 2015-02-26 18:50:23 +00:00
Dmitriy Zaporozhets 0a4dec24c8 Add explanation to routing method 2015-02-25 19:41:17 -08:00
Dmitriy Zaporozhets 1da71cc520 Introduce shortcuts for routing helpers 2015-02-25 19:34:16 -08:00
Dmitriy Zaporozhets a52529f9b6 Merge branch 'bitbucket-import' 
Conflicts:
	app/views/import/gitorious/status.html.haml
	db/schema.rb
 2015-02-25 09:21:45 -08:00
Dmitriy Zaporozhets ee343661e1 Get rid of black logo 2015-02-24 23:17:11 -08:00
Dmitriy Zaporozhets 6e559be6c6 Refactor header logo and setup expectation on it size 2015-02-24 22:58:47 -08:00
Douwe Maan 448817c4de Load public key in initializer. 2015-02-24 15:07:24 +01:00
Douwe Maan ad6d623234 Add Bitbucket importer. 2015-02-24 15:07:24 +01:00
Sabba Petri 5d2dda9744 Added information to tooltips 
Tooltips now have meaning by mentioning their function ("Filter by..."). Fixes #1992
 2015-02-23 11:39:08 -08:00
Vinnie Okada 9e9ce95d62 Merge branch 'master' into rails-4.1.9 
Conflicts:
	app/views/dashboard/_project.html.haml
	app/views/events/event/_common.html.haml
	app/views/explore/projects/_project.html.haml
	app/views/groups/_projects.html.haml
	app/views/projects/_home_panel.html.haml
	app/views/projects/_issues_nav.html.haml
	app/views/projects/issues/_discussion.html.haml
	app/views/projects/issues/_issues.html.haml
	app/views/projects/issues/show.html.haml
	app/views/projects/merge_requests/_discussion.html.haml
	app/views/projects/merge_requests/_show.html.haml
	app/views/projects/milestones/index.html.haml
	app/views/projects/notes/_edit_form.html.haml
	app/views/shared/_issuable_filter.html.haml
 2015-02-19 20:53:05 -07:00
Dmitriy Zaporozhets 75d2145ec0 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-02-18 10:12:18 -08:00
Dmitriy Zaporozhets 057d43500b Merge branch 'performance-improvements' into 'master' 
Performance improvements

* More efficient DB queries
* Cache ApplicationSettings per request
* Dont query for objects you dont need

See merge request !1540
 2015-02-18 18:11:37 +00:00
Sytse Sijbrandij a6a9cc6245 Merge branch 'no-highlight-files' into 'master' 
Add "NEWS" to no_highlight_files

"NEWS" is used in gnu style opensource projects for the changelog. So let's add it to `no_highlight_files`.

See merge request !249
 2015-02-18 17:58:36 +00:00
Douwe Maan 15bee7e0ff Fix Markdown relative links to files with anchors. 2015-02-18 12:32:20 +01:00
Dmitriy Zaporozhets a8a328b151 DB performance improvements to GitLab 2015-02-18 00:16:42 -08:00
Vinnie Okada 76aad9b76e Upgrade to Rails 4.1.9 
Make the following changes to deal with new behavior in Rails 4.1.2:

* Use nested resources to avoid slashes in arguments to path helpers.
 2015-02-14 11:09:23 -07:00
Douwe Maan ce08f919bf Add link to share via twitter to "created project" event. 2015-02-13 12:07:59 +01:00
Douwe Maan 522efa43fe Refactor event title generation for more consistent messages. 
Example: "User joined project Namespace / Project" rather than "User joined project at Namespace / Project"
 2015-02-13 12:02:58 +01:00
Dmitriy Zaporozhets cab72628ff Merge branch 'master' into 'master' 
Adds new label color suggestions

This adds a bunch of label color suggestions

![labels2](https://gitlab.com/uploads/gitlab-org/gitlab-ce/ac1a207575/labels2.png)
![labels1](https://gitlab.com/uploads/benny/gitlab-ce/d47fbecc16/labels1.png)

See merge request !289
 2015-02-12 07:17:46 +00:00
Nikita Verkhovin 8681cb3137 Add labels notes 2015-02-08 22:35:41 +06:00
Dmitriy Zaporozhets dd8dd92e50 Merge branch 'api-default-order' into 'master' 
Sorting refactoring

* refactor sorting logic for web UI
* refactor and document ordering for API: project, issues, merge requests
* explicitly define ordering in models using default_scope

See merge request !1476
 2015-02-06 18:08:44 +00:00
Dmitriy Zaporozhets bbca6a0abd Refactor sorting in project 2015-02-05 19:15:05 -08:00
Valery Sizov 5194214e3a GitLab integration. Importer 2015-02-05 12:50:34 -08:00
Dmitriy Zaporozhets 254a63dcf7 Improve collapsing sidebar 2015-02-03 13:11:33 -08:00
Dmitriy Zaporozhets ded30e3efe Merge branch 'collapseable-nav' of https://github.com/jasonblanchard/gitlabhq into jasonblanchard-collapseable-nav 2015-02-03 12:05:11 -08:00
Jason Blanchard ee955d7a12 Adds persistent collapse button for left side bar 2015-02-03 11:45:33 -05:00
Dmitriy Zaporozhets 61cc6a9244 Rubocop: indentation fixes Yay!!! 2015-02-02 21:59:28 -08:00
Dmitriy Zaporozhets d04344373b Rubocop: no trailing newlines 2015-02-02 21:53:27 -08:00
Dmitriy Zaporozhets 647ff6240e Rubocop: Style/ElseAlignment enabled 2015-02-02 21:38:50 -08:00
Dmitriy Zaporozhets 7d48205c1a Rubocop: comment indentation 2015-02-02 21:34:16 -08:00
Dmitriy Zaporozhets cc39bca3fa Rubocop: Style/AlignHash enabled 2015-02-02 21:15:44 -08:00