home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-22 02:56:06 +10:00
Code Issues Packages Projects Releases Wiki Activity
10,629 Commits 48 Branches 340 Tags
0f80ffdf8756a76a6ea0daaa2da5d3e193fcbe99
Commit Graph
10629 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitriy Zaporozhets cf6a0ff760 Merge branch 'assets-css-helpers' into 'master' 
Use rails helper image-url for reference images in css

Fixes #1001
 2014-03-06 13:49:55 +00:00
Dmitriy Zaporozhets 0776199b4a Update gitlab_git to version 5.7.1 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-06 15:48:56 +02:00
Sytse Sijbrandij 75f595ac92 Merge pull request #6447 from jvanbaarsen/patch-2 
Added part about the help to markdown
 2014-03-06 14:24:59 +01:00
mk 61a72bc2e2 Allow underscore as the first char for project names. 
Not sure if the default_regex really has to be expanded for this special use case. We tried to extend only the project_name_regex first, but that didn't help.
 2014-03-06 14:08:40 +01:00
Dmitriy Zaporozhets 2ed06dc41d Fix group_icon spec 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-06 14:04:01 +02:00
Jeroen van Baarsen 60978e94bb Added part about the help to markdown 2014-03-06 12:36:34 +01:00
Dmitriy Zaporozhets 261f212b3b Use rails helper image-url for reference images in css 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-06 11:05:00 +02:00
Dmitriy Zaporozhets 0004aafe37 Merge pull request #6473 from veonik/fix-readme-title 
Fixed readme title
 2014-03-06 10:21:41 +02:00
Dmitriy Zaporozhets c1d070cf55 Merge pull request #6475 from tsigo/merge-request-autocomplete 
Add GFM autocompletion for MergeRequests
 2014-03-06 10:20:55 +02:00
Robert Speicher 1688a29023 Add GFM autocompletion for MergeRequests 
Requested
[here](http://feedback.gitlab.com/forums/176466-general/suggestions/5507440-auto-complete-merge-requests-in-gitlab-markdown).
 2014-03-05 23:24:03 -05:00
Jeroen van Baarsen f096bd61bd Post-receive hook can also fire TagPushService 2014-03-05 22:10:35 +01:00
Jeroen van Baarsen 13d2bcc3b4 Created a basic Git Tag Push service 
This is the first version, and only has the most basic information about
the tag that is created.
 2014-03-05 21:23:49 +01:00
Jeroen van Baarsen 9a676ccc0a Added tag_push_events to the web_hooks 
* Added a scope to the web_hooks model
* Added extra checkbooks in de hooks overview window
 2014-03-05 20:44:01 +01:00
Tyler Sommer e9942e5a79 Fixed readme page title 2014-03-05 11:23:21 -08:00
Dmitriy Zaporozhets 4c132ed48e Merge branch 'gitlab_git_5-7' into 'master' 
Update gitlab_git to 5.7
 2014-03-05 19:20:09 +00:00
Dmitriy Zaporozhets 1445f4211e Update gitlab_git to 5.7 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-05 17:37:00 +02:00
Nick HuancaandDmitriy Zaporozhets d02e129a54 added verify false on gitlab_ci integrations 
For those of us running self-signed in gitlab-ci it generates 500s SSL_verify errors if you don't have this.
 2014-03-05 13:23:44 +02:00
Dmitriy Zaporozhets f1d8efb770 Merge branch 'shell_new_style' into 'master' 
Use new style shell commands
 2014-03-05 10:45:46 +00:00
Jacob Vosmaer 132c1b4c0a Merge branch 'out-of-beta' into 'master' 
Out Of Beta
 2014-03-05 10:29:35 +00:00
dosire 5d34c877e3 Add ruby to package. 2014-03-05 11:23:24 +01:00
dosire 83d94d5c9a The packages are production ready. 2014-03-05 09:01:21 +01:00
Dan Allen 4239e457ac Add .adoc file extension for AsciiDoc 
Add .adoc file extension for AsciiDoc as it's a very popular extension to use and the one recommended by the Asciidoctor project.
 2014-03-04 16:08:48 -07:00
Javier Castro b61f80babb Merge remote-tracking branch 'upstream/master' into fix-4305 2014-03-04 15:09:33 -03:00
Dmitriy Zaporozhets fbbd989770 Merge branch 'update/deploy.sh' into 'master' 
change mysql to postgres in some of the docs and scripts

* update deploy.sh, install gem without mysql, now that we want to use postgres instead
* update update_patch.md to assume postgres before mysql
* update ruby.md, to assume postgres
 2014-03-04 16:39:21 +00:00
Dmitriy Zaporozhets 10458bc478 Merge pull request #6463 from gussan/add_index_merge_request_diffs_on_merge_request_id 
Add index_merge_request_diffs_on_merge_request_id
 2014-03-04 11:31:03 +02:00
Greg Messner 7e14f86c71 Added description parameter support to Create and Update MR API endpoints (issue-110). 2014-03-03 23:08:39 -08:00
gussan 93bc67ab11 Add index_merge_request_diffs_on_merge_request_id 2014-03-04 10:38:09 +09:00
Arif Ali 28f40b7205 prioritise postgres in doc/update/patch_versions.md, assume postgres in doc/update/ruby.md 2014-03-04 00:40:30 +00:00
Arif Ali affc37ad02 change deploy.sh without mysql, now that we are moving to postgres 2014-03-04 00:10:49 +00:00
Dmitriy Zaporozhets d0e73eeca1 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-03-03 22:01:46 +02:00
Dmitriy Zaporozhets 775aa578e4 Merge pull request #6361 from jvanbaarsen/made-binstubs-executable 
Added executable file permission to binstubs
 2014-03-03 19:41:05 +02:00
Dmitriy Zaporozhets 6d71292830 Merge pull request #6453 from gitlabhq/link-to-dot-com 
Link to consolidated website with https links. Fixes #6017
 2014-03-03 19:38:30 +02:00
Pierre de La Morinerie ad278c4e74 Make the merge request notification emails more readable 
Emphasize the meaningful informations, and remove the less needed ones:

* Use "!" to identify a merge request
* Write the name of the commented file for diff notes
* Don't show the assignee in the "merged merge request" email
 2014-03-03 16:58:44 +01:00
Pierre de La Morinerie 306744bbb0 Simplify the default layout of notification emails 
* Less margin: the content appears as the text of the message.

* Streamlined footer: everything on one line, with a small separator.

* Zimbra (www.zimbra.com) chokes on HTML tables, and doesn't display
the content of the message. Switching to a simpler layout fixes the
issue.
 2014-03-03 16:58:44 +01:00
Pierre de La Morinerie 7959455f4d Remove the header banner in notification emails 
Rationale:

* The link to the project is already displayed in the message footer.

* Streamlining: the content of the message is better emphasized.
 2014-03-03 16:58:44 +01:00
Pierre de La Morinerie ec196fbbf2 Remove the quote-style around message in notification emails 
Rationale:

* In this notification email, the message is the most important content.
It should not be dimmed or smaller than the rest of the text.

* Now that all UI elements are removed, the message *is* the email. It
should be written as a standard email message, without styling.
 2014-03-03 16:58:44 +01:00
Pierre de La Morinerie eeb011e34a Remove the author name from issue notes emails 
Rationale: the author name is now displayed in the email "From" field;
this information is no longer needed.
 2014-03-03 16:58:44 +01:00
Pierre de La Morinerie 8e421d2bcb Add the description to the "new issue" and "new merge request" emails 
Previously the content of the issue or merge request was missing from
the email.
 2014-03-03 16:58:44 +01:00
Pierre de La Morinerie b59d105c0e Linkify the reference to the project in the notification emails footer 
Rationale:

* Consistency: the link is always at the same place.

* Streamlining: it allows to remove the header banner, now that the
project url can be accessed from another place.
 2014-03-03 16:58:44 +01:00
Pierre de La Morinerie edd6028bdb Remove custom link to target in notification emails 
Every email has a different way of showing a link to the discussion on
the website. We don't need this anymore, as we now have a standard
"View in GitLab" link in the footer of every email.
 2014-03-03 16:58:44 +01:00
Pierre de La Morinerie 7ba0b502d3 Add a "View in GitLab" link in notification emails 
When an email notification concerns a specific object (issue, note,
merge request, etc.), add a link to the footer of the email that opens
the item's page in a web browser.

Rationale:

* The link is predictable: always the same text, always at the same
location, like any reliable tool.

* It allows to remove the inline-title in many emails, and leave only
the actual content of the message.
 2014-03-03 16:58:44 +01:00
Dmitriy Zaporozhets e6e0ad4e5e Merge branch 'feature/reopen_mr' into 'master' 
Feature: reopen closed merge request
 2014-03-03 13:18:48 +00:00
dosire 2135da1466 Also make the blog https. 2014-03-03 09:28:28 +01:00
Dmitriy Zaporozhets fe8552eff6 Add tests to reopen MR 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-03-03 10:21:50 +02:00
Dmitriy Zaporozhets 03920b96d0 Merge pull request #6456 from jasonblanchard/remove-issue-assignee 
Added option to remove issue assignee on project issue page and issue ed...
 2014-03-03 09:50:54 +02:00
Jacob Vosmaer d6b0ac96f7 Invoke Kernel#system with separate arguments 2014-03-03 08:40:30 +01:00
Jacob Vosmaer b30b9c9c46 Replace shell commands with FileUtils 2014-03-03 08:40:30 +01:00
Jacob Vosmaer dd703b3e2a Remove duplicate code 2014-03-03 08:40:29 +01:00
Jacob Vosmaer 2b816075dc Replace backticks with Gitlab::Popen 2014-03-03 08:40:29 +01:00
lol768 39bb54feb3 Fix registration error info typo 2014-03-02 18:45:38 +00:00