Commits · 36a3ea5d726f89a18b08a67e21455540bc2a5aa8 · gpt / large_projects / gitlabhq1

Mar 11, 2014

Fix error with reopened merge request not properly reloading · 36a3ea5d

Daniel Cestari authored 10 years ago

If you reopen a Merge Request and then try to update the source branch
it won't properly reload the code since the "reload_code" method still
checks if the MR is "opened" and not just "open" (which includes reopened)

36a3ea5d

Mar 05, 2014
- Merge branch '6-6-stable' of github.com:gitlabhq/gitlabhq into 6-6-stable · ad5e5b5c
  Dmitriy Zaporozhets authored 11 years ago
  
  ad5e5b5c
- Version 6.6.5 · 8f48f386
  Dmitriy Zaporozhets authored 11 years ago
  
  Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
  View commits for tag v6.6.5 v6.6.5 Verified
  
  8f48f386
- Merge branch '6-6-5-patch' into '6-6-stable' · 0fd3ed99
  Dmitriy Zaporozhets authored 11 years ago
  
  6.6.5 patch * adds ability to reopen mr * adds ability to remove issue assignee * removes close button from diff comment form
  0fd3ed99
- Hide close mr button · e9358f5a
  Dmitriy Zaporozhets authored 11 years ago
  
  Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
  Verified
  
  e9358f5a
- Add tests to reopen MR · 23d16447
  Dmitriy Zaporozhets authored 11 years ago
  
  Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
  23d16447
- Feature: reopen closed merge request · 87837e54
  Dmitriy Zaporozhets authored 11 years ago
  
  Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: app/views/projects/merge_requests/_show.html.haml app/views/projects/merge_requests/show/_mr_title.html.haml
  Verified
  
  87837e54
- Added option to remove issue assignee on project issue page and issue edit page · 33381463
  Jason Blanchard authored 11 years ago
  
  Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: CHANGELOG
  Verified
  
  33381463
- Hide mr close button for comment form if merge request was closed or inline comment · b1021806
  Dmitriy Zaporozhets authored 11 years ago
  
  Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: app/views/projects/merge_requests/_show.html.haml
  Verified
  
  b1021806
Mar 04, 2014
- Merge pull request #6458 from wirehack7/patch-1 · d50cbb6a
  Dmitriy Zaporozhets authored 11 years ago
  
  Update installation.md
  d50cbb6a
Mar 02, 2014
- Update installation.md · 72b2a6b2
  wirehack7 authored 11 years ago
  
  Fixed the MySQL documentation link.
  72b2a6b2
Feb 28, 2014
- Merge pull request #6424 from endzyme/patch-1 · 32bfc4be
  Dmitriy Zaporozhets authored 11 years ago
  
  added verify false on gitlab_ci integrations
  32bfc4be
Feb 27, 2014
- Version 6.6.4 · 42e34aec
  Dmitriy Zaporozhets authored 11 years ago
  
  Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
  View commits for tag v6.6.4 v6.6.4 Verified
  
  42e34aec
- Merge branch '6-6-4-patch' into '6-6-stable' · 2945ba36
  Dmitriy Zaporozhets authored 11 years ago
  
  6-6-4 Patch
  2945ba36
- html_escape is private for rails 4.0.2 :( · 51257280
  Dmitriy Zaporozhets authored 11 years ago
  
  Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
  51257280
- Enable html_escape for code blocks highlighted in markdown · 2c797eb9
  Dmitriy Zaporozhets authored 11 years ago
  
  Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
  2c797eb9
Feb 26, 2014
- Version 6.6.3 · 7a21e469
  Dmitriy Zaporozhets authored 11 years ago
  
  Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
  View commits for tag v6.6.3 v6.6.3 Verified
  
  7a21e469
- added verify false on gitlab_ci integrations · 5cabc836
  Nick Huanca authored 11 years ago
  
  For those of us running self-signed in gitlab-ci it generates 500s SSL_verify errors if you don't have this.
  5cabc836
- Merge branch '6-6-3-patch' into '6-6-stable' · cf129d6f
  Dmitriy Zaporozhets authored 11 years ago
  
  6.6.3 Patch Fixes 500 error when try to edit own user via admin area
  cf129d6f
- Hide user membership in groups at user page · 98f4665e
  Dmitriy Zaporozhets authored 11 years ago
  
  Based on projects visitor can see when browse user page Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
  Verified
  
  98f4665e
- Fix 500 error when try to update own profile in admin area · dbd3680f
  Dmitriy Zaporozhets authored 11 years ago
  
  Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
  dbd3680f
Feb 25, 2014
- Version 6.6.2 · 4ef83692
  Dmitriy Zaporozhets authored 11 years ago
  
  Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
  View commits for tag v6.6.2 v6.6.2 Verified
  
  4ef83692
- Fixed 500 error on branch and tag creation via UI · 720babec
  Dmitriy Zaporozhets authored 11 years ago
  
  Also fixes issue with branch/tag removing via UI Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
  720babec
Feb 24, 2014
- Version 6.6.1 · 49464515
  Dmitriy Zaporozhets authored 11 years ago
  
  Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
  View commits for tag v6.6.1 v6.6.1 Verified
  
  49464515
- Fix submodules 500 error · aa0529af
  Dmitriy Zaporozhets authored 11 years ago
  
  Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
  aa0529af
Feb 21, 2014
- New stable branches and update guide · 490f99d4
  Dmitriy Zaporozhets authored 11 years ago
  
  Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
  View commits for tag v6.6.0 v6.6.0 Verified
  
  490f99d4
- Version to 6.6.0 · 1a3527f6
  Dmitriy Zaporozhets authored 11 years ago
  
  Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
  Verified
  
  1a3527f6
- Limit huge images in diff · bbd92f55
  Dmitriy Zaporozhets authored 11 years ago
  
  Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
  Verified
  
  bbd92f55
Feb 20, 2014
- PostgreSQL is first one now · 138e2a50
  Dmitriy Zaporozhets authored 11 years ago
  
  Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
  Verified
  
  138e2a50
- Merge branch 'case_sensitivity' into 'master' · e8466a21
  Marin Jankovski authored 11 years ago
  
  Case Sensitivity for MYSQL #1014
  e8466a21
- Make sure note.system is false if created by user · 0f080a94
  Dmitriy Zaporozhets authored 11 years ago
  
  Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
  Verified
  
  0f080a94
- Move database setup guide inside the installation. · fcdcb1a6
  Marin Jankovski authored 11 years ago
  
  fcdcb1a6
- Doc syntax highlighting. · a7a2100f
  Marin Jankovski authored 11 years ago
  
  a7a2100f
- Update database documentation. · acdb808a
  Marin Jankovski authored 11 years ago
  
  acdb808a
- Uniqueness check should be case insensitive for username and path, otherwise mysql behaves weird. · c1dddf8c
  Marin Jankovski authored 11 years ago
  
  c1dddf8c
- Time for rc1 · 499a1185
  Dmitriy Zaporozhets authored 11 years ago
  
  Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
  View commits for tag v6.6.0.rc1 v6.6.0.rc1 Verified
  
  499a1185
Feb 19, 2014
- Mention new rails in changelog · dad6b021
  Dmitriy Zaporozhets authored 11 years ago
  
  Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
  Verified
  
  dad6b021
- Merge branch 'link-release-docs' into 'master' · d353e203
  Dmitriy Zaporozhets authored 11 years ago
  
  Link Release Docs
  d353e203
- Merge branch 'rails-4-0-3' into 'master' · 1b41b7c9
  Dmitriy Zaporozhets authored 11 years ago
  
  Rails 4.0.3 Blog post with more information http://weblog.rubyonrails.org/2014/2/18/Rails_3_2_17_4_0_3_and_4_1_0_beta2_have_been_released/
  1b41b7c9
- Refer to release docs. · 06fc7e31
  Sid Sijbrandij authored 11 years ago
  
  06fc7e31

Admin message

Admin message