Commit Graph
13540 Commits
Author SHA1 Message Date
Marin Jankovski 737f6516e6 Update new services with initialization based on existing data. 2015-01-23 09:14:45 -08:00
Marin Jankovski e9d6d1e51a Custom issue tracker service. 2015-01-20 16:55:35 -08:00
Marin Jankovski 09de0bfc37 Redmine doesn't require title and description change 2015-01-20 16:55:12 -08:00
Marin Jankovski 62c00661c4 Allow creation of the jira and redmine services. 2015-01-20 16:47:29 -08:00
Marin Jankovski 9371c6b901 Add issue tracker services. 2015-01-20 16:46:27 -08:00
Dmitriy Zaporozhets 148740cc67 Merge branch 'github_importer' into 'master'
Github importer: AJAX update status

#1907

See merge request !1417
2015-01-20 21:07:37 +00:00
Dmitriy Zaporozhets 5ade3a6b78 We dont support ruby 2.2 yet 2015-01-20 11:59:35 -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
Dmitriy Zaporozhets 0af2a161fa Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-01-19 23:09:09 -08:00
Dmitriy Zaporozhets a680b41eac Merge branch 'github_importer_feature_desc' into 'master'
Github importer feature desc

@job Can you take a look?

See merge request !1414
2015-01-20 07:08:35 +00:00
Dmitriy Zaporozhets 902ecdf75f Merge branch 'border-radius-fixx' into 'master'
Border radius fixx

Fixes the border radius in the description box.

See merge request !1416
2015-01-20 07:04:47 +00:00
Job van der Voort 54f9432255 fix border radius top left for descriptions 2015-01-19 22:25:09 -08:00
Valery Sizov c92de64bdb GitHub importer description 2015-01-19 21:43:25 -08:00
Dmitriy Zaporozhets d960b9aea2 Merge branch 'master' into 'master'
print validation errors when gitlab-rake gitlab:import:repos fails for project

Currently, when gitlab-rake gitlab:import:repos is not able to import a project it justs prints "Failed trying to create project" to the console. There seems to be no way to find out what exactly has failed. Since the check uses validation, it should at least print the validation issues. That might be a bit cryptic, but may be better than leaving the user in the dark completely.

See merge request !147
2015-01-20 05:03:22 +00: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 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