home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-24 20:16:08 +10:00
Code Issues Packages Projects Releases Wiki Activity
18,287 Commits 48 Branches 340 Tags
0a5b005da170fe81afea012b56f4810125b13ead
Commit Graph
4837 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 1a17289bd3 Merge branch 'remove_source_branch_button' of https://github.com/jacob-carlborg/gitlabhq into jacob-carlborg-remove_source_branch_button 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/assets/javascripts/merge_requests.js.coffee
	app/assets/stylesheets/sections/merge_requests.scss
	app/controllers/projects/merge_requests_controller.rb
 2014-04-06 13:54:54 +03:00
Marin Jankovski 17bb700712 Only show diff it exists. 2014-04-04 19:12:23 +02:00
dosire 6205b068cd Reduce the number of times people send emails or file issues out of the blue. 2014-04-04 08:05:09 +02:00
Dmitriy Zaporozhets 8cc5e85543 Mention protected branch force push 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-03 17:06:11 +03:00
Dmitriy Zaporozhets 9ee697dd68 Use MergeRequest services in API and controllers 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-02 21:51:53 +03:00
Dmitriy Zaporozhets 2ab53dfb1c Merge branch 'issue_search_filter' into 'master' 
Fix reset of issue search on submit
 2014-04-02 15:30:13 +00:00
Dmitriy Zaporozhets 09d24a1f67 Better title suggestion for new MR 
Ex. if branch named "refactor-models" then title will be "Refactor models"

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-04-02 14:16:37 +03:00
Marin Jankovski b06f43288a Pass the required parameters on search submit. 2014-04-02 12:26:09 +02:00
dosire 049cb4bf89 Only one link per email to prevent clicking the wrong one. 2014-04-02 12:10:01 +02:00
Robert Boloc dd32c9f0ed Updated notification message 2014-03-31 12:24:55 +02:00
Robert Boloc 3055331965 Grammar correction: "View in Gitlab" 
Changed to "View on Gitlab"
 2014-03-31 12:05:41 +02:00
Tom de Bruijn ce857b7cc9 Improve alignment of labels in .well-list items 2014-03-28 13:22:43 +01:00
Dmitriy Zaporozhets 0e44039e52 Merge pull request #6395 from dpursehouse/grammar-fixes 
Fix another instance of "created at"
 2014-03-27 19:53:22 +02:00
Dmitriy Zaporozhets c66218ec94 Merge pull request #6634 from jvanbaarsen/see-merge-status-no-permission 
Always show merge status
 2014-03-27 19:48:05 +02:00
Jeroen van Baarsen 592dce18b5 Always show merge status 
Always show the merge status of a merge request, even if the user has no
permission to do the actual merging.

Fixes
http://feedback.gitlab.com/forums/176466-general/suggestions/5673321-everyone-should-be-able-to-see-a-mr-status
 2014-03-27 15:32:28 +01:00
Kyle Fazzari 762c7b4f2b Fixed 500 error when creating issue for project with no commits. 
The form was updated to check that the repository wasn't empty before trying
to load the contribution guide.

This fixes #153.
 2014-03-27 08:20:43 -04:00
Marin Jankovski 0f05519777 Merge pull request #6610 from Datacom/feature/parallel_diff_scrollbars_pr2 
Refactor Parallel Diff feature and add scrollbars
 2014-03-27 08:20:25 +01:00
George Dewar 83f811fff5 Refactor Parallel Diff feature and add scrollbars 
Also now removed lines relating to unused comments feature
 2014-03-27 09:15:25 +13:00
Marin Jankovski 043c9f8640 Change Diff to Changes in views. 2014-03-26 14:00:12 +01:00
Marin Jankovski eda2c0c607 Include commits. 2014-03-25 18:53:09 +01:00
Dmitriy Zaporozhets e320ee3fb7 Merge branch 'humanize-over-titleize' into 'master' 
Use humanize instead of titleize for MR title suggestion
 2014-03-25 10:06:11 +00:00
Dmitriy Zaporozhets 0aed79b5b5 Merge branch 'improve-archived-projects' into 'master' 
Proper message for archived projects at MR#show page

Fixes #940
 2014-03-25 09:41:35 +00:00
Dmitriy Zaporozhets 12778fbe19 Merge pull request #6612 from Datacom/feature/print_styles_pr 
Print Styles
 2014-03-25 11:07:10 +02:00
George Dewar 842ad4a425 Initial implementation 2014-03-25 15:58:16 +13:00
Dmitriy Zaporozhets cec02067ec Merge branch 'improve-mr-form' into 'master' 
Remove assignee/milestone selects from MR form

Fixes #1079 and http://feedback.gitlab.com/forums/176466-general/suggestions/5663897-merge-request-assign-to-should-popule-with-membe
 2014-03-24 15:41:53 +00:00
Dmitriy Zaporozhets 394737b2cb Use humanize instead of titleize for MR title suggestion 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-24 16:15:57 +02:00
Marin Jankovski 5e985a7eed Use emoji assets on autocomplete. 2014-03-24 14:22:11 +01:00
Dmitriy Zaporozhets eb4320cb07 Remove assignee/milestone selects from MR form 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-24 15:20:29 +02:00
Dmitriy Zaporozhets 5fbf15cb88 Add proper explanation to MR in archived projects 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-24 15:10:21 +02:00
Dmitriy Zaporozhets 12d162993e Merge pull request #6602 from dblessing/mobile_ui 
Mobile UI improvements
 2014-03-24 09:49:25 +02:00
Drew Blessing dab09af518 Mobile UI Improvements 
Move spinner for mobile
 2014-03-23 21:30:37 -05:00
awiddersheim 3704d85bc4 Remove periods from merge request 
The "Merged by" and "Closed by" statements end with an extra space followed by a period. This doesn't seem necessary to me and not having the extra space followed by a period looks better to me. Also, the top of the merge request doesn't have the sentence ending with a period.
 2014-03-22 16:44:13 -04:00
Marin Jankovski 5f595be4b8 Use new gems methods. 2014-03-20 13:33:16 +01:00
Job van der Voort 622bbf9629 line break 2014-03-19 14:07:42 +01:00
Job van der Voort 0e31cb40d3 require public email with oauth provider message 2014-03-19 14:01:13 +01:00
Dmitriy Zaporozhets c1fd25ce6e Replace turbolink spinner with nprogress 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-19 12:59:23 +02:00
Ciro Santillli 548f070f0e Show link to public projects for new users. 2014-03-17 13:02:04 +01:00
Dmitriy Zaporozhets f84d015fa9 Fix commit comment count css 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-14 23:09:43 +02:00
Dmitriy Zaporozhets 0d7986a8c7 Merge branch 'import-timeout' of https://dev.gitlab.org/dzaporozhets/gitlabhq into dzaporozhets/gitlabhq-import-timeout 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
	db/schema.rb
 2014-03-14 12:00:21 +02:00
Dmitriy Zaporozhets 2a7da96a0d Merge branch 'toggle_diff_comments' of https://github.com/jacob-carlborg/gitlabhq into jacob-carlborg-toggle_diff_comments 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/assets/stylesheets/sections/commits.scss
	app/assets/stylesheets/sections/notes.scss
	app/views/projects/commits/_diffs.html.haml
	features/steps/project/merge_requests.rb
 2014-03-13 23:11:16 +02:00
Dmitriy Zaporozhets c4263dfbaf Fix BackgroundJobs page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-13 10:39:41 +02:00
Dmitriy Zaporozhets 44c9403917 Hide retry import form for non masters 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-13 10:27:20 +02:00
Dmitriy Zaporozhets 37db76a31b Project import and retry import scaffold 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-12 19:25:48 +02:00
Dmitriy Zaporozhets 42f25e75f8 Improve import notice 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-12 10:25:37 +02:00
Dmitriy Zaporozhets 56318a24b1 Merge pull request #6474 from jvanbaarsen/post-tag-hook 
Add web hooks on tag
 2014-03-12 09:52:34 +02:00
Dmitriy Zaporozhets dff9221c40 Show import notice in callout block 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-11 18:34:43 +02:00
Dmitriy Zaporozhets a6eb28abc5 Better explanation for import url 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-11 18:23:03 +02:00
Dmitriy Zaporozhets 7157f79caa Refactor js behaviours helpers 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-11 15:15:08 +02:00
Dmitriy Zaporozhets 9f405068cd SHow group name in access granted email 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-11 13:33:47 +02:00
Dmitriy Zaporozhets c4f9dff480 Merge branch 'simplify-emails-content' into 'master' 
Streamline the content of notification emails

In notification emails, the actual content of the email is often buried under several blocks of chrome — and may even be truncated or completely missing. Ideally, the notification emails would be like *real emails*: a short message of meaningful text, sent from the author of the change that triggered the notification.

This MR includes the following changes to notification emails:

* Remove much of the chrome (e.g. the "GitLab" header)
* Emphasize the content (no more small, grayed-out content)
* Add missing informations to the emails (issue description in "new issue" email, file name in "diff comment" email)
* Add a consistent "View in GitLab" link in the footer
* The assignee is displayed only if someone is assigned
* Fix a rendering bug when viewing emails with [Zimbra](http://www.zimbra.com/)

We use these patches at [Capitaine Train](http://www.capitainetrain.com), and it has been a surprisingly big productivity boost for us.

![Before and after](http://f.cl.ly/items/3n0P2c2v1P0y011c0D3e/Before%20and%20After.png)
 2014-03-11 10:39:29 +00:00