Commit Graph
5247 Commits
Author SHA1 Message Date
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
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
Dmitriy Zaporozhets ab5cac7b9a Improve design page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-06-19 10:14:59 +03:00
Dmitriy Zaporozhets 2a52be9c3e Move nprogess color to variable
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-06-19 09:58:42 +03:00
Dmitriy Zaporozhets 6a50414c57 Replace bg_style_color with bg_primary
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-06-19 00:17:38 +03:00
Dmitriy Zaporozhets 3ee7209a68 Move commit css to commits section. Remove box-shadow for text fields to match global style
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-06-18 23:53:19 +03:00
Dmitriy Zaporozhets 4e145bd856 Move basic header styles to theme file
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-06-18 23:43:33 +03:00
Sytse Sijbrandij e0c725c55f Move Go header to the top of the head to work around broken Go parsing. 2014-06-18 16:18:38 +02:00
Marin Jankovski 8301557966 Add tabindex -1 to skip on tabbing. 2014-06-18 14:21:24 +02:00
Jacob Vosmaer 780d868fec Revert "Merge branch 'fix-email-threading' into 'master'"
This reverts commit 97fd990ecd, reversing
changes made to f451a697e0.

Conflicts:
	app/mailers/emails/notes.rb
	app/mailers/emails/projects.rb
2014-06-18 13:41:12 +02:00
Dmitriy Zaporozhets c1ff1fdeff Merge branch 'show-them' into 'master'
Improve the spelling on the project settings page
2014-06-18 11:33:18 +00:00
Sytse Sijbrandij ca1248fb2e Spelling, needs to end the sentence. 2014-06-18 13:27:55 +02:00
Sytse Sijbrandij af67d58fa4 Spelling, you're showing the settings. 2014-06-18 13:24:49 +02:00
Dmitriy Zaporozhets 73f91da8b1 Fix project deletion and tests 2014-06-17 23:49:17 +03:00
Dmitriy Zaporozhets 6d352790c4 Fix user notifications 2014-06-17 22:54:21 +03:00
Dmitriy Zaporozhets 2d87556847 Remove rails observers from application 2014-06-17 22:51:43 +03:00
Dmitriy Zaporozhets a90a201d0e Remove user observer 2014-06-17 22:32:35 +03:00
Dmitriy Zaporozhets a7d5052cd4 Remove SystemHook observer 2014-06-17 22:20:10 +03:00
Dmitriy Zaporozhets 6149dba518 Remove NotesObserver 2014-06-17 22:09:01 +03:00
Dmitriy Zaporozhets a7f3672b75 Remove project observer 2014-06-17 21:53:26 +03:00
Dmitriy Zaporozhets 66e068bbdf Fix event creation 2014-06-17 21:45:03 +03:00
Dmitriy Zaporozhets 9e3094b232 Remove UsersGroup observer 2014-06-17 21:36:40 +03:00
Dmitriy Zaporozhets b3a90aba41 Remove ProjectActivityCacheObserver 2014-06-17 21:23:43 +03:00
Dmitriy Zaporozhets 91c38a199f Add some semantic to our html
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-06-17 17:13:30 +03:00
Dmitriy Zaporozhets 3a8413247b Use search field instead of text field
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-06-17 16:00:41 +03:00
Dmitriy Zaporozhets 085a93d4a5 Replace ok with circle for boolean icon
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-06-16 22:31:15 +03:00
Dmitriy Zaporozhets 547ea3c80d Merge branch 'kanban-fixes' into 'master'
Kanban improvements

When drag from unassigned to assigned column - issue assignee avatar updated
2014-06-16 14:43:07 +00:00
Dmitriy Zaporozhets 0014326ded Small UI fix
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-06-16 14:26:38 +03:00
Dmitriy Zaporozhets 8d240fb0e7 Show/hide issue assignee avatar depends on drag-n-drop column in milestone view
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-06-16 12:17:34 +03:00
Alex Elman e6722cb178 Provide better email subject lines from email on push service
If one commit is pushed, display the commit message in the subject
line. Otherwise display the number of commits pushed to the repository.
2014-06-15 09:53:00 -05:00
Dmitriy Zaporozhets d74bf464d3 Postgres requires not-null value for boolean field
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-06-15 09:40:24 +03:00
Dmitriy Zaporozhets dbb7610365 Merge branch 'responsive-sidebar' into 'master'
Responsive sidebar fixes

This fixes two major issues with the responsive sidebar

1. Overlapping content by the label:
The label and sidebar is now always on the right side of the screen. This makes it always easy to find (better UX) and prevents it from overlapping most content. Additionally, on xs screens, instead of the side-attached label, for some pages it will show an extra button in the head instead of a buttons that overlaps.

2. Pop up of sidebar on changing pages.
2014-06-15 06:02:12 +00:00
Job van der Voort 204fee4f41 move all sidebars to one side for improved UX; add button in head of projects/issues and milestones instead of tab on side of screen to prevent overlapping of content 2014-06-14 22:44:23 +02:00
Dmitriy Zaporozhets d29bb23a68 Update gitlab-grit to newer version with normal diff collection. Show if file mode was changed
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-06-14 22:54:56 +03:00
Dmitriy Zaporozhets b48bb4a77c Change mode for view files
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-06-14 20:35:40 +03:00
Dmitriy Zaporozhets 9e21e96b2a Fix dashboard "show more project" link padding
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-06-14 20:33:12 +03:00
Dmitriy Zaporozhets 72f0a6b286 Fix blob breadcrumb
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-06-14 20:01:56 +03:00
Dmitriy Zaporozhets 56cb6d8899 Fix help css
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-06-14 19:58:54 +03:00
Dmitriy Zaporozhets 52b7fa248a Darker color for page title
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-06-14 19:55:26 +03:00