1. 07 Jul, 2016 10 commits
    • winniehell's avatar
      cd63d0a5
    • Rémy Coutable's avatar
      Merge branch 'fix/import-export-log' into 'master' · 3c89a788
      Rémy Coutable authored
      Fix log statements in import/export
      
      Fixes - as seen in the logs:
      ```
      Import/Export error raised on /opt/gitlab/embedded/service/gitlab-rails/lib/gitlab/import_export/file_importer.rb:19:in `rescue in import': undefined method `message' for #<String:0x007fc45e977e10>
      ```
      
      See merge request !5129
      3c89a788
    • James Lopez's avatar
      fix log statements in import/export · 91a183bc
      James Lopez authored
      91a183bc
    • Dmitriy Zaporozhets's avatar
      Merge branch 'member_timeago' into 'master' · ecfbb963
      Dmitriy Zaporozhets authored
      Add information when member joined a team
      
      ## What does this MR do?
      It adds timeago label by every member on team page
      ## Are there points in the code the reviewer needs to double check?
      
      Yes, maybe design is not OK, please check.
      
      ## Why was this MR needed?
      
      It's useful information
      
      ## What are the relevant issue numbers?
      
      ## Screenshots (if relevant)
      
      ![joxi_screenshot_1467820915126](/uploads/9e5657443a10a9fe204367d7b6749b1f/joxi_screenshot_1467820915126.png)
      
      
      
      See merge request !5116
      ecfbb963
    • Dmitriy Zaporozhets's avatar
    • Dmitriy Zaporozhets's avatar
    • Valery Sizov's avatar
      Add data when member joined a team · 7950fa48
      Valery Sizov authored
      7950fa48
    • Dmitriy Zaporozhets's avatar
      Merge branch 'services_refactoring1' into 'master' · de073cf5
      Dmitriy Zaporozhets authored
      Services: code style fixes, minor refactoring
      
      ## What does this MR do?
      
      It contains code style fixes, minor refactoring and also it removes some unnecessary comments. Every comment require a support just like a regular code line and this is why we should avoid using comments everywhere unless it's really helpful. Martin Fowler said "Find comment and refactor the code around it" :) our code is not that bad so let's not spoil it with comments.
      
      ## Why was this MR needed?
      
      Because GitLab is a live example of awesome code. Let's keep up a good job :) 
      
      
      See merge request !5112
      de073cf5
    • Rémy Coutable's avatar
      Merge branch 'show_push_widget_in_upstream' into 'master' · 52a583c1
      Rémy Coutable authored
      Show last push widget in upstream after push to fork
      
      ## What does this MR do?
      
      Show the last push widget in the upstream project when you push to a fork. 
      
      ## Are there points in the code the reviewer needs to double check?
      
      In the view, I'm checking if `@project` in the first part of the conditional. I felt it was necessary in case `@project` wasn't an object in all cases. Will it ever not be there? Is this check necessary?
      
      Should there be tests? I don't see existing ones for this. 
      
      ## Why was this MR needed?
      
      I use the fork workflow everywhere and it has annoyed me for some time that the last push widget doesn't show up when viewing the upstream project. I'm almost never viewing the fork in GitLab so I want to be able to easily create a MR in any case. 
      
      ## Screenshots (if relevant)
      
      **Widget in upstream repo:**
      
      ![Screen_Shot_2016-06-23_at_10.05.29_AM](/uploads/f823642e40cf059c3793db6cf00bba50/Screen_Shot_2016-06-23_at_10.05.29_AM.png)
      
      **Widget in fork**:
      
      ![Screen_Shot_2016-06-23_at_10.05.25_AM](/uploads/1a976241186ec42cdc43c80bea0c856b/Screen_Shot_2016-06-23_at_10.05.25_AM.png)
      
      **Widget on dashboard**:
      
      ![Screen_Shot_2016-06-23_at_10.06.07_AM](/uploads/084ac35f67735aec8042d9bc904255fe/Screen_Shot_2016-06-23_at_10.06.07_AM.png)
      
      
      See merge request !4880
      52a583c1
    • Rémy Coutable's avatar
      Merge branch 'patch-3' into 'master' · 9b75da80
      Rémy Coutable authored
      Allow everyone to order tags, not only those who has access
      
      ## What does this MR do?
      Allows everyone to view tags by different order (by name, date, etc), not only those who has access
      
      ## Are there points in the code the reviewer needs to double check?
      Just check how it's rendered.
      
      ## Why was this MR needed?
      Because now I can't order other's project tags.
      
      ## What are the relevant issue numbers?
      #15438
      
      ## Screenshots (if relevant)
      Exist in related issue. Look [one comment](https://gitlab.com/gitlab-org/gitlab-ce/issues/15438#note_12888763) and [just below there is another one](https://gitlab.com/gitlab-org/gitlab-ce/issues/15438#note_12888819).
      
      ## Does this MR meet the acceptance criteria?
      Probably, no need
      
      See merge request !5105
      9b75da80
  2. 06 Jul, 2016 30 commits