提交 · 2a496c095ab355fd1819c8434ed72e640ba1aa2c · 李少辉-开发者 / gitlab-foss

27 1月, 2014 1 次提交
- D
  Add highlightjs assets to vendor · 2a496c09
  由 Dmitriy Zaporozhets 提交于 1月 26, 2014
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  2a496c09
25 1月, 2014 7 次提交

D
Merge branch 'database-confusion' into 'master' · 0955a45a
由 Dmitriy Zaporozhets 提交于 1月 25, 2014
```
Database Confusion

To prevent https://twitter.com/TechIsCool/status/426133762032676865
```
0955a45a
D
Version to 6.6.0.pre · 5cc830d3
由 Dmitriy Zaporozhets 提交于 1月 25, 2014
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
5cc830d3

Merge branch 'reference_relative_links' into 'master' · ced4a37a

由 Dmitriy Zaporozhets 提交于 1月 24, 2014

Reference style links with relative links in markdown

#996

```
Adds relative links support to reference style links, eg:

[GitLab API doc directory][GitLab API directory listing]

[Maintenance][Maintenance rake task]

\[GitLab API directory listing]: doc/api/
\[Maintenance rake task]: doc/raketasks/maintenance.md
```

ced4a37a

D
Merge branch 'improve/developer_permissions' into 'master' · ff07a5ab
由 Dmitriy Zaporozhets 提交于 1月 24, 2014
```
Permissions: Developer can manage issue tracker now
```
ff07a5ab
D
Improve authorization for new/edit blob pages · 237ddd60
由 Dmitriy Zaporozhets 提交于 1月 24, 2014
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
237ddd60
D
Allow developers to mange issue tracker · 4645f464
由 Dmitriy Zaporozhets 提交于 1月 24, 2014
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
4645f464

Merge branch 'improve/mr_service' into 'master' · baccb9a4

由 Dmitriy Zaporozhets 提交于 1月 24, 2014

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

baccb9a4

24 1月, 2014 17 次提交
- M
  Merge branch 'master' into reference_relative_links · 54bcb6cc
  由 Marin Jankovski 提交于 1月 24, 2014
```
Conflicts:
	spec/models/project_spec.rb
```
  54bcb6cc
- D
  Fix mr update issue if merge_request_diff missing · 1338c7dd
  由 Dmitriy Zaporozhets 提交于 1月 24, 2014
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  1338c7dd
- D
  MergeRequests services · 48f741ee
  由 Dmitriy Zaporozhets 提交于 1月 24, 2014
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  48f741ee
- D
  Merge branch 'report_backup_db_success' into 'master' · d1d13856
  由 Dmitriy Zaporozhets 提交于 1月 24, 2014
```
Report success/failure of DB backup commands
```
  d1d13856
- D
  Merge branch 'development_seed_fix' into 'master' · 9bb92674
  由 Dmitriy Zaporozhets 提交于 1月 24, 2014
```
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
```
  9bb92674
- D
  Merge branch 'ssh-docs' into 'master' · d0b87eb0
  由 Dmitriy Zaporozhets 提交于 1月 24, 2014
```
Ssh Docs
```
  d0b87eb0
- D
  Merge branch 'oudated-version-headers' into 'master' · 4e33ae09
  由 Dmitriy Zaporozhets 提交于 1月 24, 2014
```
Oudated Version Headers

If we don't update version numbers we should not include them since they are confusing.
```
  4e33ae09
- D
  Merge branch 'release-procedure' into 'master' · 398876ad
  由 Dmitriy Zaporozhets 提交于 1月 24, 2014
```
Release Procedure

This should be in line with what is actually happening.
```
  398876ad
- D
  Merge branch 'jira-integration' into 'master' · 17086ea1
  由 Dmitriy Zaporozhets 提交于 1月 24, 2014
```
Jira Integration
```
  17086ea1
- D
  
  Need ! to embed. · 3de736ed
  由 dosire 提交于 1月 24, 2014
  
  3de736ed
- D
  
  Embed screenshot. · b9062368
  由 dosire 提交于 1月 24, 2014
  
  b9062368
- D
  
  Jira integration documentation. · 17b422cf
  由 dosire 提交于 1月 24, 2014
  
  17b422cf
- D
  
  Do not branch from master until release is done. · f89df5b4
  由 dosire 提交于 1月 24, 2014
  
  f89df5b4
- D
  Merge pull request #6142 from gdamjan/master · 2adbc0b7
  由 Dmitriy Zaporozhets 提交于 1月 23, 2014
```
Check specifically for Unicorn in rack config.ru file
```
  2adbc0b7
- D
  Merge pull request #6149 from carlosparamio/assembla_hardcoded_project_name · cb9f1a4f
  由 Dmitriy Zaporozhets 提交于 1月 23, 2014
```
Assembla service: Project name was hardcoded (oops)
```
  cb9f1a4f
- C
  
  Project name was hardcoded (oops) · b3731580
  由 Carlos Paramio 提交于 1月 24, 2014
  
  b3731580
- Д
  Check specifically for Unicorn in rack config.ru file · be150fa9
  由 Дамјан Георгиевски 提交于 1月 23, 2014
```
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
```
  be150fa9
23 1月, 2014 15 次提交
- M
  
  Use the correct paths. · d819d0d1
  由 Marin Jankovski 提交于 1月 23, 2014
  
  d819d0d1
- D
  
  Remove version since we don't keep it up to date. · 42220f2a
  由 dosire 提交于 1月 23, 2014
  
  42220f2a
- D
  Merge pull request #6131 from dblessing/fix/mobile_ui_login · 6d3a92f2
  由 Dmitriy Zaporozhets 提交于 1月 23, 2014
```
Enhance responsive UI for the login screen.
```
  6d3a92f2
- D
  Merge branch 'improve/mr_diff' · 28e13634
  由 Dmitriy Zaporozhets 提交于 1月 23, 2014
```
Signed-off-by: NDmitriy 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
```
  28e13634
- D
  
  Split into one sentence per line for future edits. · f909739f
  由 dosire 提交于 1月 23, 2014
  
  f909739f
- D
  Fix project model spec · 573f1f4a
  由 Dmitriy Zaporozhets 提交于 1月 23, 2014
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  573f1f4a
- M
  
  Update last sha of the commit in the test seed repository. · 3bcfdf07
  由 Marin Jankovski 提交于 1月 23, 2014
  
  3bcfdf07
- D
  Fix tests · 71851a7e
  由 Dmitriy Zaporozhets 提交于 1月 23, 2014
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  71851a7e
- D
  Fix mr specs · e013cd44
  由 Dmitriy Zaporozhets 提交于 1月 23, 2014
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  e013cd44
- D
  Fix satellites specs · 4cde3593
  由 Dmitriy Zaporozhets 提交于 1月 23, 2014
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  4cde3593
- D
  fix tests notes_on_merge_requests · 9db8cb3f
  由 Dmitriy Zaporozhets 提交于 1月 23, 2014
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  9db8cb3f
- D
  
  Better ssh key docs. · a91faf40
  由 dosire 提交于 1月 23, 2014
  
  a91faf40
- D
  Fix public tests · 418660b9
  由 Dmitriy Zaporozhets 提交于 1月 23, 2014
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  418660b9
- D
  Fix project team tests · c3270875
  由 Dmitriy Zaporozhets 提交于 1月 23, 2014
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  c3270875
- D
  Fix MR spinach tests · 38034278
  由 Dmitriy Zaporozhets 提交于 1月 23, 2014
```
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
```
  38034278