1. 02 May, 2016 1 commit
    • Dmitriy Zaporozhets's avatar
      Merge branch 'patch/geo-mergerequest-500' into 'master' · 10743b27
      Dmitriy Zaporozhets authored
      Geo: Merge requests on Secondary should not check mergeable status
      
      In a secondary Geo (#76) node, database is read-only. 
      
      If you update your merge request and don't visit the primary node, you would end up with an unchecked `merge_status`.
      We should not try to solve that in a secondary node, as this will lead to a 500 error because we can't update data on database.
      
      This MR Fixes that:
      
      ```
      Started GET "/root/test-project/merge_requests/1" for 189.101.232.69 at 2016-04-28 11:37:28 -0400
      Processing by Projects::MergeRequestsController#show as HTML
        Parameters: {"namespace_id"=>"root", "project_id"=>"test-project", "id"=>"1"}
      Completed 500 Internal Server Error in 372ms (ActiveRecord: 26.9ms)
      
      ActionView::Template::Error (PG::ReadOnlySqlTransaction: ERROR:  cannot execute UPDATE in a read-only transaction
      : UPDATE "merge_requests" SET "merge_status" = $1 WHERE "merge_requests"."id" = $2):
          39:     = render "projects/merge_requests/show/how_to_merge"
          40:     = render "projects/merge_requests/widget/show.html.haml"
          41:
          42:     - if @merge_request.source_branch_exists? && @merge_request.mergeable? && @merge_request.can_be_merged_by?(current_user)
          43:       .light.prepend-top-default
          44:         You can also accept this merge request manually using the
          45:         = succeed '.' do
        app/models/merge_request.rb:122:in `call'
        app/models/merge_request.rb:122:in `block (2 levels) in <class:MergeRequest>'
        app/models/merge_request.rb:272:in `check_if_can_be_merged'
        app/models/merge_request.rb:297:in `mergeable?'
        app/views/projects/merge_requests/_show.html.haml:42:in `_app_views_projects_merge_requests__show_html_haml__3632812159035673711_50958700'
        app/views/projects/merge_requests/show.html.haml:1:in `_app_views_projects_merge_requests_show_html_haml___4126596802437062695_51012840'
      ```
      
      See merge request !366
      10743b27
  2. 30 Apr, 2016 1 commit
  3. 29 Apr, 2016 2 commits
  4. 28 Apr, 2016 1 commit
  5. 27 Apr, 2016 6 commits
    • Robert Speicher's avatar
      Merge branch 'patch/geo-rename-fix' into 'master' · 8281793e
      Robert Speicher authored
      Geo: fix Geo::ScheduleRepoMoveService autoload error
      
      While refactoring !354 (Geo: #76) missed class renaming. This will fix:
      
      ```
      LoadError: Unable to autoload constant Geo::ScheduleRepoMoveService, expected /opt/gitlab/embedded/service/gitlab-rails/app/services/geo/schedule_repo_move_service.rb to define it
      ```
      
      See merge request !364
      8281793e
    • Gabriel Mazetto's avatar
      6b44ebb0
    • Valery Sizov's avatar
      fix spec · 055bc89f
      Valery Sizov authored
      055bc89f
    • Valery Sizov's avatar
    • Dmitriy Zaporozhets's avatar
      Merge branch 'ie-browser-update' into 'master' · 6c0ed639
      Dmitriy Zaporozhets authored
      Changes support from IE 10+ to IE 11+
      
      IE 11 was released 17 October 2013; 2 years ago. Generally what I have experienced is that support for browsers (when newer ones are available) continues for up to 2 years. Based on that info we would drop support for IE 10 and the latest IE we would support would be IE 11. 
      
      I also think this is more realistic since no one is really testing anything on IE 10 at the moment.  We should start testing on all the browser that we currently support. 
      
      Also we can then have real support for flexbox and not need things like `-ms-flexbox` and other IE specific hacks. 
      
      cc @iamphill @annabeldunstone @elvongray @alfredo1 @rspeicher 
      
      See merge request !3913
      6c0ed639
    • Dmitriy Zaporozhets's avatar
      Merge branch 'rs-letter_opener_web' into 'master' · 47d269c1
      Dmitriy Zaporozhets authored
      Add letter_opener_web gem
      
      Sent emails in the development environment will no longer automatically
      be opened in the browser. If a sent email needs to be viewed, it can be
      found at the `/rails/letter_opener` route.
      
      See merge request !3893
      47d269c1
  6. 26 Apr, 2016 29 commits