home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-21 02:26:12 +10:00
Code Issues Packages Projects Releases Wiki Activity
22,224 Commits 48 Branches 340 Tags
d453b24aca178fe74dd673b94de50d1f14fb651a
Commit Graph
22224 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Kamil Trzcinski d3886f9d41 Added migration docs and updated installation documentation 2015-09-16 10:58:33 +02:00
Dmitriy Zaporozhets 7d59ba00b9 Merge branch 'fix-api-mr-sort' into 'master' 
Fix broken sort in merge request API

This MR fixes a bug in the API in querying for merge requests with a `sort_by` field would never change the ordering of the results.

Closes #2266

See merge request !1305
 2015-09-16 07:29:29 +00:00
Douwe Maan 84d57bc703 Make code clearer 2015-09-16 09:14:04 +02:00
Douwe Maan 63b0437323 Merge branch 'reply-by-email-docs' into 'master' 
Expand Reply by email documentation

TODO:

- [x] Verify this works on dev server
- [ ] Figure out SSL somehow: http://www.postfix.org/TLS_README.html (Moved to #2453)

See merge request !1193
 2015-09-16 07:09:56 +00:00
Douwe Maan b92c03730b Tweak text 2015-09-16 09:09:09 +02:00
Douwe Maan 7bb22831a1 Update mail_room 2015-09-16 09:03:32 +02:00
Stan Hu 1c289ac0c3 Fix broken sort in merge request API 
Closes #2266
 2015-09-15 22:55:22 -07:00
Stan Hu c61b6eeb2f Merge pull request #9634 from allistera/users-autocomplete-sort-order 
Sorted autocomplete users list by name
 2015-09-15 16:41:15 -07:00
Stan Hu db6658299e Merge pull request #9633 from szechyjs/update-fogbugz-gem 
bump fogbugz gem
 2015-09-15 16:40:32 -07:00
Kamil Trzcinski df7d807d5a Migrate CI services 2015-09-16 00:43:04 +02:00
Kamil Trzcinski 1b464bfe03 Update documentation and config files 2015-09-16 00:28:59 +02:00
Kamil Trzcinski f2d8902341 Start working on migration docs 2015-09-16 00:09:09 +02:00
Kamil Trzcinski 9c5833d5ac Add rake task for easy migration of SQL dumps 2015-09-16 00:09:09 +02:00
Kamil Trzcinski 2f2b9f67c2 Fix backup tests 2015-09-16 00:06:41 +02:00
Allister Antosik c9389d0e74 Sorted autocomplete users list by name 2015-09-15 22:48:24 +01:00
Kamil Trzcinski 416d98b497 Fix: models/ci/project_spec.rb once again 2015-09-15 23:42:57 +02:00
Kamil Trzcinski fb9cb3f06c Merge remote-tracking branch 'origin/master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g 2015-09-15 23:20:00 +02:00
Kamil Trzcinski 2d8c4273ef Fix models/ci/mail_service_spec.rb 
- Change Notify to Ci::Notify
- Downgrade sidekiq to fix CE errors: otherwise we need to check deliverables
 2015-09-15 23:18:52 +02:00
Kamil Trzcinski 757fdd34dc Revert "Fix: models/ci/mail_service_spec.rb" 
This reverts commit 345ff6cbf9.

This requires sidekiq >= 3.4 and fixed all other CE tests
 2015-09-15 23:09:04 +02:00
Stan Hu 61737af503 Merge branch 'fix-upload-ui' into 'master' 
Cleanup some html/css for upload feature

* fix colors to match UI style
* cleanup templates from meaningless code
* improve placeholders
* remove code duplication in template
* improve error handling: remove file automatically

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

For #2520

See merge request !1297
 2015-09-15 20:56:11 +00:00
Kamil Trzcinski c9d914a392 Fix builds directory store 2015-09-15 22:53:38 +02:00
Kamil Trzcinski ddde3e3ae8 Remove gitlab_ci_meta from gems 2015-09-15 22:42:30 +02:00
Kamil Trzcinski e21deaee8e Merge remote-tracking branch 'origin/master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g 
# Conflicts:
#	Gemfile.lock
 2015-09-15 22:40:35 +02:00
Drew Blessing 0ad669bb5b Merge branch 'slack-help-text' into 'master' 
Add a help text to the Slack Service

When setting up the service I was not sure which webhook I should use, by adding
this Help text I hope we can help people in the future with setting up this hook

See merge request !1302
 2015-09-15 20:36:32 +00:00
Kamil Trzcinski 7e2dbcbe09 Fix: models/ci/project_spec.rb once again 2015-09-15 22:36:25 +02:00
Kamil Trzcinski 0d23676f9d Fix: rubocop 2015-09-15 22:24:33 +02:00
Kamil Trzcinski 81d98112d4 Fix: tasks/gitlab/backup_rake_spec.rb 2015-09-15 22:21:51 +02:00
Kamil Trzcinski d3b62e6837 Add missing builds/ folder to fix backup tests 2015-09-15 22:19:31 +02:00
Kamil Trzcinski fe42de3a48 Fix: features/ci/admin/runners_spec.rb 2015-09-15 22:15:28 +02:00
Jared Szechy c95b8476c7 bump fogbugz gem 2015-09-15 16:09:32 -04:00
Stan Hu d9af6f79ed Change the replace placeholder to use the filename 
Dynamically adjust placedholder for uploads and fix Dropzone event handlers

Override error handler to prevent error messages from being inserted underneath image preview

Fix tests

Use regexp instead of startsWith for better browser compatibility

Remove duplicate code in _replace.html.haml and use one template

Remove files upon error and retain alert messages until user adds a new file
 2015-09-15 13:07:32 -07:00
Robert SchillingandStan Hu 0a8ef29b3d Improve wording for header and placeholders 2015-09-15 13:07:32 -07:00
Dmitriy ZaporozhetsandStan Hu e14aa19e39 Cleanup some html/css for upload feature 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-09-15 13:07:32 -07:00
Kamil Trzcinski 29b3279a95 Fix: features/ci/events_spec.rb once again 2015-09-15 22:04:42 +02:00
Kamil Trzcinski 874166d80f Fix models/ci/web_hook_spec.rb 2015-09-15 22:01:31 +02:00
Stan Hu 400b3d26b3 Merge pull request #9632 from szechyjs/update-fogbugz-gem 
Use fixed version of fogbugz gem
 2015-09-15 13:01:02 -07:00
Kamil Trzcinski 8d5c9935ff Fix: models/ci/project_spec.rb 2015-09-15 22:00:17 +02:00
Kamil Trzcinski 209c72c4a1 Fix: services/ci/create_project_service_spec.rb 2015-09-15 21:53:04 +02:00
Kamil Trzcinski 345ff6cbf9 Fix: models/ci/mail_service_spec.rb 2015-09-15 21:47:01 +02:00
Kamil Trzcinski d495e4dff6 Fix: models/ci/build_spec.rb 2015-09-15 21:31:29 +02:00
Kamil Trzcinski 10cf1050d0 Fix: helpers/ci/runners_helper_spec.rb 2015-09-15 21:27:10 +02:00
Kamil Trzcinski 5f315bd565 Fix: helpers/ci/application_helper_spec.rb 2015-09-15 21:24:57 +02:00
Kamil Trzcinski 6cc15cf721 Fix: features/ci/triggers_spec.rb 2015-09-15 21:23:45 +02:00
Jared Szechy 93bb8f14ef Use fixed version of fogbugz gem 
This allows us to properly handle authentication errors.
 2015-09-15 15:23:30 -04:00
Kamil Trzcinski 64ef1b3dcd Fix: features/ci/triggers_spec.rb 2015-09-15 21:22:51 +02:00
Kamil Trzcinski 5285e01d54 Fix: features/ci/runners_spec.rb 2015-09-15 21:21:46 +02:00
Kamil Trzcinski 9621f433a7 Fix: features/ci/projects_spec.rb 2015-09-15 21:06:12 +02:00
Kamil Trzcinski a598bd91f9 Refactor ci_admin_event and fix features/ci/events_spec.rb 2015-09-15 20:56:20 +02:00
Kamil Trzcinski 6d0980b011 Fix: ci_*_build factory should be valid 2015-09-15 20:51:03 +02:00
Jeroen van Baarsen 34e1ce130f Add a help text to the Slack Service 
When setting up the service I was not sure which webhook I should use, by adding
this Help text I hope we can help people in the future with setting up this hook

Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
 2015-09-15 20:46:11 +02:00