home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-17 08:36:06 +10:00
Code Issues Packages Projects Releases Wiki Activity
7,841 Commits 48 Branches 340 Tags
2f55d0b6bec248cca0cd14ff2ff623ab35e1e1dc
Commit Graph
7841 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
skv 2f55d0b6be fix n+1 problem for namespaces 2014-01-15 15:23:47 +04: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 9a1d0c1739 Merge pull request #6050 from jvanbaarsen/regex-fix 
Allow . files to be created
 2014-01-14 13:59:46 -08:00
Dmitriy Zaporozhets fb0b932937 Revert "Fix deprecation in specs" 
This reverts commit 414ead57ee.
 2014-01-14 23:55:51 +02:00
Dmitriy Zaporozhets 3efbdbfda6 Increase max height of select2 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-14 21:52:39 +02:00
Dmitriy Zaporozhets d87d46f9d9 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2014-01-14 21:45:51 +02:00
Dmitriy Zaporozhets eba8aa742c More styling to select2 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-14 21:45:20 +02:00
Sytse Sijbrandij a809dbf51e Merge pull request #6056 from nburkley/patch-2 
Fixing Link to Contributing guide
 2014-01-14 11:24:42 -08:00
Dmitriy Zaporozhets ea9ea3fe92 Move sort dropdown to the right 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-14 21:15:17 +02:00
Dmitriy Zaporozhets e19d05ddd6 Fix issues selects 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-14 21:07:59 +02:00
nburkley ff8f8eae9c Fixing Link to Contributing guide 
Link was a 404, added missing '/' in url
 2014-01-14 19:58:47 +01:00
Dmitriy Zaporozhets 2940785c17 Add sort dropdown to merge requests list 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-14 20:55:59 +02:00
Dmitriy Zaporozhets 2c071314ae Move issues sort dropdown to shared partial 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-14 20:55:42 +02: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
Dmitriy Zaporozhets adf6ee09b0 Merge pull request #6053 from zzet/patch-6 
Fix deprecation in specs
 2014-01-14 10:31:12 -08:00
Dmitriy Zaporozhets fafa1a2c51 Merge pull request #6054 from zzet/patch-7 
Remove Debug from tests
 2014-01-14 10:30:59 -08:00
Dmitriy Zaporozhets 0c637acb69 Add login and remember_me to devise permit list 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-14 20:28:41 +02:00
Dmitriy Zaporozhets 688af57da0 Increase width of issue filter field 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-14 20:27:19 +02:00
Dmitriy Zaporozhets 2e79f83071 Add hr below mr title 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-14 20:23:56 +02:00
Andrew Kumanyaev fe3f7f536d Remove Debug from tests 2014-01-14 21:05:12 +03:00
Andrew Kumanyaev 414ead57ee Fix deprecation in specs 
DEPRECATION: `expect { }.not_to raise_error(SpecificErrorClass)` is deprecated. Use `expect { }.not_to raise_error` (with no args) instead. Called from /home/travis/build/gitlabhq/gitlabhq/spec/tasks/gitlab/backup_rake_spec.rb:42:in `block (4 levels) in <top (required)>'.
 2014-01-14 20:57:29 +03:00
Dmitriy Zaporozhets 99a2b31e98 Dont allow merge without commit message 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-14 19:56:52 +02:00
Jeroen van Baarsen cc1f7ea2de Allow . files to be created 
Fixes: https://github.com/gitlabhq/gitlabhq/issues/5770
 2014-01-14 18:26:01 +01:00
Dmitriy Zaporozhets 71f1a84599 Merge branch 'no-options' of /home/git/repositories/gitlab/gitlabhq 2014-01-14 13:56:42 +00:00
Dmitriy Zaporozhets 85a6fe4ba7 Merge branch 'improve/side_filters' of /home/git/repositories/gitlab/gitlabhq 2014-01-14 13:47:15 +00:00
dosire 82aaa89778 Add note about not wanting unneeded options. 2014-01-14 14:24:00 +01:00
Dmitriy Zaporozhets 8b513fbc50 Improve side filters and make them look similar 2014-01-14 13:51:59 +02:00
Dmitriy Zaporozhets 5a52c9b0a6 Merge pull request #6038 from jvanbaarsen/fix-5767 
Fix for #5767
 2014-01-14 02:55:54 -08:00
Dmitriy Zaporozhets 798f82f486 Merge pull request #6041 from estrai/head-panel-data-original-title-fixup 
Set correct data-original-title value for my snippets
 2014-01-14 02:48:51 -08:00
Dmitriy Zaporozhets 9247490109 Tests for accept MR with custom message 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-14 11:49:54 +02: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
Daniel Lukasiak 6ecda0f405 Set correct data-original-title value for my snippets 2014-01-14 15:09:20 +07:00
Jeroen van Baarsen d5bb466fe4 Fix for #5767 
In the branch graph, uploaded images where not rendered
correctly. Fixed this by not filling the rect, instead
i've put an image over it
 2014-01-13 22:22:46 +01:00
Dmitriy Zaporozhets 55024ed13a Use default bootstrap pills 2014-01-13 23:18:30 +02:00
Dmitriy Zaporozhets 0de6e2da38 Add UI for custom Merge request commit message 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-13 17:54:02 +02:00
Dmitriy Zaporozhets 3f71f2fa72 Merge pull request #6032 from sinm/patch-1 
It's a bad idea to use hash symbol in a yaml value without quotes
 2014-01-13 07:48:13 -08:00
Dmitriy Zaporozhets 8781459124 Use params[:merge_commit_message] in MergeRequestController for automerge 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-13 17:21:59 +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
Dmitriy Zaporozhets d84b0fa6b5 Add merge_commit_message argument for Satellite::MergeAction#merge 2014-01-13 16:49:35 +02:00
Dmitriy Zaporozhets 6a80083294 Use same code for diff and patch inside MergeAction 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-13 16:16:45 +02:00
Dmitriy Zaporozhets 7c6287c878 Add support of custom message to merge action of satellite 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-13 13:17:38 +02:00
Dmitriy Zaporozhets 5c1a360f41 Imrpove new file form 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-13 09:47:32 +02:00
sinm 2b090339d1 It's a bad idea to use hash symbol in a yaml value without quotes 2014-01-12 23:29:29 +03:00
Dmitriy Zaporozhets 9c7d821cf7 Show selected attachment in comment form 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-12 18:47:58 +02:00
Dmitriy Zaporozhets 8fc9b5c0e2 Small UI improvement to snippet form 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-12 18:32:46 +02:00
Dmitriy Zaporozhets 0253c949a2 Merge pull request #5933 from dblessing/feature/assignee_changes_in_timeline 
Add note for assignee changes
 2014-01-12 08:10:58 -08:00
Dmitriy Zaporozhets cadbd3f0c1 Merge pull request #6027 from jvanbaarsen/snippet-fix 
Removed expiration from snippets
 2014-01-12 08:02:06 -08:00
Jeroen van Baarsen ef404d8ea6 Dropped expiration date from the snippet API 2014-01-11 18:40:17 +01:00
Jeroen van Baarsen 2eb1220f67 Removed expiration from snippets 
* Removed the expiration from the project snippets
* Fixed the layout for the project snippets
 2014-01-11 18:24:20 +01:00
Dmitriy Zaporozhets 753a2f17c2 Merge pull request #6022 from jvanbaarsen/issue-title-in-title 
Added issue title to page title
 2014-01-11 07:10:23 -08:00