home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-24 20:16:08 +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
Douwe Maan dfebcb89e6 Don't save unchanged user map items to the DB. 2015-04-17 13:32:29 +02:00
Dmitriy Zaporozhets 7266c78b76 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-04-17 14:32:04 +03:00
Dmitriy Zaporozhets 07c149de74 Merge branch 'fix-username-period-migration' into 'master' 
Fix username period migration to preserve uniqueness of names and paths.

See merge request !534
 2015-04-17 10:58:43 +00:00
Douwe Maan 779f05ef0e Explain skip_before_filter workaround. 2015-04-17 12:49:20 +02:00
Douwe Maan 2d913e5a9a Update gitlab_git to ignore invalid lines in .gitmodules. 2015-04-17 12:23:28 +02:00
Douwe Maan 46524ecb33 Fix username period migration to preserve uniqueness of names and paths. 2015-04-17 12:03:54 +02:00
Douwe Maan 3adbb8b10d Tweak changelog item. 2015-04-17 11:35:44 +02:00
Douwe Maan 1615d3de39 Add tests. 2015-04-17 11:33:58 +02:00
Douwe Maan 305725f8d5 Correctly handle blocked users. 2015-04-17 11:33:53 +02:00
Dmitriy Zaporozhets 5ba7a8e023 Merge branch 'repo-check-task' into 'master' 
Add new rake task to check repo integrity

Add a `gitlab:repo:check` task that checks repository integrity with `git fsck`.  See #1819.

See merge request !1778
 2015-04-17 09:22:41 +00:00
Douwe Maan 630e879066 Clean up code somewhat. 2015-04-17 11:03:33 +02:00
Marin Jankovski 5456b00f27 Merge pull request #8212 from dmedvinsky/fix-url-field 
Fix auto-selection of URL field with X11 selection
 2015-04-17 10:59:20 +02:00
Marin Jankovski e988cdba47 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-04-17 10:58:15 +02:00
Dmitry Medvinsky 92544df8da Fix auto-selection of URL field with X11 selection 
We use `focusin` event instead of `click` because when using the latter,
when the selection is created it isn't put into X11 PRIMARY selection.
And as a Linux user I'm very used to such behaviour that when something
gets selected, it's ready for pasting, which is the primary purpose of
the clone URL field.

When `focusin` is used, the selection is copied to X11 buffer
automatically, so it works as expected (tested in Firefox and Chrome).
 2015-04-17 10:16:18 +03:00
Robert Speicher e01480a3af Minor mentionable shared example change 2015-04-16 16:34:01 -04:00
Robert Speicher 8c9a148720 Update mentionable shared examples to be (a bit) more understandable 2015-04-16 16:30:16 -04:00
Robert Speicher dee52393b5 Correct usage of subject in specs 2015-04-16 16:30:16 -04:00
Robert Speicher 2dace3679f Note#cross_reference_exists? should be checking the noteable_type also 2015-04-16 16:30:15 -04:00
Stan Hu bf813a22a1 Remove entry that was shipped in v7.9.1 2015-04-16 08:29:07 -07:00
Dmitriy Zaporozhets f71a4b145a Merge pull request #9147 from jvanbaarsen/changelof-7-11 
Added changelog for 7.11
 2015-04-16 17:38:31 +03:00
Jeroen van Baarsen a4d9394b46 Added changelog for 7.11 
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
 2015-04-16 16:16:01 +02:00
Dmitriy Zaporozhets 36677a9b54 Merge branch 'update-changelog' into 'master' 
Add 7.9.4 to CHANGELOG

See merge request !531
 2015-04-16 13:51:06 +00:00
Dmitriy Zaporozhets e24ed47f8f Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-04-16 15:29:43 +03:00
Dmitriy Zaporozhets 9042d8d2b2 Merge pull request #9131 from chulkilee/ruby-2.1.6 
ruby 2.1.6
 2015-04-16 15:27:29 +03:00
Jeroen van Baarsen b18b9a55be Merge pull request #9094 from bbodenmiller/patch-1 
update text to reference new location of setting
 2015-04-16 14:23:38 +02:00
Job van der Voort a7760993c6 Merge branch 'update-install-guides-710' into 'master' 
update guides for 7.10

See merge request !1779
 2015-04-16 12:19:21 +00:00
Job van der Voort 42237e363b update guides for 7.10 2015-04-16 14:16:46 +02:00
Dmitriy Zaporozhets 2a0a48a402 Add 7.9.4 to CHANGELOG 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-04-16 15:16:04 +03:00
Hannes Rosenögger dccd79d288 add CHANGELOG entry 2015-04-16 12:39:25 +02:00
Hannes Rosenögger 7bba2a19ab remove access control for images 
This commit removes the access control for uploaded images.
This is needed to display the images in emails again.
 2015-04-16 12:37:19 +02:00
Vinnie Okada acd80bdc2d Add new rake task 
Add a task that checks repository integrity with `git fsck`.
 2015-04-15 22:22:20 -06:00
Douwe Maan 990b476faa Fix notification service spec. 2015-04-15 21:09:14 +02:00
Marin Jankovski ed94cde2b2 Merge pull request #9089 from dsander/fix-merge-request-comments 
Fix merge request comments on files with multiple commits
 2015-04-15 19:34:38 +02:00
Robert Speicher 2d4ffce826 Loosen help page parameter constraints for category 2015-04-15 13:15:18 -04:00
Douwe Maan a9b04c4536 Fix Snippet#participants. 2015-04-15 18:59:01 +02:00
Robert Speicher 3052e89420 Re-fix image rendering for help pages 2015-04-15 12:45:31 -04:00
Dmitriy Zaporozhets fb7ce7bd13 Merge branch 'fix-mention-notification' into 'master' 
Fix Mention notification level.

Fixes internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2236.

See merge request !527
 2015-04-15 16:31:34 +00:00
Robert Speicher e24cb79f31 Add constraints to help#show route parameters 2015-04-15 12:25:37 -04:00
Robert Speicher 1e27b68b36 Add Markdown to Mime types 2015-04-15 12:25:24 -04:00
Robert Speicher ef47ea3d39 Revert "Fix and improve help rendering" 
This reverts commit d365004e68.
 2015-04-15 12:24:44 -04:00
Dominik Sander d4fec49abc Fix merge request comments on files with multiple commits 
Having a merge request with a comments on a line which is then changed
in a later commit prevented new comments from properly showing up in the
merge request show page.

 * `Note#set_diff` do not use stored the diff when creating a new note
   in merge requests (we can not be sure the diff did not changed since
   the last comment on that line)
 * Do not rely just on `outdated?` of the first note when displaying
   comments of a MR in the discussion tab, but partition the
   active/outdated notes and display them all
 * In the inline changes tab just select the active notes, so an
   outdated note does not prevent an active one from being rendered
 * Just show active comments in the side-by-side changes tab
 2015-04-15 18:23:57 +02:00
Douwe Maan c644dd01a4 Only send note notifications to people accessible by the note author. 
Should not make a difference most of the time, since if they're participating in the thread, they have access to the project.
 2015-04-15 17:57:31 +02:00
Douwe Maan 7633d60268 Include snippet author in recipients of snippet note notification. 2015-04-15 17:57:31 +02:00
Douwe Maan 959ebbcade Clean up code around commit mentions. 2015-04-15 17:57:31 +02:00
Douwe Maan b73ffbd3cb Fix for snippets. 2015-04-15 17:57:26 +02:00
Douwe Maan efe9629346 Fix Mention notification level. 2015-04-15 17:57:26 +02:00
Marin Jankovski 5f78601c8a Merge branch 'fix-gitorious-test' into 'master' 
Make sure user has access to namespace in import tests.

See merge request !529
 2015-04-15 15:56:23 +00:00
Douwe Maan 80097606f5 Make sure user has access to namespace in import tests. 2015-04-15 16:58:43 +02:00
Dmitriy Zaporozhets 9193b94ece No tabs in code! 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-04-15 16:14:16 +03:00
Dmitriy Zaporozhets cc41381be4 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-04-15 15:41:36 +03:00