Commit graph

3891 commits

Author SHA1 Message Date
Dmitriy Zaporozhets a7b572d0ab Fixed #2333 2012-12-22 11:59:05 +02:00
Dmitriy Zaporozhets 8fe58ed541 Merge pull request #2330 from gitlabhq/v4.0-api-fixes
V4.0 API fixes
2012-12-22 00:43:17 -08:00
Dmitriy Zaporozhets 86673a66b7 Fix fark background highlight 2012-12-21 23:22:52 +02:00
Riyad Preukschas eaa99478a7 Up API version to v3 2012-12-21 18:55:39 +01:00
Riyad Preukschas 8f01190eb5 Remove all references tp the project code parameter from the API 2012-12-21 18:47:04 +01:00
Riyad Preukschas 931ec399bd Remove the code parameter from the projects API 2012-12-21 18:43:46 +01:00
Dmitriy Zaporozhets b510f8c496 Fixed tests 2012-12-21 13:37:44 +02:00
Dmitriy Zaporozhets 4398bdf2c9 Merge branch 'koenpunt-gh-issue-1509' 2012-12-21 13:07:47 +02:00
Dmitriy Zaporozhets a47032bc29 Merge branch 'gh-issue-1509' of https://github.com/koenpunt/gitlabhq into koenpunt-gh-issue-1509
Conflicts:
	vendor/assets/javascripts/branch-graph.js
2012-12-21 13:07:34 +02:00
Dmitriy Zaporozhets a567d596f8 Merge pull request #2305 from gitlabhq/fix_gfm_auto_complete
Fix and refactoring gfm_autocomplete
2012-12-21 02:47:55 -08:00
Riyad Preukschas 0efc903eef Fix text in project move mail 2012-12-20 22:25:42 +01:00
Dmitriy Zaporozhets 4b649c2f4d Release candidate 1 2012-12-20 23:12:38 +02:00
Dmitriy Zaporozhets 9b07ed0690 Merge pull request #2323 from riyad/rename-tasks
Rename tasks
2012-12-20 13:06:14 -08:00
Dmitriy Zaporozhets 2a3f5dae0f Fix email send on close/reopen issue. Display project name with namespace. remove css style 2012-12-20 23:04:27 +02:00
Riyad Preukschas 1acff973c8 Rename add_user_to_project_teams to gitlab:import:user_to_projects
Rename add_users_to_project_teams to gitlab:import:all_users_to_all_projects
2012-12-20 21:52:37 +01:00
Riyad Preukschas c9bf2bb288 Rename gitlab:app:backup_* to gitlab:backup:*
Rename gitlab:app:db_* to gitlab:backup:db:*
Rename gitlab:app:repo_* to gitlab:backup:repo:*
Rename *_dump to *_create
2012-12-20 21:52:35 +01:00
Riyad Preukschas 56f9a674a6 Add gitlab:satellites:create as an alias for gitlab:enable_automerge 2012-12-20 21:52:26 +01:00
Dmitriy Zaporozhets 75dd704294 Send update instructions after project namespace id changed or namespace path changed 2012-12-20 22:16:51 +02:00
Riyad Preukschas 501f048846 Rename gitlab:app:enable_automerge to gitlab:enable_automerge 2012-12-20 20:22:25 +01:00
Riyad Preukschas e3a7e43ff4 Rename gitlab:activate_namespaces to gitlab:enable_namespaces 2012-12-20 20:22:25 +01:00
Dmitriy Zaporozhets d188adfd97 Changelog updated. Added warnings to username form 2012-12-20 21:16:42 +02:00
Valeriy Sizov 77d632890b refactoring gfm_autocomplete 2012-12-20 20:52:12 +02:00
Dmitriy Zaporozhets d8d95c85ae Merge pull request #2321 from riyad/update-contrib-docs
Update Contribution Guide
2012-12-20 10:46:57 -08:00
Riyad Preukschas 691799a3fe Update CONTRIBUTING.md 2012-12-20 18:53:23 +01:00
Riyad Preukschas 27ff15ad3e Remove development.md 2012-12-20 18:53:07 +01:00
Dmitriy Zaporozhets 1dcf19c924 Merge pull request #2247 from riyad/update-settings
Reorganize settings
2012-12-20 08:47:38 -08:00
Riyad Preukschas 4c8ac320dd Updated gitlab:check task 2012-12-20 16:54:28 +01:00
Riyad Preukschas 757c7a5291 Fix gravatar and ldap config 2012-12-20 16:54:28 +01:00
Riyad Preukschas 19eb637419 Update uses of Gitolite.config.foo settings 2012-12-20 16:54:28 +01:00
Riyad Preukschas b2e46f44ce Refactor Settings initializer
All overrides are marked as deprecated.
Default settings are at the bottom.
2012-12-20 16:54:28 +01:00
Riyad Preukschas 4496903950 Rename config options 2012-12-20 16:54:28 +01:00
Dmitriy Zaporozhets 9bc315bb25 Merge pull request #2211 from jojosch/fix-dark-code-preview
fix dark code preview background when displaying long lines
2012-12-20 07:46:59 -08:00
Dmitriy Zaporozhets b772c2c3f0 Fix issue update.js 2012-12-20 16:42:13 +02:00
Dmitriy Zaporozhets a7aee9d1ee Pretty compare mode 2012-12-19 20:14:05 +03:00
Dmitriy Zaporozhets 40c6d87175 Merge pull request #2315 from koenpunt/gh-issue-513
Added compare switch
2012-12-20 06:15:39 -08:00
Koen Punt b2e31692a5 Added icon 2012-12-20 14:58:07 +01:00
Koen Punt d11f9a632c only show switch if from and to are set 2012-12-20 14:42:05 +01:00
Koen Punt 9916e8d6dc Updated test to match with switched commits
Added compare switch
2012-12-20 14:39:39 +01:00
Koen Punt 6d93eafa6a disabled sorting of commits before compare 2012-12-20 13:50:43 +01:00
Koen Punt a09d938215 Flipping commit ids in commits_between, fixes #513 2012-12-20 13:31:09 +01:00
Dmitriy Zaporozhets 4b02f4a22d show production.log, show only active milestone for issue filter 2012-12-19 07:14:05 +03:00
Dmitriy Zaporozhets e9c6d4adfa Merge branch 'refactor_issues' of dev.gitlabhq.com:gitlab/gitlabhq 2012-12-20 13:50:42 +00:00
Dmitriy Zaporozhets adb17d6052 Cleanup after issues refactor and fix test 2012-12-20 15:39:54 +02:00
Dmitriy Zaporozhets 450c434ac2 Merge pull request #2314 from koenpunt/gh-issue-513
Disabled sorting commit ids
2012-12-20 05:14:14 -08:00
Dmitriy Zaporozhets 2f7effe804 Refactor issues, Remove ajax 2012-12-19 06:14:05 +03:00
Dmitriy Zaporozhets aa8d4d9fea Return postgres to travis 2012-12-18 18:39:35 +02:00
Dmitriy Zaporozhets 8826077471 Refactor css lists. Use well-list class 2012-12-18 06:14:05 +03:00
Dmitriy Zaporozhets 85d5f606f6 Labels autocomplete 2012-12-18 06:14:05 +03:00
Dmitriy Zaporozhets 2b921a6c72 Few icons for services list 2012-12-20 11:52:42 +02:00
Dmitriy Zaporozhets 9826db17e7 Merge pull request #2311 from gitlabhq/refactor_scss
Better organization of styles
2012-12-19 11:04:39 -08:00