Software Publico / Gitlab

08 May, 2014

33 commits

9e111537 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce Browse Code »

Dmitriy Zaporozhets
2014-05-08 21:50:14 +0300
32875f9a Merge pull request #6937 from chamill/master ... Browse Code »
```
Provide fallback for missing `name` value.
```
Dmitriy Zaporozhets
2014-05-08 21:49:59 +0300

058c4884 Merge branch 'fix_merge_request_emails' into 'master' ... Browse Code »

Remove markdown syntax from notification emails

Merge request notifications once again gained markdown syntax :smile: In my opinion, markdown should not be present in emails because it is not rendered - it looks funny. I fixed this once before in 57ad81a9c55352d39a88a5c878cc81f59f5328fa and it was recently changed back to use the markdown style.

2014-05-08 18:36:32 +0000

8c1201ef Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce Browse Code »

Dmitriy Zaporozhets
2014-05-08 21:31:43 +0300
4ca1a29d Merge pull request #6934 from skv-headless/ctrl_enter_form_submit ... Browse Code »
```
submit notes forms by pressing ctrl+enter
```
Dmitriy Zaporozhets
2014-05-08 21:31:25 +0300
aa5f306d Merge pull request #6860 from hszcg/dev ... Browse Code »
```
Add support for side-by-side inline comments
```
Dmitriy Zaporozhets
2014-05-08 21:23:44 +0300
cb20ab02 Merge pull request #6929 from asedge/fix_api_branches_with_periods ... Browse Code »
```
Add fix for API when branch names have periods in them.  Relates to issu...
```
Dmitriy Zaporozhets
2014-05-08 21:22:13 +0300
1ba865c6 Merge branch 'master' into 'master' ... Browse Code »
```
Added Laravel API Wrapper
```
Dmitriy Zaporozhets
2014-05-08 18:21:49 +0000
4d11a3d8 Merge pull request #6941 from jvanbaarsen/typo-fix ... Browse Code »
```
Fix a minor typo in the README
```
Dmitriy Zaporozhets
2014-05-08 21:21:13 +0300
5218537c Merge branch 'rails_4_0_5' into 'master' ... Browse Code »
```
Rails 4.0.5
```
Dmitriy Zaporozhets
2014-05-08 17:30:43 +0000
e5de0068 Merge branch 'tar_version_encoding' into 'master' ... Browse Code »
```
Fix tar version string encoding bug
```
Dmitriy Zaporozhets
2014-05-08 16:24:16 +0000
da347d1b Apply the locale encoding to `tar --version` ... Browse Code »
```
Fixes a bug with non-UTF8 locales introduced by
2b816075dc71dfe8f6f9e5349fdff7f03ad9dad0.
```
Jacob Vosmaer
2014-05-08 18:23:44 +0200
41231862 Fix tests ... Browse Code »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-05-08 19:23:39 +0300
4917dc64 Merge branch '2-step-mr' into 'master' ... Browse Code »
```
2 step merge request process
```
Dmitriy Zaporozhets
2014-05-08 16:11:03 +0000
536373ad Dont allow mr compare with empty branches ... Browse Code »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-05-08 19:00:03 +0300
4673d980 Merge branch 'convert_backup_to_postgres' into 'master' ... Browse Code »
```
Convert MySQL backup to Postgres
```
Dmitriy Zaporozhets
2014-05-08 15:02:58 +0000
6af6f4b4 Merge branch 'update_gitlab_grit' into 'master' ... Browse Code »
```
Update gitlab grit version
```
Dmitriy Zaporozhets
2014-05-08 15:01:38 +0000
86bf684f Minor UI improvements and fixed test ... Browse Code »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-05-08 16:30:39 +0300
ad5a982d Update sass-rails with newer version of rails. Browse Code »

Marin Jankovski
2014-05-08 15:28:07 +0200
04561011 Clean up conditional statement in `name` method. ... Browse Code »
```
Reverse the conditional order to avoid awkward `if !` construction.
```
C. Morgan Hamill
2014-05-08 09:23:17 -0400
700b6366 Fix a minor typo in the README Browse Code »

Jeroen van Baarsen
2014-05-08 14:57:42 +0200
2da289cf Add assignee and milestone to 2nd step ... Browse Code »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-05-08 15:52:59 +0300
ee3cd06f Remove unnecessary css margin ... Browse Code »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-05-08 15:40:19 +0300
51e976d2 Add assignee/milestone block to merge request edit page. And remove branches selector from this page ... Browse Code »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-05-08 15:40:02 +0300
8eae01ea Compare branches in MergeRequestsController#new action ... Browse Code »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-05-08 15:38:52 +0300
05e63fe0 MergeRequest#new 2 step process ... Browse Code »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-05-08 15:38:17 +0300
23de3551 Add MergeRequest#target_project_namespace ... Browse Code »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-05-08 15:37:36 +0300
5014a5b7 Update rails to 4.0.5 Browse Code »

Jacob Vosmaer
2014-05-08 13:59:31 +0200
3bfbea37 Indicate when to stop/start GitLab Browse Code »

Jacob Vosmaer
2014-05-08 13:18:22 +0200
92591b63 Add an introcudtion to mysql_to_postgresql.md Browse Code »

Jacob Vosmaer
2014-05-08 13:18:12 +0200
da9b009d Add fix for API when branch names have periods in them. Relates to issue #6128 … ... Browse Code »
```
…(https://github.com/gitlabhq/gitlabhq/issues/6128).
```
Sean Edge
2014-05-08 07:06:47 -0400
c01efa0e Document how to convert a backup to PostgreSQL Browse Code »

Jacob Vosmaer
2014-05-08 12:12:14 +0200
5f74f051 Update gitlab-grit to 2.6.6. Browse Code »

Marin Jankovski
2014-05-08 09:13:41 +0200

07 May, 2014

7 commits

a45f7262 Clean up of `name` fallback code. ... Browse Code »
```
Don't use `unless` for the conditional.
Avoid double-quotes where possible.
```
C. Morgan Hamill
2014-05-07 16:41:35 -0400
9e805b77 Provide fallback for missing `name` value. ... Browse Code »
```
If `auth.info.name` is `nil`, then use `auth.info.first_name + auth.info.last_name`
as the value of `name`.
```
C. Morgan Hamill
2014-05-07 16:33:54 -0400
3dea71ce Merge branch 'satellite-diff-collector' into 'master' ... Browse Code »
```
Add CompareAction class for collecting commits and diffs using satellites
```
Dmitriy Zaporozhets
2014-05-07 18:41:18 +0000
a8624cbe submit notes forms by pressing ctrl+enter Browse Code »

skv-headless
2014-05-07 17:50:56 +0400
4fea8afc Add CompareAction class for collecting commits and diffs using satellites ... Browse Code »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-05-07 16:14:24 +0300
dd3a5506 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce Browse Code »

Dmitriy Zaporozhets
2014-05-07 14:57:26 +0300
e652a753 Merge branch 'master' of github.com:gitlabhq/gitlabhq Browse Code »

Dmitriy Zaporozhets
2014-05-07 14:55:56 +0300