home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-22 11:06:10 +10:00
Code Issues Packages Projects Releases Wiki Activity
8,048 Commits 48 Branches 340 Tags
e322bdbd5ea9de9bf2b7a5c1efb115e294289918
Commit Graph
8048 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitriy Zaporozhets e322bdbd5e Merge branch 'fix/test' of /mnt/ebs/repositories/jhworth.developer/gitlab-ce 2014-01-27 07:55:30 +00:00
Dmitriy Zaporozhets 3713fc6cdf Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2014-01-27 09:40:56 +02:00
Dmitriy Zaporozhets 1eccec1713 Merge pull request #6158 from Razer6/remove_snippet_expiaration_date 
Remove snippet expiration date from UI
 2014-01-26 23:37:53 -08:00
Dmitriy Zaporozhets 11ea009ec7 Merge pull request #6159 from dblessing/fix/mobile_ui_dashboard 
Mobile UI improvements
 2014-01-26 23:37:37 -08:00
Dmitriy Zaporozhets 7986b806a2 Merge pull request #5476 from lyda/logo-white-compress 
Reduce image size.
 2014-01-26 23:36:18 -08:00
Sytse Sijbrandij d239218942 Merge pull request #6163 from Corobi/master 
improve upgrader "latest version" message
 2014-01-26 13:28:07 -08:00
Sytse Sijbrandij 05eb618548 Merge branch 'hipchat-remove-hash' of /mnt/ebs/repositories/Tenzer/gitlab-ce 2014-01-26 15:22:13 +00:00
Sytse Sijbrandij e8dedc6de5 Merge branch 'master' of /mnt/ebs/repositories/sriharsha.vardhan/gitlab-ce 2014-01-26 15:21:11 +00:00
Corobi 17f7da3d97 improve upgrader "latest version" message 2014-01-25 23:33:55 +00:00
Drew Blessing 8b3b6f1096 Mobile UI improvements for dashboard/nav 
Style navbar toggle button

Style navbar toggle manually instead of with button classes

Style navbar

Modify color

Turn off all tooltips for touch devices

Style main nav

Fix scrolling navbar collapse

Style tweaks

Minor tweaks

Style no ssh key message
 2014-01-25 10:07:39 -06:00
Sytse Sijbrandij 8f8db77685 Merge pull request #5907 from boomshadow/patch-1 
Update installation.md with new git version
 2014-01-25 07:59:44 -08:00
Dmitriy Zaporozhets 0955a45a53 Merge branch 'database-confusion' into 'master' 
Database Confusion

To prevent https://twitter.com/TechIsCool/status/426133762032676865
 2014-01-25 09:49:48 +00:00
Dmitriy Zaporozhets 5cc830d3db Version to 6.6.0.pre 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-25 11:48:36 +02:00
Robert Schilling 05c38ab8e0 Remove snippet expiration date from UI 2014-01-25 09:04:33 +01:00
Jason Hollingsworth 39a2adf4f4 Fix broken test in spec/models/project_spec.rb 
A test was broken if running on a non-standard port.
Made checking for (non-)standard port more robust.
Changed gitlab_on_non_standard_port to gitlab_on_standard_port (less negative).
 2014-01-24 21:14:05 -06:00
Dmitriy Zaporozhets ced4a37a18 Merge branch 'reference_relative_links' into 'master' 
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
```
 2014-01-24 22:01:57 +00:00
Dmitriy Zaporozhets ff07a5ab84 Merge branch 'improve/developer_permissions' into 'master' 
Permissions: Developer can manage issue tracker now
 2014-01-24 22:01:31 +00:00
Dmitriy Zaporozhets 237ddd6024 Improve authorization for new/edit blob pages 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-24 21:29:52 +02:00
Dmitriy Zaporozhets 4645f464a3 Allow developers to mange issue tracker 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-24 21:29:22 +02:00
Dmitriy Zaporozhets baccb9a407 Merge branch 'improve/mr_service' into 'master' 
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 +00:00
Marin Jankovski 54bcb6cc2a Merge branch 'master' into reference_relative_links 
Conflicts:
	spec/models/project_spec.rb
 2014-01-24 14:02:11 +01:00
Dmitriy Zaporozhets 1338c7dd71 Fix mr update issue if merge_request_diff missing 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-24 14:38:02 +02:00
Dmitriy Zaporozhets 48f741eed9 MergeRequests services 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-24 14:18:32 +02:00
Dmitriy Zaporozhets d1d138562a Merge branch 'report_backup_db_success' into 'master' 
Report success/failure of DB backup commands
 2014-01-24 11:27:48 +00:00
Dmitriy Zaporozhets 9bb9267482 Merge branch 'development_seed_fix' into 'master' 
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 +00:00
Dmitriy Zaporozhets d0b87eb05b Merge branch 'ssh-docs' into 'master' 
Ssh Docs
 2014-01-24 11:26:47 +00:00
Dmitriy Zaporozhets 4e33ae0926 Merge branch 'oudated-version-headers' into 'master' 
Oudated Version Headers

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

This should be in line with what is actually happening.
 2014-01-24 11:25:03 +00:00
Dmitriy Zaporozhets 17086ea144 Merge branch 'jira-integration' into 'master' 
Jira Integration
 2014-01-24 11:23:50 +00:00
dosire 3de736ed0f Need ! to embed. 2014-01-24 12:12:36 +01:00
dosire b9062368ab Embed screenshot. 2014-01-24 12:12:04 +01:00
dosire 17b422cf97 Jira integration documentation. 2014-01-24 12:09:33 +01:00
dosire f89df5b496 Do not branch from master until release is done. 2014-01-24 09:14:35 +01:00
Dmitriy Zaporozhets 2adbc0b778 Merge pull request #6142 from gdamjan/master 
Check specifically for Unicorn in rack config.ru file
 2014-01-23 23:56:02 -08:00
Dmitriy Zaporozhets cb9f1a4fe7 Merge pull request #6149 from carlosparamio/assembla_hardcoded_project_name 
Assembla service: Project name was hardcoded (oops)
 2014-01-23 23:54:04 -08:00
Carlos Paramio b373158077 Project name was hardcoded (oops) 2014-01-24 08:42:24 +01:00
Дамјан Георгиевски be150fa991 Check specifically for Unicorn in rack config.ru file 
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 +01:00
Marin Jankovski d819d0d1f8 Use the correct paths. 2014-01-23 16:00:39 +01:00
dosire 42220f2a18 Remove version since we don't keep it up to date. 2014-01-23 15:14:07 +01:00
Dmitriy Zaporozhets 6d3a92f225 Merge pull request #6131 from dblessing/fix/mobile_ui_login 
Enhance responsive UI for the login screen.
 2014-01-23 04:58:39 -08:00
Dmitriy Zaporozhets 28e13634dc Merge branch 'improve/mr_diff' 
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 +02:00
dosire f909739f39 Split into one sentence per line for future edits. 2014-01-23 13:28:19 +01:00
Dmitriy Zaporozhets 573f1f4ade Fix project model spec 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-23 14:23:21 +02:00
Marin Jankovski 3bcfdf07cd Update last sha of the commit in the test seed repository. 2014-01-23 13:06:44 +01:00
Dmitriy Zaporozhets 71851a7e4e Fix tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-23 13:31:16 +02:00
Dmitriy Zaporozhets e013cd44e0 Fix mr specs 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-23 13:24:25 +02:00
Dmitriy Zaporozhets 4cde3593b9 Fix satellites specs 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-23 13:21:58 +02:00
Dmitriy Zaporozhets 9db8cb3fec fix tests notes_on_merge_requests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-23 13:17:31 +02:00
dosire a91faf4022 Better ssh key docs. 2014-01-23 12:07:21 +01:00
Dmitriy Zaporozhets 418660b971 Fix public tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-23 13:05:34 +02:00