Commit Graph
6096 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 3ee46726c5 Remove unecessary paddding at Branches#recent page 2013-08-08 20:25:47 +00:00
Dmitriy Zaporozhets 869f45b36a Fix assign-to-me buttton 2013-08-08 21:26:13 +03:00
Dmitriy Zaporozhets 53cc9df4f1 Mention Merge requests on forks in changelog 2013-08-08 21:14:19 +03:00
Dmitriy Zaporozhets f0e994b6c0 improve MergeRequest edit page 2013-08-08 21:11:28 +03:00
Dmitriy Zaporozhets 2d56d89b92 update devise to 2.2.5 2013-08-08 19:45:03 +03:00
Dmitriy Zaporozhets 76eb9532df Merge branch 'master' of github.com:gitlabhq/gitlabhq 2013-08-08 19:00:53 +03:00
Dmitriy Zaporozhets 44e2a2e453 Compact list for commits page 2013-08-08 18:59:46 +03:00
Dmitriy Zaporozhets 66dacfc52a Merge branch 'karlhungus-mr-on-fork' of /home/git/repositories/gitlab/gitlabhq 2013-08-08 15:46:09 +00:00
Dmitriy Zaporozhets 2388ca0f32 Revert notification specs 2013-08-08 17:42:27 +03:00
Dmitriy Zaporozhets 7fefb0397e Fix filter context. Dont duplicate target project name for MR 2013-08-08 17:29:31 +03:00
Jacob Vosmaer da06edb088 Merge pull request #4664 from tdm00/clarify-adding-custom-oauth-provider
Clarify documentation on how to add custom Omniauth provider to GitLab
2013-08-08 07:24:49 -07:00
Troy Murray 3b19ef5b26 Clarify documentation on how to add custom Omniauth provider to GitLab 2013-08-08 10:16:52 -04:00
Dmitriy Zaporozhets 02c3bb7a32 fix chosen ui. fixed network tests 2013-08-08 16:14:38 +03:00
Dmitriy Zaporozhets ca52f84841 Update chosen, improve ui, fix MR fork tests 2013-08-08 15:14:59 +03:00
Dmitriy Zaporozhets f4978bc08e Fix unmerged diff for non-fork MR 2013-08-08 12:44:33 +03:00
Dmitriy Zaporozhets 3f9b1d62ef reset db schema 2013-08-08 12:30:50 +03:00
Dmitriy Zaporozhets 4537623d12 Merge branch 'master' into karlhungus-mr-on-fork
Conflicts:
	app/contexts/filter_context.rb
	app/contexts/search_context.rb
	app/models/merge_request.rb
	app/models/note.rb
	app/views/shared/_merge_requests.html.haml
	spec/controllers/commit_controller_spec.rb
	spec/services/notification_service_spec.rb
2013-08-08 12:22:09 +03:00
Dmitriy Zaporozhets c7e490ebd5 Merge branch 'mr-on-fork' of https://github.com/karlhungus/gitlabhq into karlhungus-mr-on-fork 2013-08-08 12:12:46 +03:00
Dmitriy Zaporozhets 1a83fea711 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2013-08-08 11:58:44 +03:00
Dmitriy Zaporozhets acc21d30fb Increase input padding. Minor ui fixes 2013-08-08 11:57:34 +03:00
Dmitriy Zaporozhets f79b210061 Fix wiki popup for new page 2013-08-08 11:40:42 +03:00
Jacob Vosmaer 10c3f92ac1 Merge pull request #4710 from gitlabhq/contributing_guide
Add guidelines for the Contributing Process in PROCESS.md
2013-08-08 00:56:25 -07:00
Jacob Vosmaer 348e9a7413 Add information about the contributing process 2013-08-08 09:55:28 +02:00
Dmitriy Zaporozhets 4e6f131c8a fix tests 2013-08-08 10:27:52 +03:00
Dmitriy Zaporozhets 2e0a373415 Merge branch 'improve/proper_form_classes' of /home/git/repositories/gitlab/gitlabhq 2013-08-07 20:55:39 +00:00
Dmitriy Zaporozhets 89d0d75c52 Better filter var for MR. show reset filter only if makes sense 2013-08-07 23:54:26 +03:00
Dmitriy Zaporozhets b2152847b1 Replace xlarge and xxlarge classes 2013-08-07 23:40:29 +03:00
Dmitriy Zaporozhets 846e59505e Replace .actions with .form-actions 2013-08-07 23:35:24 +03:00
Dmitriy Zaporozhets e3f9bd231b use control-group classes for inline forms in rest pages 2013-08-07 23:32:20 +03:00
Dmitriy Zaporozhets df437f419b use control-group classes for inline forms in project area pages 2013-08-07 23:30:40 +03:00
Dmitriy Zaporozhets c52f9e1a32 use control-group classes for inline forms in project new/edit pages 2013-08-07 23:28:02 +03:00
Dmitriy Zaporozhets a3b0dc2e17 use control-group classes for inline forms in profile and group pages 2013-08-07 23:24:34 +03:00
Dmitriy Zaporozhets f2082edb60 use control-group classes for inline forms in issues/mr 2013-08-07 23:22:46 +03:00
Dmitriy Zaporozhets 49fa9907ae use control-group classes for inline forms in admin area 2013-08-07 23:20:10 +03:00
Dmitriy Zaporozhets a43a380394 Increase amount of search results for issues, mr, projects 2013-08-07 22:51:36 +03:00
Jacob Vosmaer b58eeeaf10 Merge pull request #4727 from Itxaka/master
added python api wrapper
2013-08-07 01:10:50 -07:00
Itxaka Serrano bc3a4d3194 added python api wrapper 2013-08-07 09:40:26 +02:00
Dmitriy Zaporozhets 27b7aeddfb More compact lists for dashboard issues, mr 2013-08-06 21:22:41 +03:00
Dmitriy Zaporozhets 512cd02335 Dashboard/Group issues and mr pages refactoring 2013-08-06 21:12:01 +03:00
Dmitriy Zaporozhets 21c70354f6 Restyle group members page a bit 2013-08-06 20:12:20 +03:00
Dmitriy Zaporozhets 65eddc00ad toggle content instead of disabling button for group members editing 2013-08-06 18:49:37 +03:00
Dmitriy Zaporozhets 6eabf90b80 Ability to edit group member permissions 2013-08-06 18:45:45 +03:00
Dmitriy Zaporozhets f8137075d5 Show correct group membership in profile 2013-08-06 18:03:13 +03:00
Dmitriy Zaporozhets 0b747a0f4a Minor UI improvements 2013-08-06 17:58:45 +03:00
Dmitriy Zaporozhets 8456584065 Merge branch 'add_unofficial_irc_to_readme' of /home/git/repositories/gitlab/gitlabhq 2013-08-06 13:47:02 +00:00
Dmitriy Zaporozhets 498a9ce3d2 more space for months names in network graph 2013-08-05 19:10:20 +03:00
Dmitriy Zaporozhets a2501d1586 more space for days in network graph 2013-08-05 19:08:51 +03:00
Dmitriy Zaporozhets d521cf8d01 Merge branch 'refactor/gitlab_git_2' of /home/git/repositories/gitlab/gitlabhq 2013-08-05 16:00:12 +00:00
Dmitriy Zaporozhets 1e3f09b21f Fix tests 2013-08-05 18:29:44 +03:00
Dmitriy Zaporozhets 128ef33707 use rubygems for gitlab_git gem 2013-08-05 18:16:37 +03:00