Software Público Brasileiro

30 Jul, 2013

1 commit

• 0d715bcd   Merge branch 'mr-on-fork' of https://github.com/karlhungus/gitlabhq into karlhungus-mr-on-fork ... Browse Dir »

  Conflicts:
  	app/views/projects/commit/show.html.haml
  	app/views/projects/compare/show.html.haml
  	app/views/projects/merge_requests/branch_from.js.haml

  Dmitriy Zaporozhets

  2013-07-30 13:35:33 +0300  

29 Jul, 2013

9 commits

• 79bea312   More informative Dashboard#projects page Browse Dir »
  Dmitriy Zaporozhets

  2013-07-29 22:59:41 +0300  
• 71db10b9   Add sing-in button for public area panel Browse Dir »
  Dmitriy Zaporozhets

  2013-07-29 21:41:05 +0300  
• bd7e569f   Prevent top margin for first element in markdown/wiki/readme typography Browse Dir »
  Dmitriy Zaporozhets

  2013-07-29 21:24:38 +0300  
• 2c6577a1   Suggest MR title based on from branch Browse Dir »
  Dmitriy Zaporozhets

  2013-07-29 21:17:46 +0300  
• 8290e7cc   Autofocus to project name at projects#new. Added description field to projects#n… ... Browse Dir »

  …ew. Increased timeout for flash message

  Dmitriy Zaporozhets

  2013-07-29 21:06:59 +0300  
• be17a32d   Merge branch 'improve/public_area' of /home/git/repositories/gitlab/gitlabhq Browse Dir »
  Dmitriy Zaporozhets

  2013-07-29 14:56:11 +0000  
• dd8f090b   Fix hardcoded condition and unassigned vars Browse Dir »
  Dmitriy Zaporozhets

  2013-07-29 16:51:04 +0300  
• efa26760   Render readme file in public project#show Browse Dir »
  Dmitriy Zaporozhets

  2013-07-29 16:50:00 +0300  
• cd19f82e   Fix typos Browse Dir »
  Johannes Schleifenbaum

  2013-07-29 12:47:06 +0200  

27 Jul, 2013

5 commits

• a7fab42b   Public area: Project#show page prototype Browse Dir »
  Dmitriy Zaporozhets

  2013-07-27 21:23:35 +0300  
• cb86cf84   Merge branch 'master' of github.com:gitlabhq/gitlabhq Browse Dir »
  Dmitriy Zaporozhets

  2013-07-27 20:22:56 +0300  
• b5668234   Remove unecessary %br in help area Browse Dir »
  Dmitriy Zaporozhets

  2013-07-27 19:34:37 +0300  
• 04806be3   Merge pull request #4634 from jacargentina/master ... Browse Dir »

  Added show user name as a tooltip on issue participants list

  Dmitriy Zaporozhets

  2013-07-27 00:45:39 -0700  
• 2db010b6   Show tooltip with author email for commit Browse Dir »
  Dmitriy Zaporozhets

  2013-07-27 10:40:38 +0300  

26 Jul, 2013

3 commits

• 994ad1cb   Added show user name as a tooltip on every call to link_to_member when the name is not shown inline Browse Dir »
  Javier Castro

  2013-07-26 13:23:26 -0300  
• 06e98c0f   Merge pull request #4619 from thomasbiddle/merge_request_api ... Browse Dir »

  Adding links to the merge requests and group documentation.

  Jacob Vosmaer

  2013-07-26 08:00:42 -0700  
• 4261a5a1   Adding links to the merge requests and group documentation. Browse Dir »
  TJ Biddle

  2013-07-26 07:53:35 -0700  

24 Jul, 2013

1 commit

• 8aecfc37   Improve grammar of label hints Browse Dir »
  Jacob Vosmaer

  2013-07-24 17:26:14 +0200  

18 Jul, 2013

10 commits

• 2c191ab0   Merge branch 'improve/snippets' of /home/git/repositories/gitlab/gitlabhq Browse Dir »
  Dmitriy Zaporozhets

  2013-07-18 11:12:01 +0000  
• 98e1597f   Fix tests Browse Dir »
  Dmitriy Zaporozhets

  2013-07-18 14:11:17 +0300  
• 33347efa   User links to user snippets Browse Dir »
  Dmitriy Zaporozhets

  2013-07-18 13:33:43 +0300  
• 82e1fe46   Minor ui fix for snippet Browse Dir »
  Dmitriy Zaporozhets

  2013-07-18 13:22:47 +0300  
• b1fbd658   Improve UI for project snippets Browse Dir »
  Dmitriy Zaporozhets

  2013-07-18 13:21:56 +0300  
• bbb06e50   Add seeds and improve ui. Remove snippet expires_at Browse Dir »
  Dmitriy Zaporozhets

  2013-07-18 13:08:48 +0300  
• 02e39563   better ui for protected branches page Browse Dir »
  Dmitriy Zaporozhets

  2013-07-18 12:06:51 +0300  
• fe7bef3a   squash commit summary in one sentence Browse Dir »
  Dmitriy Zaporozhets

  2013-07-18 11:49:40 +0300  
• ba33ed41   Fix new-tag-btn align Browse Dir »
  Dmitriy Zaporozhets

  2013-07-18 10:29:45 +0300  
• 4d373005   Rebase on master ... Browse Dir »

  -Messed up part of the merge for _form.html.haml
  -Probably need discussion about what the new/edit merge page should look like now that it involves projects
  
  Change-Id: I77f3a12ab979578fb4420e0fac6e8bf3fd451fe1

  Izaak Alpert

  2013-07-18 00:12:03 -0400  

17 Jul, 2013

11 commits

• 0a013adc   Fix an issue with edits sending user back to @source_project ... Browse Dir »

  -Form was for @source_project rather then @project.
  -add spinach test for edit submission on forked project
  
  Change-Id: I807a5077608b7e910f4bc83c5d3e82c378f70a9e

  Izaak Alpert

  2013-07-17 22:48:03 -0400  
• 532809a1   Revert note.project references back to @project ... Browse Dir »

  -removed extranious space from new_merge_request_email.text.erb
  
  Change-Id: I65314b3fe8f8442b4c30d311b96fbceddf240f42

  Izaak Alpert

  2013-07-17 22:48:03 -0400  
• 58064027   Raise Error for diff_between/commit_between for non fork mr's in satellite ... Browse Dir »

  -Fixed tests to account for this
  -Trigger update after update_branches for list:update selecting first commit, have it also trigger sha lookup
  
  Change-Id: Ie4c3d4fbf57aeadd7d141d3704f4ea0f0684a7a5

  Izaak Alpert

  2013-07-17 22:48:03 -0400  
• 0e82c981   Fix merge_requests_controller ... Browse Dir »

  -update new to be simplified (set values from parms via rails) instead of doing it by hand
  -change def merge_request to look up the merge request against the current @project
  
  Change-Id: I778c91b87c6da84b73f8f59013c27b74d290d8b1

  Izaak Alpert

  2013-07-17 22:48:03 -0400  
• 539c70c7   Update emails to describe path using for_fork? ... Browse Dir »

  Forked MR's will print
  
  Project:Branch <source_project_with_path>:<source_branch> -> <target_project_with_path>:<target_branch>
  
  Non forked MR's will print
  
  Branch <source_branch> -> <target_branch>
  
  Change-Id: I89399aec2e7fde8e4b64b110a48099a95ae4f038

  Izaak Alpert

  2013-07-17 22:48:03 -0400  
• d9959427   Style changes from review with @randx ... Browse Dir »

  -Some changes around calling origional methods for !for_fork? merge requests. Other changes to follow
  
  Change-Id: I009c716ce2475b9efa3fd07aee9215fca7a1c150

  Izaak Alpert

  2013-07-17 22:48:03 -0400  
• 128f2845   Rebased on 6.0 ... Browse Dir »

  -Had to do some minor test clean up as well
  
  Change-Id: I8f378f1b5fe676d73b8691e870c11ca6def90cbf

  Izaak Alpert

  2013-07-17 22:46:38 -0400  
• 0ef055a4   MR on fork: Email fixes, style fixes ... Browse Dir »

  -Removed many extra spaces I added
  -Fixed email templates to be consistent/better looking
  
  GITLAB-894, GITLAB-895, (GITLAB-858)
  
  Change-Id: I35c1a8e0e22af7de26d54e5c3da987fa7bb3921e

  Izaak Alpert

  2013-07-17 22:46:38 -0400  
• 09112dbb   Rebase on master ... Browse Dir »

  Trying to retrigger travis
  Change-Id: Ifd86fb4c6b2791ad176230254fbf69a9ade979fb

  Izaak Alpert

  2013-07-17 22:45:03 -0400  
• bbef8bb5   MR on fork validation error ... Browse Dir »

  Wasn't setting fields so validations would fail
  
  Change-Id: I0363c57bf6c8b9937cc1b4140d09071d7c5168c2

  Izaak Alpert

  2013-07-17 22:45:03 -0400  
• 5d56da6b   MR on fork: Some cleanup, test updates ... Browse Dir »

  -The forked merge request test now tests it's componenets again, and seems to work every time (did this by reordering the branch updates so their is more time for update_branches to run) -- this could still technically fail, but after several runs it doesn't seem to.
  -Removed todo in merge_request, pushed wrapping of grit down to the satellite
  -updated action test to check flock status, made it nolonger pending
  -moved all logging on failure to helper method in satellite
  GITLAB-592
  
  Change-Id: If0554ca35eedc3d3e8461f7d93d4b3939fa2cd75

  Izaak Alpert

  2013-07-17 22:42:51 -0400