home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-15 23:56:09 +10:00
Code Issues Packages Projects Releases Wiki Activity
18,287 Commits 48 Branches 340 Tags
0a5b005da170fe81afea012b56f4810125b13ead
Commit Graph
2020 Commits
Author SHA1 Message Date
Sytse Sijbrandij 05eb618548 Merge branch 'hipchat-remove-hash' of /mnt/ebs/repositories/Tenzer/gitlab-ce 2014-01-26 15:22:13 +00: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 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
Carlos Paramio b373158077 Project name was hardcoded (oops) 2014-01-24 08:42:24 +01: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
Dmitriy Zaporozhets 380342784d Fix MR spinach tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-23 12:55:43 +02:00
Dmitriy Zaporozhets 4d56c359d3 Merge pull request #6075 from skv-headless/remove_deprecated_finders 
Remove deprecated finders
 2014-01-22 11:04:56 -08:00
Dmitriy Zaporozhets 4b3afe2325 Always create merge_request_diff if MR created 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-22 20:22:20 +02:00
Dmitriy Zaporozhets 51ea42e238 Improve commit render performnace for MR show page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-22 15:54:53 +02:00
Dmitriy Zaporozhets 39a86963e9 Set mr_diff state to collected if diff is ok 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-22 15:30:14 +02:00
Dmitriy Zaporozhets 79bfbe5918 Remove commits/diff store login from MergeRequest model 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-22 15:20:20 +02:00
Dmitriy Zaporozhets d9be420ee6 MergeRequestDiff model responsoible for storing commits/diff info 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-22 15:19:02 +02:00
Dmitriy Zaporozhets 5f9d90e218 Merge pull request #5958 from brunoga/go-repository-fetch 
Added support for Go's repository retrieval.
 2014-01-21 02:27:21 -08:00
Bruno Albuquerque fb782476f9 Change web_url_without scheme to web_url_without_protocol. 2014-01-20 06:26:34 -05:00
skv a3f645ef51 Remove deprecated finders 2014-01-19 23:39:56 +04:00
Dmitriy Zaporozhets 3628eb84c4 Merge pull request #6072 from jvanbaarsen/fix-3516 
Better check on the validity of emails
 2014-01-19 10:29:06 -08:00
Dmitriy Zaporozhets f8aae4b7d8 Merge branch 'add_website_url_to_user' of https://github.com/jeromedalbert/gitlabhq into jeromedalbert-add_website_url_to_user 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	CHANGELOG
 2014-01-19 20:23:29 +02:00
Jerome Dalbert 2e3f250d45 Add website url to user 2014-01-18 19:15:10 +00:00
Dmitriy Zaporozhets 712a2ec4fd Case-insensetive search autocomplete for projets 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-18 16:22:57 +02:00
Dmitriy Zaporozhets 073a269831 Refactor search autocomplete. Use ajax for source 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-18 14:16:46 +02:00
Jeroen van Baarsen 05e4af5b4c Better check on the validity of emails 
At this moment it was possible to enter emails like:
mailto:info@example.com. This was causing some issue in the frontend,
since those links became html mailto: links.

Fixes: #3516
 2014-01-16 12:14:47 +01:00
Jacob Vosmaer 5ae0d61d0a Disable SSL peer verification for all webhooks 
SSL peer verification was silently enabled by the HTTParty upgrade in
8a54fda459. This patch restores the
previous behaviour of GitLab 6.3 and earlier.
 2014-01-15 15:29:22 +01:00
Dmitriy Zaporozhets 2e7abbd66c Move repo rename email to notification service 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-15 14:03:52 +02:00
Dmitriy Zaporozhets 38d8d749d7 Merge branch 'feature/merge_commit_message' of /home/git/repositories/gitlab/gitlabhq 2014-01-15 10:36:12 +00:00
Dmitriy Zaporozhets b85e4d3cbd Move issues sort logic to Issuable concern 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-14 20:49:32 +02:00
Jeppe Toustrup 6cd745c2f7 Removed hash from "<user> #pushed to branch..." Hipchat notification 2014-01-14 10:57:10 +01:00
Dmitriy Zaporozhets 09d5868c22 Fix mr controller specs 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-14 10:47:28 +02:00
Dmitriy Zaporozhets db966364de MergeRequest#automerge accepts custom message now. MergeRequest#merge_commit_message generate default one 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-13 17:20:30 +02:00
Drew Blessing 09cbe95b20 Add note for assignee changes 
Change to username per @PixnBits suggestion
 2014-01-06 15:38:13 -06:00
Bruno Albuquerque ee3046f9a9 Use web_url for web_url_without_scheme. 
- Previus version was still incorrect as it ignored cases where GitLab would
  be installed in a custom location.
- This assumes that if this method can be calle, web_url will return a valid
  URL.
 2013-12-30 17:44:11 -05:00
Bruno Albuquerque 9393809066 Use project methods instead of attributes. 
- This should work correctly in all cases now.
- Added a new project method that returns the web url for a project without
  the scheme prefix.
 2013-12-30 15:14:15 -05:00
Dmitriy Zaporozhets 611c5f1d7c Sort dropdown for Dashboard#projects page 
Be default it sorts by name now
Respect filters like scope, label, visibility when do sort or another
filter

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-29 12:58:00 +02:00
Dmitriy Zaporozhets 7bf0add0d1 Merge branch 'refactor/notes' of /home/git/repositories/gitlab/gitlabhq 2013-12-26 08:23:08 +00:00
Dmitriy Zaporozhets 4cd7a56333 Add User#email uniq validation. Fixed confirmation for admin/users form 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-26 10:20:36 +02:00
Dmitriy Zaporozhets a389d77769 Fix User#by_username_or_id for postgres 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-26 10:09:15 +02:00
Dmitriy Zaporozhets f7e7dc7ebb Make note anchors actually work 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-25 13:32:43 +02:00
Dmitriy Zaporozhets 34f994b7c5 Improve dev fixtures 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-25 09:56:39 +02:00
Dmitriy Zaporozhets e6f83399f3 Dont allow upload of non-image formats for user avatar 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-23 20:28:59 +02:00
Dmitriy Zaporozhets d1e8495890 Add validations to BroadcastMessage color and font 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-19 20:11:01 +02:00
Dmitriy Zaporozhets aef944ba7f Merge branch 'atomaka/feature/message-colors' of https://github.com/atomaka/gitlabhq into 6-5-dev 2013-12-19 19:58:40 +02:00
Dmitriy Zaporozhets 8bcb2ff27e Merge pull request #5865 from skv-headless/master 
pluck user_ids during team import
 2013-12-19 08:56:51 -08:00
Andrew Tomaka 0760ba3efb Customization and previewing of broadcast messages 2013-12-18 17:43:45 -05:00
Dmitriy Zaporozhets 35c4351e2b Validate project creator only on create 
This fixes bug when creator was removed and you cant edit project
because validation requires creator.

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-18 20:58:16 +02:00
Dmitriy Zaporozhets dad576a777 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2013-12-18 14:40:37 +02:00
Dmitriy Zaporozhets 6ac73f45f0 Move EmailOnPush logic to async worker 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-18 13:42:12 +02:00
Alexey Elizarov 984eb08cbe Duplicate opened scope for issue 
Was it correct?
 2013-12-17 23:32:19 +03:00
skv 3adf35fb64 pluck user_ids during team import 2013-12-17 22:37:56 +04:00
Dmitriy Zaporozhets 5f85d6d1ce Better description to EmailsOnPush service 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-17 16:31:12 +02:00
Dmitriy Zaporozhets 074efd8fd5 Email on push: dont send email if new branch was pushed or branch was removed 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2013-12-17 16:20:45 +02:00