Software Publico / Gitlab

24 Jan, 2014

14 commits

baccb9a4 Merge branch 'improve/mr_service' into 'master' ... Browse Code »

Improve merge request accepting logic

Add locked state to merge request during `accept` action.
Prevents mr being `triggered as merged` twice (hooks, emails etc)
Fixes #998 #729

2014-01-24 16:10:48 +0000

1338c7dd Fix mr update issue if merge_request_diff missing ... Browse Code »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-01-24 14:38:02 +0200
48f741ee MergeRequests services ... Browse Code »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-01-24 14:18:32 +0200
d1d13856 Merge branch 'report_backup_db_success' into 'master' ... Browse Code »
```
Report success/failure of DB backup commands
```
Dmitriy Zaporozhets
2014-01-24 11:27:48 +0000

9bb92674 Merge branch 'development_seed_fix' into 'master' ... Browse Code »

Development  Project Seed Data Fix

After this commit https://dev.gitlab.org/gitlab/gitlabhq/commit/1d2bdb4d5880bb1ad39b62c81ff2971aa0cb3798 Contexts were replaced with Services. One context remained in the seed data which means development seeding will fail.

@dzaporozhets Do we want to backport this to 6.5 too?

/cc @jacobvosmaer @sytse

2014-01-24 11:27:05 +0000

d0b87eb0 Merge branch 'ssh-docs' into 'master' ... Browse Code »
```
Ssh Docs
```
Dmitriy Zaporozhets
2014-01-24 11:26:47 +0000
4e33ae09 Merge branch 'oudated-version-headers' into 'master' ... Browse Code »
```
Oudated Version Headers

If we don't update version numbers we should not include them since they are confusing.
```
Dmitriy Zaporozhets
2014-01-24 11:25:20 +0000
398876ad Merge branch 'release-procedure' into 'master' ... Browse Code »
```
Release Procedure

This should be in line with what is actually happening.
```
Dmitriy Zaporozhets
2014-01-24 11:25:03 +0000
17086ea1 Merge branch 'jira-integration' into 'master' ... Browse Code »
```
Jira Integration
```
Dmitriy Zaporozhets
2014-01-24 11:23:50 +0000
3de736ed Need ! to embed. Browse Code »

dosire
2014-01-24 12:12:36 +0100
b9062368 Embed screenshot. Browse Code »

dosire
2014-01-24 12:12:04 +0100
17b422cf Jira integration documentation. Browse Code »

dosire
2014-01-24 12:09:33 +0100
f89df5b4 Do not branch from master until release is done. Browse Code »

dosire
2014-01-24 09:14:35 +0100
b3731580 Project name was hardcoded (oops) Browse Code »

Carlos Paramio
2014-01-24 08:42:24 +0100

23 Jan, 2014

21 commits

2adbc0b7 Merge pull request #6142 from gdamjan/master ... Browse Code »
```
Check specifically for Unicorn in rack config.ru file
```
Dmitriy Zaporozhets
2014-01-23 23:56:02 -0800
cb9f1a4f Merge pull request #6149 from carlosparamio/assembla_hardcoded_project_name ... Browse Code »
```
Assembla service: Project name was hardcoded (oops)
```
Dmitriy Zaporozhets
2014-01-23 23:54:04 -0800

be150fa9 Check specifically for Unicorn in rack config.ru file ... Browse Code »

Don't assume that if the Rack server is not Passenger then it must be Unicorn. There are many other Rack servers in the world (uwsgi being one example that people use a lot).

The reverse check is much more logical, i.e. check explicitly for Unicorn

2014-01-23 18:24:31 +0100

42220f2a Remove version since we don't keep it up to date. Browse Code »

dosire
2014-01-23 15:14:07 +0100
6d3a92f2 Merge pull request #6131 from dblessing/fix/mobile_ui_login ... Browse Code »
```
Enhance responsive UI for the login screen.
```
Dmitriy Zaporozhets
2014-01-23 04:58:39 -0800

28e13634 Merge branch 'improve/mr_diff' ... Browse Code »

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

Conflicts:
	features/steps/project/project_fork.rb
	features/steps/project/project_forked_merge_requests.rb
	features/steps/project/project_issue_tracker.rb
	features/steps/project/project_markdown_render.rb
	features/steps/shared/project.rb

2014-01-23 14:38:23 +0200

f909739f Split into one sentence per line for future edits. Browse Code »

dosire
2014-01-23 13:28:19 +0100
573f1f4a Fix project model spec ... Browse Code »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-01-23 14:23:21 +0200
71851a7e Fix tests ... Browse Code »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-01-23 13:31:16 +0200
e013cd44 Fix mr specs ... Browse Code »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-01-23 13:24:25 +0200
4cde3593 Fix satellites specs ... Browse Code »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-01-23 13:21:58 +0200
9db8cb3f fix tests notes_on_merge_requests ... Browse Code »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-01-23 13:17:31 +0200
a91faf40 Better ssh key docs. Browse Code »

dosire
2014-01-23 12:07:21 +0100
418660b9 Fix public tests ... Browse Code »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-01-23 13:05:34 +0200
c3270875 Fix project team tests ... Browse Code »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-01-23 13:02:43 +0200
38034278 Fix MR spinach tests ... Browse Code »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-01-23 12:55:43 +0200
9e6fc8b5 Report failure of DB backup commands Browse Code »

Jacob Vosmaer
2014-01-23 11:19:43 +0100
5e08f813 Replace context with service in development seed data. Browse Code »

Marin Jankovski
2014-01-23 10:09:19 +0100
68590fdd Version 6.5.1 ... Browse Code »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-01-23 10:13:23 +0200
ccae561f Fix selectbox when submit MR from fork to origin ... Browse Code »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-01-23 10:08:26 +0200
69ff7657 Fix HELP layout ... Browse Code »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-01-23 09:23:58 +0200

22 Jan, 2014

5 commits

7c3a7053 Enhance responsive UI for the login screen. Browse Code »

Drew Blessing
2014-01-22 20:01:02 -0600
cee68dec Fix api merge request specs ... Browse Code »
```
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
Dmitriy Zaporozhets
2014-01-22 21:59:09 +0200
4742dba4 Merge branch 'master' of github.com:gitlabhq/gitlabhq Browse Code »

Dmitriy Zaporozhets
2014-01-22 21:08:19 +0200
4d56c359 Merge pull request #6075 from skv-headless/remove_deprecated_finders ... Browse Code »
```
Remove deprecated finders
```
Dmitriy Zaporozhets
2014-01-22 11:04:56 -0800

c227aa44 Make changes to tests ... Browse Code »

* project_with_code -> project
* project -> ermpty_project

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

2014-01-22 21:03:52 +0200