Commit Graph
6556 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets ae1be43722 Make sidebar smaller by 10px 2015-01-21 15:58:35 -08:00
Dmitriy Zaporozhets 45bebd76d6 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-01-21 15:56:29 -08:00
Dmitriy Zaporozhets 6a1aa4763a Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-01-21 15:56:20 -08:00
Marin Jankovski ab2a6111ee Fix the sentence on notification page. 2015-01-21 13:36:27 -08:00
Dmitriy Zaporozhets 8a66a10c2a Merge branch 'fix_avatar_url' into 'master'
Remove unnecessary / from avatar url

## What does this MR do?

This MR removes the unecessary / from the avatar url.

## What Use Case does this MR solve?

The // in the url cold lead to avatars not being displayed (reported on IRC)

With this MR the avatar url changes from
http://localhost:3000//uploads/user/avatar/1/gitlab_logo.png
to
http://localhost:3000/uploads/user/avatar/1/gitlab_logo.png

@dblessing Can you take a look?

See merge request !303
2015-01-21 20:04:35 +00:00
Dmitriy Zaporozhets e5d491b7c7 Merge pull request #7389 from skv-headless/show-submodules-in-diff
show diff in submodules
2015-01-21 11:53:09 -08:00
Dmitriy Zaporozhets 2395b8f079 Merge branch 'show_tags_in_commit_view' into 'master'
Show tags in commit view

### What does this MR do?
With this MR you can see the assigned tags for a commit in the commit view.
### Are there points in the code the reviewer needs to double check?
I don't think so. But it would be awesome if the reviewer can tell me how to add a tag to the sample_commit in spec/support/repo_helpers.rb.
Then I can add a test for the new tag_names_contains method as soon as possible :)

### Why was this MR needed?
At the moment if one click on a commit will see details such as: parent commit, amount of additions, deletions, but will not see if this commit has Tag linked to it.
Showing branch, tag details will give better overview about the commit

### What are the relevant issue numbers / Feature requests?
Feature request: http://feedback.gitlab.com/forums/176466-general/suggestions/3962044-show-tags-in-commit-view
### Screenshots
![gitlab_feature_show_tags](https://gitlab.com/uploads/haynes/gitlab-ce/771c1a36bb/gitlab_feature_show_tags.png)

@dblessing Can you take a look at this MR as well please?

See merge request !297
2015-01-21 18:23:46 +00:00
Valery Sizov ab7a79bf3b developer can push to protected branches 2015-01-20 17:34:23 -08:00
Valery Sizov 6da0ab7d60 Github Importer: AJAX update status 2015-01-20 11:52:55 -08:00
Dmitriy Zaporozhets f9fb76670f Merge pull request #8603 from jubianchi/hook-merge-request-action
Add action property to merge request hook
2015-01-20 09:12:20 -08:00
jubianchi 4ffdb83e71 Add action property to merge request hook 2015-01-20 10:50:24 +01:00
Job van der Voort 54f9432255 fix border radius top left for descriptions 2015-01-19 22:25:09 -08:00
Dmitriy Zaporozhets e3987bb6b1 Merge pull request #8585 from duduribeiro/fix_email_in_ssh_help_page
Fix the email variable substituation in ssh help page
2015-01-19 15:01:00 -08:00
Valery Sizov 1809b3ee36 Spinach for admin applications 2015-01-19 11:18:00 -08:00
Headless 3d2aaa169e show diff in submodules 2015-01-19 17:18:08 +03:00
Hannes Rosenögger 6bf58e76bd Remove unnecessary / from avatar url
So http://localhost:3000//uploads/user/avatar/1/avatar.png
becomes http://localhost:3000/uploads/user/avatar/1/avatar.png
2015-01-19 14:08:06 +01:00
Dmitriy Zaporozhets a5f5849340 Dont allow event content to overflow it UI limits 2015-01-18 20:11:17 -08:00
Dmitriy Zaporozhets 85c0ce2e1a Reduce sidebar width by 10px 2015-01-18 19:53:46 -08:00
Dmitriy Zaporozhets fd41e39906 Votes block has less priority than assignee/milestone 2015-01-18 19:42:09 -08:00
Dmitriy Zaporozhets 3a46ea4ce6 Few improvements to mobile UI 2015-01-18 19:39:43 -08:00
Dmitriy Zaporozhets 3e17d15661 Improve edited ago helpers 2015-01-18 19:39:29 -08:00
Dmitriy Zaporozhets 77adf81e87 Fix tests 2015-01-18 19:13:41 -08:00
Dmitriy Zaporozhets b78c38e9dc Fix comment text overflow and wrong margin 2015-01-18 19:03:50 -08:00
Dmitriy Zaporozhets 390e380225 Merge branch 'hipchat_placeholder' into 'master'
Add placeholder values to hipchat service

This MR adds placeholder values to the hipchat service.
This should prevent issues like #279 or #772 that popped up because people didn't know what exactly they are supposed to enter in the fields.

See merge request !294
2015-01-18 19:23:39 +00:00
Dmitriy Zaporozhets ab651ef45c Merge branch 'syntax_highlight_diff_email' into 'master'
Add syntax colors to diffs in email-on-push notifications

## What does this MR do?
This MR adds syntaxhighlighting to the email-on-push notifications.
## Are there points in the code the reviewer needs to double check?
No
## Why was this MR needed?
Currently the diff in email-on-push notifications is just a monochrome diff that's hard to read.
This MR adds colored syntaxhighlighting to the mails.
## What are the relevant issue numbers / Feature requests?
* It closes https://github.com/gitlabhq/gitlabhq/issues/6994
* There is a Discussion in the Feedback Forum: http://feedback.gitlab.com/forums/176466-general/suggestions/5802256-add-color-to-diffs-in-email-on-push-service-to-htm
* A pull request for this already existed, but was closed. https://github.com/gitlabhq/gitlabhq/pull/7739

## Screenshots
see prior Pull Request for a screenshot

See merge request !295
2015-01-18 19:16:32 +00:00
Dmitriy Zaporozhets e540498f2b Merge branch 'project_search_case_insensitive' into 'master'
Make search for projects case insensitive

### What does this MR do?

This MR makes the search for projects case insensitive.

### Why was this MR needed?
Currently the search for projects is case sensitive.
You can test this on gitlab.com with the search string "perforce" for example.
* perforce returns 2 projects
* Perforce returns 5 projects
* PERFORCE returns 0 projects

This makes it harder to find the projects you are looking for.
With this MR users can find more projects, since they don't need to worry about not seeing some projects just because of an upper letter.

@dblessing Can you take a look at this? :)

See merge request !296
2015-01-18 18:54:24 +00:00
Dmitriy Zaporozhets ad18f91e9e Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-01-18 10:52:53 -08:00
Dmitriy Zaporozhets 0c26f871e3 Merge branch 'fix_sort_dropdown_style' into 'master'
Fix sort dropdown partially not showing on screen.

This MR fixes the sort dropdown menu partially not showing on the screen.
Closes gitlab-org/gitlab-ce#986

Screenshot of the Problem:
![Problem](https://gitlab.com/uploads/gitlab-org/gitlab-ce/8d442e872c/Screenshot_from_2015-01-17_15_18_41.png)

@dzaporozhets Can you take a look at this?

See merge request !299
2015-01-18 18:47:06 +00:00
Dmitriy Zaporozhets 539be2441a Merge pull request #8176 from yglukhov/stability-fix
Stability improvement
2015-01-18 10:36:26 -08:00
Hannes Rosenögger 1e9e3fc73d Make the project search case insensitive 2015-01-18 12:28:29 +01:00
Dmitriy Zaporozhets d84a2ab641 Expand sidebar only for large devices 2015-01-17 23:01:45 -08:00
Dmitriy Zaporozhets 7d5d5e53b1 Merge branch 'doorkeeper_applications_scafold' 2015-01-17 16:17:45 -08:00
Dmitriy Zaporozhets a81081aa72 Small improvements to CI 2015-01-17 16:17:34 -08:00
Valery Sizov 20028523b5 Application admin scaffold 2015-01-17 15:40:09 -08:00
Dmitriy Zaporozhets 045fe8959e Merge branch 'fix-commits-pagination' into 'master'
Fix commits pagination

See merge request !1406
2015-01-17 23:39:34 +00:00
Dmitriy Zaporozhets ef0b15c552 Fix commits pagination 2015-01-17 14:54:54 -08:00
Hannes Rosenögger 8243eb3f0e Show tags in commit view 2015-01-17 19:22:35 +01:00
Hannes Rosenögger e460e04e16 Add Diff syntax colors for email-on-push notifications 2015-01-17 19:19:28 +01:00
Hannes Rosenögger 33fea08944 Add placeholders to hipchat service 2015-01-17 18:06:43 +01:00
Hannes Rosenögger b0ec61500e Fixes the sort dropdown goind outside of the screen
see gitlab-org/gitlab-ce#986
2015-01-17 16:39:29 +01:00
Dmitriy Zaporozhets f2eb234c06 Fix passign args to original authenticate_user! 2015-01-16 18:12:15 -08:00
Dmitriy Zaporozhets 38600e328b Validate application settings only if column exists 2015-01-16 17:22:17 -08:00
Dmitriy Zaporozhets e7f772550c Add tests to home page url redirect 2015-01-16 16:09:20 -08:00
Dmitriy Zaporozhets 41d7be3ce1 Allow to specify home page for non logged-in users 2015-01-16 16:01:15 -08:00
Dmitriy Zaporozhets 03a669d81d Fix broadcast message overflow 2015-01-16 00:09:25 -08:00
Dmitriy Zaporozhets 33f27fcb6a Remvoe unnecessary expand buttons 2015-01-15 23:34:30 -08:00
Dmitriy Zaporozhets 4dfa1ed269 Add some mobile fixes to UI 2015-01-15 23:24:30 -08:00
Carlos Ribeiro 714ef62264 Fix the email variable substituation in ssh help page 2015-01-15 23:06:32 -02:00
Dmitriy Zaporozhets eb84ee7a20 Better label for diffs 2015-01-15 15:19:58 -08:00
Dmitriy Zaporozhets 41f09bed82 Re-order admin dashboard 2015-01-15 15:19:04 -08:00