home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-15 23:56:09 +10:00
Code Issues Packages Projects Releases Wiki Activity
6,082 Commits 48 Branches 340 Tags
f4978bc08ea9fa4468d70eefaa32fd1eeafce5a9
Commit Graph
6082 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Jacob Vosmaer 5b28bf1e51 Merge pull request #4705 from DarthNerdus/new-user-email 
Add appropriate article to new user email.
 2013-08-05 08:16:00 -07:00
Dmitriy Zaporozhets 88c741dde0 Refactor recent branches page 2013-08-05 17:59:58 +03:00
Dmitriy Zaporozhets bb5e50e0f7 Fix edit files 2013-08-05 16:55:15 +03:00
Dmitriy Zaporozhets b92655663c Update main calls to gitlab_git 2013-08-05 16:51:04 +03:00
Dmitriy Zaporozhets d602d5b1b0 Fix find_diff for note when noteable is nil 2013-08-05 12:32:24 +03:00
Dmitriy Zaporozhets 02e859a234 move backup logic to lib. Fixed removing outdated backups 2013-08-05 12:26:33 +03:00
Jesse Read 171ce67a0c Update new_user_email.text.erb 
Fixed template to include the word 'the'.
 2013-08-04 18:04:47 -04:00
Jesse Read ad6208c579 Update new_user_email.html.haml 
Fixed template to include the word 'the'.
 2013-08-04 18:04:20 -04:00
Dmitriy Zaporozhets af5faaf0e1 Move diff parsing to own class. Correctly identify note diff line 2013-08-04 20:43:49 +03:00
Dmitriy Zaporozhets 8f05fbbab5 Dont show comment on diff if diff line was changed after comment left 2013-08-04 19:35:47 +03:00
Dmitriy Zaporozhets 2d75b454ef Store diff with line note. It makes possible to see inline notes with proper diff even if MR diff changed 2013-08-04 19:01:57 +03:00
Dmitriy Zaporozhets e06352979d st_diff field for Note 2013-08-04 19:00:41 +03:00
Dmitriy Zaporozhets b99f357e96 Dont allow file edit for non-branches ref 2013-08-04 17:18:49 +03:00
Dmitriy Zaporozhets 65197b8a8a Sanitize issues title in autocomplete for comment 2013-08-04 17:14:15 +03:00