home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-16 16:16:43 +10:00
Code Issues Packages Projects Releases Wiki Activity
18,287 Commits 48 Branches 340 Tags
0a5b005da170fe81afea012b56f4810125b13ead
Commit Graph
2595 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets c8e3d31925 Merge pull request #4892 from Aigeruth/feature/api-add-diff 
Feature: get the diff of a commit via API.
 2013-08-26 04:02:09 -07:00
Dmitriy Zaporozhets cc4b638c34 Set iid in fixtures. Add rake dev:setup for development 2013-08-26 13:20:45 +03:00
Dmitriy Zaporozhets 48ce80a60c Fix issue when developers are able to push to protected branch 
When that branch contain a '/' in the branch name.
Fix for git over HTTP
 2013-08-26 12:54:57 +03:00
ash wilson c8a115c0e3 Link issues from comments and automatically close them 
Any mention of Issues, MergeRequests, or Commits via GitLab-flavored markdown
references in descriptions, titles, or attached Notes creates a back-reference
Note that links to the original referencer. Furthermore, pushing commits with
commit messages that match a (configurable) regexp to a project's default
branch will close any issues mentioned by GFM in the matched closing phrase.
If accepting a merge request would close any Issues in this way, a banner is
appended to the merge request's main panel to indicate this.
 2013-08-25 18:58:41 -04:00
Gabor Nagy d139cc6b32 Adds feature: get a diff via API. 2013-08-25 23:48:11 +02:00
Dmitriy Zaporozhets ac13960943 Merge pull request #4841 from Razer6/update_path_blacklist 
Add 'hooks' to path blacklist.
 2013-08-25 12:21:22 -07:00
Dmitriy Zaporozhets 23d443a512 Merge pull request #4854 from aus/patch-1 
Fix GitLab Shell version check
 2013-08-25 12:20:26 -07:00
Jacob Vosmaer 2b9d48ccd0 Fix the service gitlab restart command 
This commit addresses two related issues:
- Sidekiq should shut down completely before we restart it;
- If we restart unicorn with USR2 we need to kill the old master and
  worker processes.
 2013-08-23 10:31:32 +02:00
Austin Robertson b74a50451c Fix GitLab Shell version check 2013-08-22 13:10:18 -05:00
Robert Schilling c69637df9a Add 'hooks' to path blacklist. 2013-08-22 08:18:50 +02:00
Dmitriy Zaporozhets e67574fe77 Merge pull request #4829 from hiroponz/render-not-found-when-failing-to-look-for-commit 
Render not found when failing to look for commit
 2013-08-21 04:11:52 -07:00
Hiroyuki Sato 1101ceb3f4 A little improvement 
1. Replace params key 'q' with 'extended_sha1'. A extended SHA1 syntax is explained in 'man gitrevisions'.
2. Change the placeholder of looking for commit.
3. Change the label of ref filter.
 2013-08-21 19:20:29 +09:00
Dmitriy Zaporozhets 625fb2f29d Add iids to milestones. Moved iids logic to separate concern 2013-08-21 12:16:26 +03:00
Hiroyuki Sato 5f24bdb7d0 Render not found when failing to look for a commit 2013-08-21 17:53:51 +09:00
Dmitriy Zaporozhets 0a44ecf3a0 Fix migrate_iids for issues 2013-08-20 22:41:05 +03:00
Dmitriy Zaporozhets 395f3a1d20 Merge branch 'feature/internal_ids' of /home/git/repositories/gitlab/gitlabhq 2013-08-20 19:30:38 +00:00
Dmitriy Zaporozhets 9acaec7a26 Searching for issue/mr by iid in markdown 2013-08-20 17:31:26 +03:00
Dmitriy Zaporozhets a442ad2b14 Added Gitlab::Access module 2013-08-20 15:59:26 +03:00
Dmitriy Zaporozhets b66f4898ea Better message for migrating global projects 2013-08-20 12:40:51 +03:00
Sytse Sijbrandij 7c55c73d63 Fix confusing situation where install guide told you to install init.d script for puma. 2013-08-19 21:54:12 +02:00
Dmitriy Zaporozhets 434c034159 Iid improvemets 
* call set_iid before validation
* make rake task pass event if objects are invalid
* show iid in comment event at dashboard
 2013-08-19 22:53:11 +03:00
Dmitriy Zaporozhets 2e5481b746 Create task to create iid for existing issues/mr 2013-08-19 22:11:18 +03:00
amouhziandHassan Amouhzi 39d8a64d25 Fixes grack authentification under relative_url_root 
Ref: https://github.com/gitlabhq/gitlabhq/commit/e6159b8725f99af78f446f8d33fa0e52b7780430
Ref: https://github.com/gitlabhq/gitlabhq/pull/3204
Ref: https://github.com/gitlabhq/gitlabhq/issues/1228

Add Rails' variable in application.rb to support relative url

This variable is used by assets compilation and other modules.

Note that user needs to change application.rb too

Restrict session cookie to the relative path if set.

Ref: https://github.com/gitlabhq/gitlabhq/commit/2c2f1e31856a4decdae469974f5bea8245316f7e

Fix Update attachment_uploader.rb bug with relative URL

See: https://github.com/gitlabhq/gitlabhq/commit/161afda3fa4fca58f396e9c3acbd72bc14490ace

Fix Wall relative bug with attachement files (javascript)
 2013-08-15 21:25:09 +02:00
Dmitriy Zaporozhets d6aec3fc1a Allow specify path when create project via api 2013-08-14 13:41:06 +03:00
Dmitriy Zaporozhets a6e57749dc Use native repo path for import task. Skip wiki repos 2013-08-14 12:45:17 +03:00
Dmitriy Zaporozhets 7825830ca5 Allow project name, path etc start with number. Fixed specs 2013-08-13 12:24:10 +03:00
Dmitriy Zaporozhets 4537623d12 Merge branch 'master' into karlhungus-mr-on-fork 
Conflicts:
	app/contexts/filter_context.rb
	app/contexts/search_context.rb
	app/models/merge_request.rb
	app/models/note.rb
	app/views/shared/_merge_requests.html.haml
	spec/controllers/commit_controller_spec.rb
	spec/services/notification_service_spec.rb
 2013-08-08 12:22:09 +03:00
Dmitriy Zaporozhets c7e490ebd5 Merge branch 'mr-on-fork' of https://github.com/karlhungus/gitlabhq into karlhungus-mr-on-fork 2013-08-08 12:12:46 +03:00
Dmitriy Zaporozhets bb5e50e0f7 Fix edit files 2013-08-05 16:55:15 +03:00
Dmitriy Zaporozhets b92655663c Update main calls to gitlab_git 2013-08-05 16:51:04 +03:00
Dmitriy Zaporozhets 02e859a234 move backup logic to lib. Fixed removing outdated backups 2013-08-05 12:26:33 +03:00
Dmitriy Zaporozhets af5faaf0e1 Move diff parsing to own class. Correctly identify note diff line 2013-08-04 20:43:49 +03:00
Dmitriy Zaporozhets 2d75b454ef Store diff with line note. It makes possible to see inline notes with proper diff even if MR diff changed 2013-08-04 19:01:57 +03:00
Dmitriy Zaporozhets 49709b1d8a Fix broken user link in email 2013-08-04 16:27:32 +03:00
Dmitriy Zaporozhets 0ef0150d8c Merge branch 'destroy_duplicate_keys' of /home/git/repositories/gitlab/gitlabhq 2013-08-02 13:47:25 +00:00
Jacob Vosmaer 1dda34f306 Delete duplicate keys in migrate_keys task 2013-08-02 15:43:30 +02:00
Izaak Alpert 9a900dbb71 Removed some debug code 
Change-Id: Ibd0088f498faccc72acda2783b61bbea19bd835d
 2013-07-30 16:19:17 -04:00
Izaak Alpert 7856fba362 Updated format_patch to use '..' rather than '...' 
Was incorrectly including commits reachable from rev2.

Change-Id: I3560e5d5ce474ba3d374f29ae16190b1f74989be
 2013-07-30 16:13:01 -04:00
Robert Schilling e08f977bb9 Add 'repository' to path blacklist, fixes #4591 2013-07-30 20:23:30 +02:00
Dmitriy Zaporozhets d19d094b93 Remove ugly button and truncate too long project names. Remove unecessary newlines 2013-07-30 14:12:24 +03:00
Dmitriy Zaporozhets 0d715bcd81 Merge branch 'mr-on-fork' of https://github.com/karlhungus/gitlabhq into karlhungus-mr-on-fork 
Conflicts:
	app/views/projects/commit/show.html.haml
	app/views/projects/compare/show.html.haml
	app/views/projects/merge_requests/branch_from.js.haml
 2013-07-30 13:35:33 +03:00
Jakub Zienkiewicz e03d01d036 extract server-side git commands to constants 2013-07-30 10:15:36 +02:00
Jakub Zienkiewicz 5e35f21605 allow all git-upload-* commands for deploy keys 2013-07-30 10:15:36 +02:00
Johannes Schleifenbaum cd19f82e51 Fix typos 2013-07-29 12:47:06 +02:00
Dmitriy Zaporozhets 475f607a22 Use gitlab-shell authorized_keys truncation. Fix issue with authorized_keys stored in different location 2013-07-18 13:55:01 +03:00
Izaak Alpert 5806402740 Raise Error for diff_between/commit_between for non fork mr's in satellite 
-Fixed tests to account for this
-Trigger update after update_branches for list:update selecting first commit, have it also trigger sha lookup

Change-Id: Ie4c3d4fbf57aeadd7d141d3704f4ea0f0684a7a5
 2013-07-17 22:48:03 -04:00
Izaak Alpert fae3f46615 Refactor merge api create 
-Made the api method a little more readable
-removed some missed extra newline's

Change-Id: Ic38baafc813aaeda0a8b283f39916182c8ec37d5
 2013-07-17 22:48:03 -04:00
Izaak Alpert d99594273d Style changes from review with @randx 
-Some changes around calling origional methods for !for_fork? merge requests. Other changes to follow

Change-Id: I009c716ce2475b9efa3fd07aee9215fca7a1c150
 2013-07-17 22:48:03 -04:00
Izaak Alpert 0ef055a4ae MR on fork: Email fixes, style fixes 
-Removed many extra spaces I added
-Fixed email templates to be consistent/better looking

GITLAB-894, GITLAB-895, (GITLAB-858)

Change-Id: I35c1a8e0e22af7de26d54e5c3da987fa7bb3921e
 2013-07-17 22:46:38 -04:00
Izaak Alpert 5d56da6bdd MR on fork: Some cleanup, test updates 
-The forked merge request test now tests it's componenets again, and seems to work every time (did this by reordering the branch updates so their is more time for update_branches to run) -- this could still technically fail, but after several runs it doesn't seem to.
-Removed todo in merge_request, pushed wrapping of grit down to the satellite
-updated action test to check flock status, made it nolonger pending
-moved all logging on failure to helper method in satellite
GITLAB-592

Change-Id: If0554ca35eedc3d3e8461f7d93d4b3939fa2cd75
 2013-07-17 22:42:51 -04:00