DELETE THIS MERGE REQUEST (!6886) · Merge requests · gpt / large_projects / gitlabhq1

An error occurred while fetching this tab.

Closed gitlab-qa-bot requested to merge github/fork/mendyp/prodege-6.5.1-001 into master 10 years ago

Apr 28, 2014
- Bumped Version · 2f24641d
  devblueray authored 10 years ago
  
  2f24641d
- Refactor Parallel Diff feature and add scrollbars · 2a2a9acc
  devblueray authored 10 years ago
  
  Also now removed lines relating to unused comments feature
  2a2a9acc
Apr 02, 2014
- Merge pull request #9 from isswp101/updates · 13e2eb87
  devblueray authored 10 years ago
  
  Added a new user group and some improvements to mr email subjects
  13e2eb87
Feb 18, 2014
- some fixes email subjects when we create/close mr · 9b740d8c
  Sergey Sorokin authored 11 years ago
  
  9b740d8c
Feb 14, 2014
- fixed markup in mr filter panel · 21cba379
  Sergey Sorokin authored 11 years ago
  
  21cba379
Feb 13, 2014
- renamed group "Extended Developer" to "Developer with merge" · 5881861d
  Sergey Sorokin authored 11 years ago
  
  5881861d
Feb 12, 2014
- updated email subjects for merge requests · 403154ee
  Sergey Sorokin authored 11 years ago
  
  403154ee
Feb 06, 2014

fixed mr filters after merge with 6-5-stable · 57424729
Sergey Sorokin authored 11 years ago

57424729
fixed after merge with 6-5-stable · db1c4af0
Sergey Sorokin authored 11 years ago

db1c4af0

Merge branch 'last-fixes' into updates · 70291367

Sergey Sorokin authored 11 years ago

Conflicts:
	CHANGELOG
	Gemfile
	Gemfile.lock
	VERSION
	app/contexts/merge_requests_load_context.rb
	app/controllers/projects/merge_requests_controller.rb
	app/models/merge_request.rb
	app/views/projects/edit.html.haml
	app/views/projects/merge_requests/index.html.haml
	app/views/projects/merge_requests/show/_mr_accept.html.haml
	app/views/projects/merge_requests/show/_mr_title.html.haml
	config.ru

70291367

Feb 05, 2014
- added new group of permissions - extended developer · 0aaee3f4
  Sergey Sorokin authored 11 years ago
  
  0aaee3f4
- merge request "state" param is renamed to "mr_state" in filter, added closed... · 37df583e
  Sergey Sorokin authored 11 years ago
  
  merge request "state" param is renamed to "mr_state" in filter, added closed and merged states to "state" item of filter
  37df583e
Feb 03, 2014
- Merge branch 'vm/SWAG-522' · fc2c4d91
  Sergey Sorokin authored 11 years ago
  
  fc2c4d91
- Merge remote-tracking branch 'vm/gitlab-updates' into SWAG-522 · 4eb322c2
  Sergey Sorokin authored 11 years ago
  
  4eb322c2
Jan 28, 2014
- Merge remote-tracking branch 'vm/gitlab-updates' into SWAG-522 · d8646d99
  Sergey Sorokin authored 11 years ago
  
  d8646d99
Jan 23, 2014
- Version 6.5.1 · 6f6f1588
  Dmitriy Zaporozhets authored 11 years ago
  
  Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
  6f6f1588
- Fix selectbox when submit MR from fork to origin · 1150bad2
  Dmitriy Zaporozhets authored 11 years ago
  
  Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
  1150bad2
Jan 07, 2014

Merge remote-tracking branch 'gitlab/6-4-stable' into prodege-master · f5c0e62c

Mendy authored 11 years ago

Conflicts:
	Gemfile
	Gemfile.lock
	VERSION
	app/controllers/projects/merge_requests_controller.rb
	app/models/merge_request.rb
	db/schema.rb
	doc/install/installation.md
	lib/tasks/gitlab/check.rake

f5c0e62c

Jan 04, 2014
- Merge pull request #5955 from wishlistmaster/6-4-stable · 180ab975
  Dmitriy Zaporozhets authored 11 years ago
  
  Gem 'gon' issue on Ubuntu LTS
  180ab975
Dec 30, 2013
- Update Gemfile.lock · 5b2ac3fa
  Manly Florido authored 11 years ago
  
  5b2ac3fa
- Update Gemfile · eae84c0c
  Manly Florido authored 11 years ago
  
  eae84c0c
Dec 23, 2013
- Version to 6.4.3 · 42131d01
  Dmitriy Zaporozhets authored 11 years ago
  
  Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
  Verified
  
  42131d01
- don't use unicorn worker killer if PhusionPassenger is defined · 84093385
  James Newton authored 11 years ago
  
  84093385
- Add 6.4.1 and 6.4.2 CHANGELOG · 221af222
  Dmitriy Zaporozhets authored 11 years ago
  
  Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: CHANGELOG
  221af222
- Version to 6.4.2 · 214a013b
  Dmitriy Zaporozhets authored 11 years ago
  
  Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
  Verified
  
  214a013b
- Fix upgrader · 58472180
  Dmitriy Zaporozhets authored 11 years ago
  
  It created branch based on current branch which is an old version Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
  58472180
- Version to 6.4.1 · 6bc3b5df
  Dmitriy Zaporozhets authored 11 years ago
  
  Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
  Verified
  
  6bc3b5df
- Fix 500 error when rename repository · cc51931d
  Dmitriy Zaporozhets authored 11 years ago
  
  Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
  cc51931d
- Fix project transfer feature · 5582ae14
  Dmitriy Zaporozhets authored 11 years ago
  
  Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
  5582ae14
Dec 11, 2013
- Some gitlab updates (SWAG-522) · 9ed3ac32
  Sergey Sorokin authored 11 years ago
  
  9ed3ac32
Nov 04, 2013
- Merge remote-tracking branch 'upstream/6-2-stable' into prodege-master · 53a119ae
  connor authored 11 years ago
  
  53a119ae
- Merge pull request #6 from AlexanderOlkhovskiy/force_reload_after_review · 27bab5e1
  connor-prodege authored 11 years ago
  
  Fix: force reload the page after changing the review state
  27bab5e1
- Merge pull request #7 from AlexanderOlkhovskiy/fix_reviewed_mrs_update · 7e8902c4
  connor-prodege authored 11 years ago
  
  Fix the reviewed merge requests update on push
  7e8902c4
- Version 6.2.3 · 675e5203
  Dmitriy Zaporozhets authored 11 years ago
  
  Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
  Unverified
  
  675e5203
- Merge branch 'gitlab_shell_174_for_6_2_stable' of... · a811a4fa
  Dmitriy Zaporozhets authored 11 years ago
  
  Merge branch 'gitlab_shell_174_for_6_2_stable' of /home/git/repositories/gitlab/gitlabhq into 6-2-stable
  a811a4fa
Nov 01, 2013
- Bugfix: add a data migration to update commits and diffs for all merge... · 5ed6e86e
  Alexander Olkhovskiy authored 11 years ago
  
  Bugfix: add a data migration to update commits and diffs for all merge requests in the review states
  5ed6e86e
- Use gitlab-shell 1.7.4 · 867785b4
  Jacob Vosmaer (GitLab) authored 11 years ago
  
  867785b4
- Bugfix: hack the opened merge request state to include MRs in the review... · 05deff01
  Alexander Olkhovskiy authored 11 years ago
  
  Bugfix: hack the opened merge request state to include MRs in the review states (accepted, rejected, fixed); revert previously introduced not_closed method and scope
  05deff01
- Require gitlab-shell 1.7.4 · 2d56ef52
  Dmitriy Zaporozhets authored 11 years ago
  
  Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
  2d56ef52
- Revert "Escape strings" · 33b041a3
  Dmitriy Zaporozhets authored 11 years ago
  
  This reverts commit 03141bfc.
  33b041a3
- Revert "Best to escape strings not split them" · 9f9d9cff
  Dmitriy Zaporozhets authored 11 years ago
  
  This reverts commit 1ab324cb.
  9f9d9cff
- Correctly escape search query · 31736e9b
  Dmitriy Zaporozhets authored 11 years ago
  
  31736e9b
- Shell escape code search · a476bc7b
  Dmitriy Zaporozhets authored 11 years ago
  
  a476bc7b
- Require gitlab-shell v1.7.3 · 1bace9da
  Dmitriy Zaporozhets authored 11 years ago
  
  1bace9da
- Best to escape strings not split them · 1ab324cb
  Nigel Kukard authored 11 years ago
  
  Signed-off-by: Nigel Kukard <nkukard@lbsd.net>
  1ab324cb
- Escape strings · 03141bfc
  Nigel Kukard authored 11 years ago
  
  Signed-off-by: Nigel Kukard <nkukard@lbsd.net>
  03141bfc
- Merge branch 'fix_sidekiq_rake' of /home/git/repositories/gitlab/gitlabhq into 6-2-stable · 35068315
  Dmitriy Zaporozhets authored 11 years ago
  
  35068315
- Restore sidekiq rake tasks · 7d0d9c65
  Jacob Vosmaer (GitLab) authored 11 years ago
  
  7d0d9c65
Oct 31, 2013
- Fix: force reload the page after changing the review state; remove unnecessary... · 4a0cf537
  Alexander Olkhovskiy authored 11 years ago
  
  Fix: force reload the page after changing the review state; remove unnecessary code duplication in the review action views
  4a0cf537
- Merge remote-tracking branch 'origin/prodege-master' into prodege-master · 0b7508ac
  connor authored 11 years ago
  
  0b7508ac
- Merge pull request #5 from AlexanderOlkhovskiy/more_mr_states · edd7b1ba
  connor-prodege authored 11 years ago
  
  More merge request review states
  edd7b1ba
- Merge remote-tracking branch 'upstream/6-2-stable' into prodege-master · 62aa12de
  connor authored 11 years ago
  
  62aa12de
- revert reverting default branch · bb2f3ec7
  connor authored 11 years ago
  
  bb2f3ec7
- Version to 6.2.2 · 9c3e95f6
  Dmitriy Zaporozhets authored 11 years ago
  
  9c3e95f6
- Update gitlab_git to recent version · a4d65885
  Dmitriy Zaporozhets authored 11 years ago
  
  a4d65885
Oct 30, 2013
- Show name of user who changed MR's review state in email subject and body · e61df77b
  Alexander Olkhovskiy authored 11 years ago
  
  e61df77b
- Allow to filter merge requests by state · 10a914bc
  Alexander Olkhovskiy authored 11 years ago
  
  10a914bc
- Add 'rejected' and 'fixed' states to merge requests; allow to switch between... · 21154576
  Alexander Olkhovskiy authored 11 years ago
  
  Add 'rejected' and 'fixed' states to merge requests; allow to switch between the review statuses (accepted, rejected, fixed) back and forth
  21154576
- Fix: show edit/close buttons for all not closed MRs (not only to opened ones) · 1dfefb4e
  Alexander Olkhovskiy authored 11 years ago
  
  1dfefb4e
Oct 28, 2013
- Version 6.2.1 · f2a77a82
  Dmitriy Zaporozhets authored 11 years ago
  
  f2a77a82
Oct 25, 2013
- Fix for issue #5431 · 2f47049d
  arul authored 11 years ago
  
  2f47049d
Oct 23, 2013
- revert default_branch · 1a1b5927
  connor authored 11 years ago
  
  1a1b5927
- use default branch · 9d58e81e
  connor authored 11 years ago
  
  9d58e81e
- Merge remote-tracking branch 'upstream/6-2-stable' into prodege-master · 18e046ec
  connor authored 11 years ago
  
  Conflicts: db/schema.rb lib/tasks/sidekiq.rake
  18e046ec
- Merge remote-tracking branch 'upstream/6-1-stable' into prodege-master · 2c1538a1
  connor authored 11 years ago
  
  2c1538a1
- Merge pull request #3 from AlexanderOlkhovskiy/accept_without_merge · a374b6be
  connor-prodege authored 11 years ago
  
  Allow for accept without merge
  a374b6be
Oct 22, 2013
- Allow for accept without merge · f5df4fce
  Alexander Olkhovskiy authored 11 years ago
  
  f5df4fce
- Merge branch '6-2-stable' of github.com:gitlabhq/gitlabhq into 6-2-stable · 5123d706
  Dmitriy Zaporozhets authored 11 years ago
  
  5123d706
- Merge branch 'bash3' of /home/git/repositories/gitlab/gitlabhq into 6-2-stable · f896c2eb
  Dmitriy Zaporozhets authored 11 years ago
  
  f896c2eb
- Use `2>&1` because Bash 3 does not support `&>>` · 7dbcc1e6
  Jacob Vosmaer (GitLab) authored 11 years ago
  
  7dbcc1e6
Oct 21, 2013
- Merge pull request #5389 from alexyoder/patch-1 · 4f5d9053
  Jacob Vosmaer (GitLab) authored 11 years ago
  
  change 6-1-stable to 6-2-stable in installation guide
  4f5d9053
- change 6-1-stable to 6-2-stable · 08fd2b95
  Alex Yoder authored 11 years ago
  
  08fd2b95
- Merge branch '6-1-stable' of dev.gitlab.org:gitlab/gitlabhq into 6-1-stable · d6444004
  Dmitriy Zaporozhets authored 11 years ago
  
  d6444004
- Merge branch 'sidekiq_start_fix' of /home/git/repositories/gitlab/gitlabhq into 6-1-stable · 0dd94f22
  Dmitriy Zaporozhets authored 11 years ago
  
  0dd94f22
Oct 18, 2013
- Use built-in sidekiq deamonization · 70563a78
  Jacob Vosmaer (GitLab) authored 11 years ago
  
  70563a78
- Remove duplicate log path generation · a02a4dfa
  Jacob Vosmaer (GitLab) authored 11 years ago
  
  a02a4dfa
- Always shut down sidekiq before starting · 976185db
  Jacob Vosmaer (GitLab) authored 11 years ago
  
  976185db
Oct 07, 2013
- don't titleize merge requests · 44872b84
  connor authored 11 years ago
  
  44872b84
- Merge pull request #2 from AlexanderOlkhovskiy/merge_req_group_filters · 1d9c4809
  connor-prodege authored 11 years ago
  
  Allow to filter merge requests by group
  1d9c4809
Oct 03, 2013
- Allow to filter merge requests by group · 9bf08498
  Alexander Olkhovskiy authored 11 years ago
  
  9bf08498
Oct 02, 2013
- Merge pull request #5242 from earlonrails/patch-2 · b5955039
  Jacob Vosmaer (GitLab) authored 11 years ago
  
  Update app version in init script
  b5955039
- dev can accept merge request · 8bd30d89
  connor authored 11 years ago
  
  8bd30d89
- Fix issue when project owner cant close MR from forked project · 73558dd6
  Dmitriy Zaporozhets authored 11 years ago
  
  73558dd6
Oct 01, 2013
- Update gitlab · 650db836
  Kevin Krauss authored 11 years ago
  
  650db836

Admin message

Admin message

DELETE THIS MERGE REQUEST

Merge request reports

Activity