Commit Graph
10629 Commits
Author SHA1 Message Date
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 69baa3afb2 Dont render difscussion for commit diffs
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-06-24 20:22:33 +03:00
Nico Suhl b6d79b681b do not advertise gravatar in profile if disabled 2014-06-24 16:57:34 +02:00
Dmitriy Zaporozhets 5eb734905c Merge branch 'oauth_errors' into 'master'
Oauth errors page
2014-06-24 14:08:28 +00:00
Dmitriy Zaporozhets 5c5a02da31 Merge branch 'fix-namespace-select' into 'master'
Fix namespace select

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/371
2014-06-24 14:08:12 +00:00
Dmitriy Zaporozhets 0f0a96ab2e Merge branch 'mr-improve-comments' into 'master'
Improve merge request comments

Fixes #1338
2014-06-24 14:07:59 +00:00
Dmitriy Zaporozhets 14bc7e0573 Show README link only if repository exists and not empty
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-06-24 16:15:10 +03:00
Max Ebersbacher 72801b864e CSS fix
1px border on hover of last item in tree view
Fixes issue #101
2014-06-24 15:07:27 +02:00
Dmitriy Zaporozhets 39c2099106 Merge branch 'fix-reply-button' into 'master'
Fix reply button

Don't show reply button if user is not signed in. Fixes #1360
2014-06-24 13:01:17 +00:00
Dmitriy Zaporozhets 8307704c2d Improve error page layout
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-06-24 15:57:38 +03:00
Marin JankovskiandDmitriy Zaporozhets 308b11a5b7 Error page. 2014-06-24 15:30:29 +03:00
Marin JankovskiandDmitriy Zaporozhets 49c9e8ec02 Use an error page when oauth fails. 2014-06-24 15:30:29 +03:00
Marin JankovskiandDmitriy Zaporozhets f40e87a03b Return better error when account exists when attempting oauth account create. 2014-06-24 15:30:29 +03:00
Dmitriy Zaporozhets 1817b9aec4 Fix namespace selector on Projects#new page
If user does not own any group he does not see namespace selector when
visit new project page even if he has master membership in one of
groups. This commit fixes it.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-06-24 15:12:08 +03:00
Dmitriy Zaporozhets 30912c75b8 Improve merge request comments
When add diff note on 'Changes' page - and then go to 'Discussions' tab
you will not see this discussion unless you reload a page. This commit
fixes it by rendering discussion on 'Discussion' page as soon as you
submit comment on 'Changes' page

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-06-24 14:57:59 +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 2d9667df26 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2014-06-24 13:20:13 +03:00
Dmitriy Zaporozhets 961217f87e Merge branch 'link-to-readme-from-description' into 'master'
Link to readme from description

If you are viewing a repository for the first time you are likely to view the description. If you want to keep reading after that you can now click a link to the readme. This place is in addition to the README button at the bottom of the right hand menu that is harder to find. If you have edit rights only the description edit button is shown to ensure the text fits, the assumption is that the readme is most interesting for people not yet added to the project.
2014-06-24 10:19:47 +00:00
Jacob Vosmaer 7049443a4c Merge branch 'add-redis-requirements' into 'master'
Add redis requirements

Based on https://groups.google.com/d/msgid/gitlabhq/f60a1b62-e722-4560-b98d-de8e3888dda0%40googlegroups.com?utm_medium=email&utm_source=footer
2014-06-24 09:34:19 +00:00
Sytse Sijbrandij 0c90697e00 Change Redis to 25k. 2014-06-24 11:00:42 +02:00
Sytse Sijbrandij f4398835f4 Some background on Redis and Sidekiq requirements. 2014-06-24 10:29:50 +02:00
Dmitriy Zaporozhets 614e0857d6 Merge pull request #7162 from olivierlambert/patch-1
Missing quote in the install doc
2014-06-24 10:39:56 +03:00
Dmitriy Zaporozhets 094e5efb4c Merge pull request #6992 from skv-headless/project_commits_sql_optimization
notes count in 1 query  for mr and commits
2014-06-24 10:38:50 +03:00
Dmitriy Zaporozhets aadef92f1d Merge pull request #7013 from jvanbaarsen/better-webhook-information
Return a little more information in Issue webhook
2014-06-24 10:37:15 +03:00
Dmitriy Zaporozhets e7cf10e446 Merge pull request #5531 from NotSqrt/add-search
Add ability to search in issue description and issue comments
2014-06-24 10:36:04 +03:00
Dmitriy Zaporozhets d7eb6e5515 Merge pull request #7082 from erbunao/fix_clipboard
Fix for copy-pasting formatted text to markdown area
2014-06-24 10:33:49 +03:00
Dmitriy Zaporozhets 66541d8d6f Merge pull request #7140 from Mik-die/master
Add Gitlab to Teatro.io
2014-06-24 10:29:59 +03:00
Dmitriy Zaporozhets d8cec13703 Merge pull request #7167 from Razer6/doc/add_create_milestone_permission
Fixes #7148, Add 'create milestone permission' to docs
2014-06-24 10:29:41 +03:00
Dmitriy Zaporozhets 6aa3e7ba0b Merge pull request #7169 from cirosantilli/remove-center-elem
Replace HTML5 obsolete center element with CSS.
2014-06-24 10:28:06 +03:00
Dmitriy Zaporozhets d25f2544fa Merge pull request #7177 from Totof6942/master
Small ui fix
2014-06-24 10:26:48 +03:00
Dmitriy Zaporozhets 7454ad19e9 Merge branch 'at_mention_all_project_members' into 'master'
At mention all project and group members
2014-06-24 07:12:37 +00:00
Dmitriy Zaporozhets d52df8e730 Merge branch 'issues-filter-by-description' into 'master'
Issues filter by description

In Issues section of any project there is a filter box, which by default says 'Filter by title or description' - so this behaviour is desired. But in fact only filter by title works and filter by description DOESN'T work. This fix adds description fitlering.
2014-06-24 07:04:01 +00:00
Dmitriy Zaporozhets ddd8f707fc Merge branch 'patch-2' into 'master'
Add autofocus and tabindex to newGroup.

Hi,
I've increase accessibility with a autofocus and tabindex on the new group view (like new project).
2014-06-24 06:45:38 +00:00
Sytse Sijbrandij 7ed11fded5 Remove button code from readme link. 2014-06-24 08:43:55 +02: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 3d98c1ea0f Merge branch 'update-repository-size-during-import' into 'master'
Update repository size during import

What does this MR do?
Update the repository size during the import

Are there points in the code the reviewer needs to double check?
Unknown.

Why was this MR needed?
Sometimes there could be an import without getting any pushes all the time or for a long time. The size is only recalculated on a push.
2014-06-24 06:39:22 +00:00
Dmitriy Zaporozhets 971101b7b9 Merge branch 'ssh-key-title-fix' into 'master'
Title fix for new SSH Key

What does this MR do?
Wait until the user "finished" his input in the key field (focus lost) before copying the mail part to the title.

Are there points in the code the reviewer needs to double check?
No.

Why was this MR needed?
It is annoying that the title is updated while typing and never changed any more.

See #335
2014-06-24 06:38:19 +00:00
Dmitriy Zaporozhets eadaa300d7 Merge branch 'doc/ruby_version_install' into 'master'
Update ruby version for manual installation to 2.1.2

**What does this MR do?**

Updates ruby version from 2.0 to 2.1.2

**Why was this MR needed?**

GitLab dropped support for ruby 1.9.3 and recommends 2.1 therefore docs need update.

**What are the relevant issue numbers?**

#360, #362

/cc @sytse
2014-06-24 06:33:58 +00:00
Robert Schilling bf1f8a0e0f Update ruby version to 2.1.2, fixes #362 related to #360 2014-06-23 18:19:14 +02:00
Sytse Sijbrandij 83c2aa1827 Merge branch 'mention-merge-marshalls' into 'master'
Mention merge marshalls

What do you think about people mentioning you @jeroenvanbaarsen and @dblessing ?
2014-06-23 14:33:41 +00:00
Marin Jankovski 4c575b72d5 Move checking of recepients to a service. 2014-06-23 15:44:49 +02:00
Dmitriy Zaporozhets 550f2337a7 Merge branch 'remove_secondary_user_email' into 'master'
Remove secondary user email

Fixes #1286
2014-06-23 12:53:03 +00:00
Sytse Sijbrandij c42b9d006d Feel free to mention merge marshalls. 2014-06-23 14:47:05 +02:00
Marin Jankovski 8f0051e2c2 Test @all mentioning notifications. 2014-06-23 14:02:09 +02:00
Marin Jankovski 185da5f976 Make sure that at mentioning all properly notifies. 2014-06-23 12:28:57 +02:00
Sytse Sijbrandij 08e4be01c0 Merge branch 'omnibus-rake' into 'master'
Spell out rake tasks for omnibus-gitlab
2014-06-23 09:57:27 +00:00
Marin Jankovski 63c1cdce42 Show @all in autocomplete list. 2014-06-23 11:54:58 +02:00
Jacob Vosmaer 5e00b7337b Also spell out gitlab-rake for web hook tasks 2014-06-23 11:06:25 +02:00
Marin Jankovski d12c1e90f8 Test secondary user email removal. 2014-06-23 10:39:56 +02:00