Software Publico / Gitlab

19 Mar, 2014

5 commits

ad3acff4 Merge pull request #6469 from mojavelinux/master ... Browse Dir »
```
Add .adoc file extension for AsciiDoc
```
Sytse Sijbrandij
2014-03-19 16:07:38 +0100
6b522bf9 Merge pull request #6457 from lol768/patch-1 ... Browse Dir »
```
Fix registration error info typo
```
Sytse Sijbrandij
2014-03-19 16:06:31 +0100
1921a934 Add room placeholder for Slack integration ... Browse Dir »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-03-19 14:42:13 +0200
c1fd25ce Replace turbolink spinner with nprogress ... Browse Dir »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-03-19 12:59:23 +0200
d7b5656d Merge branch 'master' of github.com:gitlabhq/gitlabhq Browse Dir »

Dmitriy Zaporozhets
2014-03-19 09:37:14 +0200

18 Mar, 2014

2 commits

e3fc01b3 Added Slack service integration. Browse Dir »

Federico Ravasio
2014-03-18 18:54:30 +0100
a740e2d6 Do not allow password reset for ldap user. Browse Dir »

Marin Jankovski
2014-03-18 12:25:49 +0100

17 Mar, 2014

5 commits

493c7a61 Merge branch 'links_within_same_repo' into 'master' ... Browse Dir »

Relative links within one system

When using relative links in md in repository file it will only link within the repository.
When using relative links in md in wiki page, it will only link to wiki pages.

2014-03-17 14:06:08 +0000

de855e24 Default value for Snippet#private ... Browse Dir »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-03-17 15:50:16 +0200
f04d5bfa Wiki will show relative links related to the wiki gollum repository. Browse Dir »

Marin Jankovski
2014-03-17 13:06:19 +0100
55e2f353 Link to blob instead of linking to wiki. Browse Dir »

Marin Jankovski
2014-03-17 13:05:20 +0100
548f070f Show link to public projects for new users. Browse Dir »

Ciro Santillli
2014-03-17 13:02:04 +0100

15 Mar, 2014

1 commit

66a484c9 Merge branch 'improve-project-lookup' into 'master' ... Browse Dir »
```
Improve Project Lookup

Fixes #1080
```
Dmitriy Zaporozhets
2014-03-15 06:27:15 +0000

14 Mar, 2014

11 commits

7c5320d2 Merge branch 'snippets-page' into 'master' ... Browse Dir »
```
Render 404 instead of 500 if trying to see snippets of unexisting user

Fixes #1087
```
Dmitriy Zaporozhets
2014-03-14 21:10:12 +0000
f84d015f Fix commit comment count css ... Browse Dir »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-03-14 23:09:43 +0200
25f68a71 Project must have namespace for Project#find_with_namespace ... Browse Dir »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-03-14 15:58:10 +0200
a39eeba1 Render 404 instead of 500 if trying to see snippets of unexisting user ... Browse Dir »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-03-14 15:55:41 +0200
17a9ecf8 Remove confusing code ... Browse Dir »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-03-14 14:43:50 +0200
e07b2f52 Fix global search ... Browse Dir »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-03-14 14:41:28 +0200
f3ceebad Ignore newlines per md standard. Browse Dir »

Marin Jankovski
2014-03-14 12:33:03 +0100

b5d81174 Fix mr process order on push. ... Browse Dir »

First close merge requests that being merged. Then update code of open
mr. This fixes bug when MR merged via command line lose their diff
because code reload was before MR close.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

2014-03-14 13:02:55 +0200

1ec106b8 Merge branch 'ldap_connections' ... Browse Dir »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
```
Dmitriy Zaporozhets
2014-03-14 12:58:43 +0200
0d7986a8 Merge branch 'import-timeout' of https://dev.gitlab.org/dzaporozhets/gitlabhq in… ... Browse Dir »
```
…to dzaporozhets/gitlabhq-import-timeout

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
	db/schema.rb
```
Dmitriy Zaporozhets
2014-03-14 12:00:21 +0200
48e90540 Open/close LDAP in ApplicationController ... Browse Dir »
```
By opening the LDAP connection at the controller level we can reuse it
for all LDAP queries during the request.
```
Jacob Vosmaer
2014-03-14 09:03:49 +0100

13 Mar, 2014

7 commits

65cb88f3 Correct BackgroundJobs page for both OSX and linux ... Browse Dir »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-03-13 23:15:33 +0200

2a7da96a Merge branch 'toggle_diff_comments' of https://github.com/jacob-carlborg/gitlabh… ... Browse Dir »

…q 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 +0200

d1bee5e3 Remove default value for Project#imported ... Browse Dir »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-03-13 20:35:11 +0200
5be42456 Create event and clear cache on new trag push ... Browse Dir »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-03-13 11:37:13 +0200
c4263dfb Fix BackgroundJobs page ... Browse Dir »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-03-13 10:39:41 +0200
44c94039 Hide retry import form for non masters ... Browse Dir »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-03-13 10:27:20 +0200
aaff3566 Redirect to import page from show when import in progress ... Browse Dir »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-03-13 10:27:05 +0200

12 Mar, 2014

9 commits

b47646ef Add retry feature to project import ... Browse Dir »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-03-12 19:26:09 +0200
37db76a3 Project import and retry import scaffold ... Browse Dir »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-03-12 19:25:48 +0200
1436433c Add project import state machine ... Browse Dir »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-03-12 17:15:03 +0200
7f50c7f6 Move project creation to service ... Browse Dir »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-03-12 17:14:48 +0200
42f25e75 Improve import notice ... Browse Dir »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-03-12 10:25:37 +0200
ae4ae2b2 Move images from vendor to app so they are compiled by rails ... Browse Dir »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-03-12 10:19:24 +0200
1c23f2b2 Correct image path to social icons ... Browse Dir »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-03-12 10:08:58 +0200
56318a24 Merge pull request #6474 from jvanbaarsen/post-tag-hook ... Browse Dir »
```
Add web hooks on tag
```
Dmitriy Zaporozhets
2014-03-12 09:52:34 +0200

55fbe71a Fix error with reopened merge request not properly reloading ... Browse Dir »

If you reopen a Merge Request and then try to update the source branch
it won't properly reload the code since the "reload_code" method still
checks if the MR is "opened" and not just "open" (which includes reopened)

2014-03-12 08:54:42 +0200