Commit Graph
13497 Commits
Author SHA1 Message Date
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 577fe18073 Merge pull request #7878 from cirosantilli/rm-seed-password-confirmation
Remove unneeded password_confirmation from seed.
2015-01-18 10:38:41 -08:00
Dmitriy Zaporozhets 539be2441a Merge pull request #8176 from yglukhov/stability-fix
Stability improvement
2015-01-18 10:36:26 -08:00
Dmitriy Zaporozhets 0533ae7eec Merge pull request #8464 from dserodio/group-api-description
Add description attribute to group API (GET and POST)
2015-01-18 10:35:25 -08:00
Dmitriy Zaporozhets 57c121aac9 Merge pull request #8592 from pkgr/add-krb5-dependency-for-packaging
Add krb5 dependency for packaging
2015-01-18 10:34:01 -08:00
Jeroen van Baarsen ec29ce4b02 Merge pull request #8307 from cirosantilli/project-api-comment-typo
Typo in project API events comment
2015-01-18 19:05:02 +01:00
Cyril Rohr 5af05e3d3c Use new way of defining services on packager.io 2015-01-18 17:55:48 +00:00
Cyril Rohr c9823b9755 Add missing krb5 devel dependency when building packages 2015-01-18 17:55:48 +00:00
Jeroen van Baarsen b1c79eaf94 Merge pull request #8604 from Razer6/fix_gitlab_shell_doc
Update gitlab-shell in docs to 2.4.1
2015-01-18 15:00:20 +01:00
Robert Schilling 15b3d467c1 Merge branch 'wip-documentation' into 'master'
Add description to merge request API documentation

See merge request !301
2015-01-18 13:33:16 +00:00
Loic Dachary 5bd463c1d2 Add description to merge request
The description can be provided when creating or updating a merge
request.

Signed-off-by: Loic Dachary <loic@dachary.org>
2015-01-18 14:09:56 +01:00
Robert Schilling 5ee99290be Update gitlab-shell in docs to 2.4.1 2015-01-18 13:04:58 +01: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 e460e04e16 Add Diff syntax colors for email-on-push notifications 2015-01-17 19:19:28 +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
Job van der Voort e6ca3a5857 Merge branch 'update_import_doc' into 'master'
Update import doc

Documentation update for #1900

See merge request !1405
2015-01-17 07:01:53 +00:00
Marin Jankovski 99647a1b70 Update import.md documentation to specify correct directory ownership and permissions. 2015-01-16 19:36:44 -08:00
Dmitriy Zaporozhets acc3366827 Merge branch 'configure-home-page' into 'master'
Allow to specify home page for non logged-in users

See merge request !1404
2015-01-17 03:34:40 +00: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
Daniel Serodio bb80bf3612 Update changelog 2015-01-16 16:55:35 -02:00
Daniel Serodio ad18fcd0e6 Document the description attribute of groups API 2015-01-16 16:52:48 -02:00
Daniel Serodio 6ac8bb0f7c Add description attribute to group API (GET and POST) 2015-01-16 16:52:48 -02:00
Dmitriy Zaporozhets ada6c6080b Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2015-01-16 08:49:18 -08:00
Dmitriy Zaporozhets 5e04977582 Fix signup settings 2015-01-16 08:49:07 -08:00
Dmitriy Zaporozhets 9c0d241e27 Fix tests 2015-01-16 08:47:58 -08:00
Dmitriy Zaporozhets a98727990f Merge branch 'mobile-fixes' into 'master'
Mobile fixes

See merge request !1403
2015-01-16 10:12:22 +00: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
Dmitriy Zaporozhets 67b42e26cf Fix shell version in manual installation doc 2015-01-15 17:23:22 -08: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
Dmitriy Zaporozhets e683d05453 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-01-15 14:57:55 -08:00
Dmitriy Zaporozhets 3d3c7efa3e Increase font size for lists 2015-01-15 14:55:45 -08:00
Dmitriy Zaporozhets 500dab098b Merge pull request #8568 from Sheigutn/master
Add support for colored header on Android Lollipop with Chrome
2015-01-15 14:42:58 -08:00
Dmitriy Zaporozhets d4a8471fe9 Merge pull request #7987 from cirosantilli/get-instead-match
Replace match via get with get on routes
2015-01-15 14:42:24 -08:00
Dmitriy Zaporozhets 11591573e1 Merge pull request #7925 from cirosantilli/unused-arguments
Remove or prepend underscore _ to unused method arguments
2015-01-15 14:42:03 -08:00
Dmitriy Zaporozhets dbd54fad51 Merge pull request #7905 from cirosantilli/visible-false
Change always passing visible false tests.
2015-01-15 14:41:41 -08:00