home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-29 06:26:07 +10:00
Code Issues Packages Projects Releases Wiki Activity
22,224 Commits 48 Branches 340 Tags
d453b24aca178fe74dd673b94de50d1f14fb651a
Commit Graph
22224 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Vinnie Okada f5e65e2e50 Merge branch 'master' into markdown-tags 
Merge updated CHANGELOG entries
 2015-03-21 09:03:35 -06:00
Vinnie Okada 1dc90fc455 Fix nested task lists 
When nesting task list items, the parent item is wrapped in a `<p>` tag.
Update the task list parser to handle these paragraph wrappers.
 2015-03-21 08:45:28 -06:00
Vinnie Okada cc29ce4917 Don't allow style attributes in inline HTML 2015-03-21 08:39:54 -06:00
Kamil Trzcinski 5b432e7671 Extend push_tag event to include tag message and last commit 2015-03-21 11:25:27 +01:00
Dmitriy Zaporozhets 6cf189f0a9 Merge branch 'improve-avatar-header' into 'master' 
Improve header with avatar for group and user pages

Nice looking and aligned headers for user and group pages

See merge request !412
 2015-03-21 04:30:57 +00:00
Dmitriy Zaporozhets 222e53a026 Prevent diff header overflow 2015-03-20 20:46:04 -07:00
Dmitriy Zaporozhets beece83af1 Improve header with avatar for group and user pages 2015-03-20 20:15:13 -07:00
Dmitriy Zaporozhets f0d052b6e7 Merge branch 'user-location' into 'master' 
Location field in user profile

Twitter allows you to set string with location information.
I find it very useful in work to know where user from. It allows to communicate with knowing time difference and cultural things.

See merge request !411
 2015-03-21 00:54:03 +00:00
Dmitriy Zaporozhets d85f396fe5 Add location to user page 2015-03-20 16:55:20 -07:00
Dmitriy Zaporozhets 6ef20926ee Add location to user profile 2015-03-20 16:52:23 -07:00
Dmitriy Zaporozhets 52c3a3a0d2 Merge branch 'change_the_name_of_key' into 'master' 
Change the name of the key used for bitbucket importer.

See merge request !1733
 2015-03-20 23:27:09 +00:00
Marin Jankovski 603b88ab5c Fix typo. 2015-03-20 16:13:03 -07:00
Marin Jankovski b7229356d5 Change the name of the key used for bitbucket importer. 2015-03-20 15:54:11 -07:00
Dmitriy Zaporozhets 5738afdb12 Merge branch 'link_to_ci_with_ref' into 'master' 
Link to CI with ref

gitlab/gitlab-ci#162

!!! Should be merged simultaneously with https://dev.gitlab.org/gitlab/gitlab-ci/merge_requests/129

See merge request !1638
 2015-03-20 22:42:32 +00:00
Dmitriy Zaporozhets 9f9fed4fa2 Fix votes inline rendering 2015-03-20 15:34:29 -07:00
Dmitriy Zaporozhets b0e2441330 Improve issue sidebar position 2015-03-20 15:33:13 -07:00
Dmitriy Zaporozhets 303382c741 Merge branch 'fix-commits-routing' into 'master' 
Fix commits routing for branches with slash

Fixes https://github.com/gitlabhq/gitlabhq/issues/8990

See merge request !408
 2015-03-20 20:32:52 +00:00
Dmitriy Zaporozhets efb8783c4a Merge branch 'upvotes-refactoring' into 'master' 
Make issue and merge request sidebar more compact

* move votes block to participants
* make smaller font in sidebar
* remove js for upvoting since it differs from logic on backend and does not work correctly

Fixes #1253

Tested on different screens: HD, 1366x768, 1024x600

See merge request !410
 2015-03-20 20:17:51 +00:00
Dmitriy Zaporozhets baaa560290 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-03-20 13:16:51 -07:00
Dmitriy Zaporozhets 65b392c394 Merge branch 'merge-status-transition' into 'master' 
Update merge_status state to allow more transitions

Previously you could only transition from the unchecked state to one of the others. This meant that the mark_as_unmerged call in AutoMergeService would rarily be able to actually transition the state. As it would usually have already been set to can_be_merged before it hit that service.

Spec and Spinach tests have been run locally and all pass.

See merge request !405
 2015-03-20 20:11:04 +00:00
Dmitriy Zaporozhets 651397513a Fix commits routing 2015-03-20 13:01:43 -07:00
Dmitriy Zaporozhets 085e5084a8 Make issue and merge request sidebar more compact 
* move votes block to participants
* make smaller font in sidebar
 2015-03-20 12:50:45 -07:00
Dmitriy Zaporozhets 1f711fd93d Remove upvotes js logic since it does not work as expected anyway 2015-03-20 12:34:21 -07:00
Dmitriy Zaporozhets 2852d0b620 Fix commits routing for branches with slash 2015-03-20 12:03:48 -07:00
Jozef Vaclavik 71e6871737 Separate Dockerfile for Data and Application 2015-03-20 20:03:14 +01:00
Dmitriy Zaporozhets d735321ebd Improve project name truncation on dashboard to work well with sm screen 2015-03-20 11:32:44 -07:00
Andrew Tomaka 6c8b119263 Fix newline spacing after authorized_keys rebuild 2015-03-20 13:43:52 -04:00
Valery Sizov e5fe14b2fb Link to CI with ref 2015-03-20 19:19:29 +02:00
Dmitriy Zaporozhets 478f92d2c2 Merge branch 'security_fixes' into 'master' 
[security] gems update

[doorkeeper] added filtering of sensitive information (like secret key) from production.log

[gollum lib] remote code execution (in search field). We don't have search for wiki but it is better to have this fix.

Nothing critical!!!

related to #2143

See merge request !1732
 2015-03-20 16:28:31 +00:00
Valery Sizov 484524e096 gollum-lib update 2015-03-20 15:15:56 +02:00
Valery Sizov 5df1609c82 update doorkeeper to 2.1.3 2015-03-20 15:13:38 +02:00
Marin Jankovski c6dd117c71 Revert "Merge branch 'new_branch' into 'master'" 
This reverts commit 00607d4f96, reversing
changes made to edfc7d0d26.
 2015-03-19 23:52:33 -07:00
Marin Jankovski 00607d4f96 Merge branch 'new_branch' into 'master' 
New branch

See merge request !406
 2015-03-20 06:50:14 +00:00
Marin Jankovski 189dc4dc81 REaadme. Issue #1 2015-03-19 23:49:49 -07:00
Dmitriy Zaporozhets edfc7d0d26 Merge pull request #8974 from duduribeiro/add_error_message_in_profile 
Add error message when have error on profile screen
 2015-03-19 22:53:33 -07:00
Vinnie Okada 52bf95ae38 Change HTML sanitization 
Use the `SanitizationFilter` class from the html-pipeline gem for inline
HTML instead of calling the Rails `sanitize` method.
 2015-03-19 21:24:07 -06:00
Carlos Ribeiro 2435476167 Add error message when have error on profile screen 2015-03-19 23:31:25 -03:00
Vinnie Okada 06aafb7364 Call chdir() with a block 2015-03-19 20:30:19 -06:00
Dmitriy Zaporozhets b99221e6f0 Merge branch 'revert-unicorn-timeout' into 'master' 
Revert "Increase timeout for Git-over-HTTP requests."

This reverts commit 516bcabbf4.

For #2164

cc @marin @douwe

See merge request !1730
 2015-03-20 02:01:38 +00:00
Dmitriy Zaporozhets d5a259d43e Revert "Update poltergeist to support phantomjs 2.0" 
This reverts commit d70126c1fb.
 2015-03-19 18:56:05 -07:00
Dmitriy Zaporozhets efd8491d49 Revert "Increase timeout for Git-over-HTTP requests." 
This reverts commit 516bcabbf4.

Conflicts:
	Gemfile
 2015-03-19 18:29:20 -07:00
Dmitriy Zaporozhets 915c7b9455 Merge branch 'update_ui' into 'master' 
Remove mention of branch to commit to when new file is added through UI

See merge request !1731
 2015-03-20 01:28:47 +00:00
Dmitriy Zaporozhets 479020ec6b Fix project issues and merge requests pages 2015-03-19 18:27:26 -07:00
Vinnie Okada abbea9a0da Move backup permission changes to version 7.10 2015-03-19 19:24:25 -06:00
Dmitriy Zaporozhets 0ec1c8eea9 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-03-19 17:54:10 -07:00
Dmitriy Zaporozhets ad2720aea8 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-03-19 17:53:48 -07:00
Marin Jankovski a879d93378 Remove mention of branch to commit to. 2015-03-19 17:43:21 -07:00
Dmitriy Zaporozhets 00c042ea7c Merge pull request #8772 from awiddersheim/fix/grammar_projects_show 
Fix small grammar issue on projects show page
 2015-03-19 16:17:37 -07:00
Dmitriy Zaporozhets df8b4ab459 Merge pull request #8662 from yglukhov/mr-and-issue-links 
Make MR and issue numbers clickable links in MR and issue lists.
 2015-03-19 15:17:07 -07:00
Stan Hu 83d552d50d Disable reference creation for comments surrounded by code/preformatted blocks 2015-03-19 14:37:35 -07:00