home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-17 00:26:07 +10:00
Code Issues Packages Projects Releases Wiki Activity
13,523 Commits 48 Branches 340 Tags
e3987bb6b150a255a76310cc1eabda8945e2f0cd
Commit Graph
13523 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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 a4bd1f2ae3 Merge branch 'update_doc_github_importer1' into 'master' 
Update doc github importer.

See merge request !1413
 2015-01-19 22:19:45 +00:00
Valery Sizov fe1e3db5a3 fix url in update doc 2015-01-19 14:18:31 -08:00
Valery Sizov 63a32bc29b Merge branch 'update_doc_github_importer' into 'master' 
Update doc github importer

See merge request !1412
 2015-01-19 22:15:16 +00:00
Valery Sizov b63e6e5abc fix url in update doc 2015-01-19 14:14:00 -08:00
Dmitriy Zaporozhets 20477eb5ca Merge branch 'update_oauth_documentation' into 'master' 
Update oauth documentation

See merge request !1411
 2015-01-19 20:59:09 +00:00
Dmitriy Zaporozhets 0166d8d8e5 Merge branch 'spinach_admin_application' into 'master' 
Spinach admin application

See merge request !1410
 2015-01-19 20:58:12 +00:00
Valery Sizov d5ae521cf7 update documentation regarding github_importer 2015-01-19 12:55:44 -08:00
Valery Sizov 1809b3ee36 Spinach for admin applications 2015-01-19 11:18:00 -08:00
Marin Jankovski 465f41673a Merge branch 'database-fix-setting' into 'master' 
Check for database connection when running current_application_settings

The PG connection errors don't always end up being caught as ActiveRecord::NoDatabaseError. So when doing a precompile without the database (like when using the omnibus), an exception was being thrown.

See merge request !292
 2015-01-19 18:43:27 +00:00
Dmitriy Zaporozhets 2fba31890e Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-01-18 20:15:18 -08:00
Dmitriy Zaporozhets a5f5849340 Dont allow event content to overflow it UI limits 2015-01-18 20:11:17 -08:00
Drew Blessing a3ef61de92 Merge pull request #8040 from drag00n/updatedhint 
Use full path from root of project.
 2015-01-18 22:02:46 -06:00
Dmitriy Zaporozhets 85c0ce2e1a Reduce sidebar width by 10px 2015-01-18 19:53:46 -08:00
Dmitriy Zaporozhets 31cddc152c Fix tests for edited_ago helpers 2015-01-18 19:47:58 -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
drag00nanddrag00n b97218db4d Use full path from root of project. 
Remove markdown syntax from config file
 2015-01-18 21:34:35 -05: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 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
Carlos Ribeiro d76d897492 Change to single-quoted strings in help_pages_spec 2015-01-18 14:21:18 -02: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 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
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