home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-11 21:56:19 +10:00
Code Issues Packages Projects Releases Wiki Activity
13,116 Commits 48 Branches 340 Tags
e41dadcb33fda44ee274daa673bd933e13aa90eb
Commit Graph
13116 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Valery Sizov e41dadcb33 Doorkeeper integration 2014-12-24 15:38:07 +02:00
Dmitriy Zaporozhets 5cf2bd4c99 Merge branch 'project-path' into 'master' 
Project path

Fixes gitlab/gitlabhq#1781, gitlab/gitlabhq#1763

See merge request !1337
 2014-12-24 13:27:26 +00:00
Dmitriy Zaporozhets fe68c45aa5 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-12-24 15:19:44 +02:00
Dmitriy Zaporozhets dc24b4d7a2 Merge branch 'sidebar-nav' into 'master' 
Sidebar navigation

This MR changes layout of the GitLab to sidebar navigation.

Layouts:

- [x] Project layout
- [x] Project settings layout
- [x] Dashboard layout
- [x] Profile layout
- [x] Group layout
- [x] Snippets layout
- [x] Admin layout

Pages:

- [x] Activity pages
- [x] Issue/mr pages
- [x] Issues/merge requests pages

Common:

- [x] Fix tests

See merge request !1329
 2014-12-24 13:18:43 +00:00
Dmitriy Zaporozhets 35eec009e5 Fix spinach tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-24 14:34:37 +02:00
Dmitriy Zaporozhets 8045d96ea8 Fix diff comments 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-24 13:39:35 +02:00
Dmitriy Zaporozhets 2dece41bd7 Merge branch 'package-dependencies' into 'master' 
Package dependencies documentation

/cc @valery @patricio

See merge request !1349
 2014-12-24 11:02:52 +00:00
Dmitriy Zaporozhets 97d7c06f78 Fix scroll problems and disable authorized_only filter 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-24 12:56:03 +02:00
Sytse Sijbrandij b3198b61b9 Note what has to be updated for new packages. 2014-12-24 11:45:03 +01:00
Dmitriy Zaporozhets 7b792af872 Improvements to issues/mr filters: 
* use filter_params variable when set filter values
* fix project issues spinach tests

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-24 11:39:03 +02:00
Dmitriy Zaporozhets 016981c009 Refactor issuable list pages 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-24 11:04:33 +02:00
Sytse Sijbrandij 2df09c6415 Merge branch 'update-release-steps' into 'master' 
Update release steps

Updated release steps to mention that packages should be built the day before release and that the blog post should mention CI changes.

See merge request !1348
 2014-12-24 07:46:14 +00:00
Patricio Cano 4386c210a1 Updated the monthly release steps 2014-12-23 17:28:09 -05:00
Dmitriy Zaporozhets 47634e392f Refactor issues and merge requests lists 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-23 18:49:39 +02:00
Jeroen van Baarsen 334f240899 Merge pull request #8362 from bbodenmiller/patch-3 
add missing password prompt to mysqldump
 2014-12-23 16:41:20 +01:00
Dmitriy Zaporozhets 32eb5de510 One column issue/mr lists for project 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-23 17:31:38 +02:00
Dmitriy Zaporozhets ad85f1ea78 Merge branch 'remove_extra_css_class_from_markdown' into 'master' 
Remove extra css class from markdown

Extra css class prevented attachments uploader from functioning correctly.

This caused dropzone wrapper classes to be appended to the wrong class and further prevented the dropzone gem from functioning correctly.

Removing this extra class allows attachment upload to function again while keeping the feature introduced here intact.

Fixes #1831

See merge request !1338
 2014-12-23 14:45:02 +00:00
Dmitriy Zaporozhets 91bb995029 Merge branch 'note-env-variables-in-installation' into 'master' 
Note env variables in installation

See merge request !1342
 2014-12-23 14:44:15 +00:00
Job van der Voort eb02ef47ae Merge branch 'double-check-blog-post-mention' into 'master' 
Double check blog post mention

See merge request !1347
 2014-12-23 12:46:02 +00:00
Sytse Sijbrandij 6f4332725d Release manager should doublecheck the everyone has been mentioned in the blog post. 2014-12-23 13:39:31 +01:00
Dmitriy Zaporozhets a113ce48e3 Merge branch 'fix-500-after-merge' into 'master' 
Fix 500 on MR diff page after merge and branch was removed

Fixes #1847

See merge request !1345
 2014-12-23 11:18:46 +00:00
Dmitriy Zaporozhets 554719d985 Merge branch 'fix-mysql-migration' into 'master' 
Fix mysql migration

Fixes exception noted in https://gitlab.com/gitlab-org/gitlab-ce/issues/913

```
** Invoke db:migrate (first_time)
** Invoke environment (first_time)
** Execute environment
** Invoke db:load_config (first_time)
** Execute db:load_config
** Execute db:migrate
== 20141121161704 AddIdentityTable: migrating =================================
-- create_table(:identities)
   -> 0.1214s
-- add_index(:identities, :user_id)
   -> 0.1660s
-- execute("INSERT INTO identities (provider, extern_uid, user_id)\nSELECT provider, extern_uid, id FROM users\nWHERE provider IS NOT NULL\n")
   -> 0.0518s
-- remove_column(:users, :extern_uid)
rake aborted!
StandardError: An error has occurred, all later migrations canceled:

Mysql2::Error: Duplicate entry 'ldap' for key 'index_users_on_extern_uid_and_provider': ALTER TABLE `users` DROP `extern_uid`/home/git/gitlab/vendor/bundle/ruby/2.1.0/gems/activerecord-4.1.1/lib/active_record/connection_adapters/abstract_mysql_adapter.rb:301:in `query'
/home/git/gitlab/vendor/bundle/ruby/2.1.0/gems/activerecord-4.1.1/lib/active_record/connection_adapters/abstract_mysql_adapter.rb:301:in `block in execute'
```

See merge request !1344
 2014-12-23 09:58:54 +00:00
Job van der Voort 3eb239d6fc Merge branch 'release-announcement' into 'master' 
Release announcement

@dzaporozhets wants a hashtag https://gitlab.slack.com/archives/general/p1419317692000272

See merge request !1340
 2014-12-23 09:54:21 +00:00
Dmitriy Zaporozhets 90ed76ac3c Prevent 500 after merge MR if you check remove source branch 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-23 11:22:12 +02:00
Sytse Sijbrandij f3d7bf63f1 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2014-12-23 10:12:04 +01:00
Sytse Sijbrandij e2c9a486d7 Note that it is default on Ubuntu. 2014-12-23 10:11:56 +01:00
Dmitriy Zaporozhets b9e2e116a1 Merge branch 'migrations-separate' into 'master' 
Migrations separate

Sytse will tweet on merge.

See merge request !1343
 2014-12-23 09:06:52 +00:00
Dmitriy Zaporozhets 1440ac8154 Remove index only if exists 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-23 11:05:50 +02:00
Sytse Sijbrandij c5a1b80839 One developer tip. 2014-12-23 09:53:17 +01:00
Dmitriy Zaporozhets 031461e106 Fix migration issue for mysql with index not being removed 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-23 10:52:21 +02:00
Dmitriy Zaporozhets 9a8ac2accc Show issuable context labels as blocks 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-23 10:51:14 +02:00
Sytse Sijbrandij b5d0f90e30 Warn people about not exposing at a time they can still do something about it. 2014-12-23 09:48:43 +01:00
Sytse Sijbrandij 73885c31d6 Merge branch 'install-guide' into 'master' 
Install guide

Add libkrb5-dev to upgrader /cc @dzaporozhets @valery

See merge request !1341
 2014-12-23 08:24:01 +00:00
Sytse Sijbrandij 9c7a7d4349 Add libkrb5-dev dependency. 2014-12-23 09:23:19 +01:00
Sytse Sijbrandij e8818da305 Shorter tweet so there is space for a hashtag. 2014-12-23 08:37:26 +01:00
Job van der Voort cc2f14ea0b Merge branch 'mention-the-team' into 'master' 
Mention the team

See merge request !1339
 2014-12-22 20:03:04 +00:00
Sytse Sijbrandij e99ea1146a Clear responsibility to mention the team. 2014-12-22 20:58:22 +01:00
Dmitriy Zaporozhets a2d188f688 Render MR diff full size of screen 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-22 20:36:15 +02:00
Dmitriy Zaporozhets f775809910 Fix test 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-22 19:11:15 +02:00
Marin Jankovski 8be0c60e40 Remove extra css class markdown-area which prevented attachments upload. 2014-12-22 16:44:14 +01:00
Dmitriy Zaporozhets bf69d18346 Initiate 7.7 CHANGELOG 2014-12-22 15:35:47 +00:00
Dmitriy Zaporozhets 3eb586c12c Fix tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-22 17:18:53 +02:00
Dmitriy Zaporozhets fb7be3238d For API compatibility still generate path from name if only name provided 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-22 17:09:48 +02:00
Dmitriy Zaporozhets d0b1bc222e Fix spinach test 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-22 16:48:40 +02:00
Dmitriy Zaporozhets 5b49bb208a Fix issueable context update and fix tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-22 16:42:26 +02:00
Dmitriy Zaporozhets 602fd68dc1 Merge branch 'rename_sanitize_in_check_task' into 'master' 
Rename sanitize in check task

This is to prevent the name clash between `sanitize_helper.rb` method sanitize and the method used to check if env variable is set in rake task.

See merge request !1336
 2014-12-22 14:19:21 +00:00
Dmitriy Zaporozhets 1f2628fe21 Allow Group path to be changed at the same time as name 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-22 15:02:47 +02:00
Dmitriy Zaporozhets 52a8e5c01a Set group name from path in admin controller 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-22 13:55:32 +02:00
Dmitriy Zaporozhets ed2bcf952b Set group path during creation 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-22 13:50:58 +02:00
Dmitriy Zaporozhets 59bb635e0e Set project path & name in one field without transforamtion 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-12-22 13:27:48 +02:00