Commit Graph
6502 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 0f0a96ab2e Merge branch 'mr-improve-comments' into 'master'
Improve merge request comments

Fixes #1338
2014-06-24 14:07:59 +00:00
skv de6a1a3e96 prevent events loading while loading events refs #49759 2014-06-24 18:01:36 +04: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 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 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
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 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
Marin Jankovski 4c575b72d5 Move checking of recepients to a service. 2014-06-23 15:44:49 +02:00
Marin Jankovski 185da5f976 Make sure that at mentioning all properly notifies. 2014-06-23 12:28:57 +02:00
Marin Jankovski 63c1cdce42 Show @all in autocomplete list. 2014-06-23 11:54:58 +02:00
Marin Jankovski d12c1e90f8 Test secondary user email removal. 2014-06-23 10:39:56 +02:00
Sytse Sijbrandij 882c7b50b8 Allow for the readme not to exist. 2014-06-23 09:50:29 +02:00
Marin Jankovski 37425618bc Add option for admin to remove users secondary emails. 2014-06-23 09:45:26 +02:00
Sytse Sijbrandij 9f36888b99 Link to readme from description if you don't have edit rights on the repository. 2014-06-23 09:16:38 +02:00
Dmitriy Zaporozhets 73c1030da1 Merge branch 'fix-go-meta-tag' into 'master'
Fix go meta tag

See https://github.com/gitlabhq/gitlabhq/pull/5958#issuecomment-45397555
2014-06-23 06:39:58 +00:00
Dmitriy Zaporozhets 5aaa35656e Merge branch 'redirect_after_login' into 'master'
Redirect after login
2014-06-23 06:38:24 +00:00
Dmitriy Zaporozhets 5b8c176767 Merge branch 'html-semantic' into 'master'
Use html5 tags for better semantic
2014-06-23 06:37:35 +00:00
Dmitriy Zaporozhets fe00d0f50d Merge branch 'mr-diff-loading-spinner' into 'master'
MR diff loading spinner

When you click `Changes` tab if diff is big - you now see loading spinner
2014-06-23 06:37:14 +00:00
Dmitriy Zaporozhets 0759266c15 Merge branch 'ui-improvements' into 'master'
Ui improvements
2014-06-23 06:36:51 +00:00
Dmitriy Zaporozhets 860785a45e Merge branch 'skip_to_buttons_on_tab_in_issues_page' into 'master'
Skip to buttons on tabbing in issues page

This will skip tabbing right to "Add comment" or "close" buttons.

http://www.w3.org/TR/html5/editing.html#sequential-focus-navigation-and-the-tabindex-attribute

For tabindex:

```
If the value is a negative integer
The user agent must set the element's tabindex focus flag, but should not allow the element to be reached using sequential focus navigation.
```
2014-06-23 06:36:19 +00:00
Dmitriy Zaporozhets d12b910d20 Merge branch 'remove-observers' into 'master'
Remove observers from application

Part of #1133
2014-06-23 06:36:08 +00:00
Christophe Poulette 2d71780705 Small ui fix 2014-06-22 18:24:50 +02:00
Jeroen van Baarsen e364a852af Call every service, even if one fails
When one service fails, we dont want to have all of them failing. This
fixes this problem by catching all the errors, and writing them to the
error log.

Fixes: #5803

Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
2014-06-22 14:48:31 +02:00
Ciro Santilli a7e0ca9e83 Add trailing newline to all text files.
Present in the large majority of files of each respective type.
2014-06-21 11:20:22 +02:00
Ciro Santilli 83f4735b57 Replace HTML5 obsolete center element with CSS.
Fix #6901. Would generate invalid HTML5.
2014-06-21 09:43:00 +02:00
Dmitriy Zaporozhets 0771109bb8 Fix permission issue with highest access level for group
If user was a member of both group and project and group access level
was higher it was not respected and user got lowest project access
level. Now it is fixed and user get highest access level

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-06-20 12:54:03 +03:00
Dmitriy Zaporozhets 8401ec56e3 Show spinner when loading MR diff
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-06-20 12:17:06 +03:00
Marin Jankovski 26d1bd7c2a Set return url as param. 2014-06-19 14:20:25 +02:00
Dmitriy Zaporozhets e59e48d75a Merge branch 'fix-500-admin-transfer' into 'master'
Fix 500 error when transfer project from admin area

Fixes #1349
2014-06-19 11:16:42 +00:00
Dmitriy Zaporozhets f3369e3a00 Fix project trasnfer for admin area
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-06-19 13:20:42 +03:00
Marin Jankovski a1eb1ad168 Redirect back to current page after sign in. 2014-06-19 11:24:59 +02:00