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
10,629 Commits 48 Branches 340 Tags
0f80ffdf8756a76a6ea0daaa2da5d3e193fcbe99
Commit Graph
10629 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Jacob Vosmaer 87d16e1841 Explain where the default password validation is 2014-01-13 11:43:22 +01:00
Jacob Vosmaer 0db36897e6 Add instructions for custom password length limits 2014-01-13 10:41:10 +01: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
Dmitriy Zaporozhets 2c50252417 Merge pull request #6025 from jvanbaarsen/fix-for-admin-user-edit 
Fix for edit user as admin
 2014-01-11 07:09:22 -08:00
Dmitriy Zaporozhets d88aafcb5d Merge branch 'select2' of /home/git/repositories/gitlab/gitlabhq 2014-01-11 15:03:20 +00:00
Dmitriy Zaporozhets 04ad19dc5c Include missing helper for project_forked_merge_requests tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-11 16:05:41 +02:00
Jeroen van Baarsen 34c8ca286a Fix for edit user as admin 
* It fixes an issue where you where able to remove your own
  admin rights. This would result in a 404 error. fixes: #2283
* It fixes an issue where you would be able to block your own
  account on the edit page. This fix makes the behaviour the same
  as on the admin/users overview page
 2014-01-11 14:54:49 +01:00
Dmitriy Zaporozhets 54b908afb7 Remove include of un-existing helper 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-11 15:45:29 +02:00
Dmitriy Zaporozhets 047a76009a Remove chosen from tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-11 15:35:39 +02:00
Dmitriy Zaporozhets 4434f93aa9 Select2 dropdown autoWidth 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-11 12:36:10 +02:00
Dmitriy Zaporozhets 8a17961126 Replace chosen with select2 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-11 12:11:54 +02:00
Dmitriy Zaporozhets 12cb7cee26 Remove chosen gem 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-11 12:11:32 +02:00
Arnaud Abélard 32499e8276 allow using the user's email address as a http parameter in gravatar urls for custom avatar systems. For example: 
plain_url: "http://avatar.company.com/avatar/?mail=%{email}&size=%{size}"
 2014-01-11 09:54:05 +00:00
Dmitriy Zaporozhets 12dbd0a413 Merge pull request #5735 from cocoy/fix_5313 
Fix #5313 hipchat 0.14.0 to use http_proxy
 2014-01-10 14:11:29 -08:00
Jeroen van Baarsen b621c987bd Added issue title to page title 
* Fixes: #5966
 2014-01-10 20:31:44 +01:00
Dmitriy Zaporozhets 3ce3c305eb Merge pull request #6013 from jvanbaarsen/modal-fix 
Fixed modal so it can be closed with ESC
 2014-01-10 04:51:31 -08:00
Dmitriy Zaporozhets 3ae03f5615 Merge pull request #6012 from jvanbaarsen/social_clickable 
Made the skype and twitter username clickable
 2014-01-10 04:49:02 -08:00
Dmitriy Zaporozhets 9f73388fd2 Merge pull request #6002 from jhollingsworth/feature/clone-panel-twbs3 
Update clone panel to use input group.
 2014-01-10 04:47:25 -08:00
Dmitriy Zaporozhets 95e6a5dcd3 Fix admin forms UI 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-10 14:39:45 +02:00
Dmitriy Zaporozhets f126676553 Refactor scss 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-10 14:14:55 +02:00
Dmitriy Zaporozhets 515ed7755e Respect default theme settings. Fixed sign-in button on publica page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-10 13:58:52 +02:00
Dmitriy Zaporozhets a67f3c393f Merge branch 'need-merge-commit' of /home/git/repositories/gitlab/gitlabhq 2014-01-10 08:00:31 +00:00
Dmitriy Zaporozhets 54bcbba538 Merge branch 'contributing-expectations' of /home/git/repositories/gitlab/gitlabhq 2014-01-10 07:59:08 +00:00
Dmitriy Zaporozhets a638a8df04 Merge branch 'dates-are-absolute' of /home/git/repositories/gitlab/gitlabhq 2014-01-10 07:58:32 +00:00
Jeroen van Baarsen ef7fce4a9f Fixed modal so it can be closed with ESC 
* Fixes: #5343
 2014-01-09 17:04:46 +01:00
Jeroen van Baarsen b471122f3e Made the skype and twitter username clickable 
* I was not able to link the linkedin username,
  since linkedin does not provide predictable URLS

* The skype url will start skype, and asks if you want to
  call the particular user.

* The Twitter link will just go to the twitter profile
  of the given user
 2014-01-09 16:33:56 +01:00
dosire 3aa57b77ae Ordinal numbers do not have the same ordinal. 2014-01-09 15:58:52 +01:00
dosire e270cd705b Since the 22th is fixed we can use absolute dates. 2014-01-09 15:55:57 +01:00
Dmitriy Zaporozhets 0d3f1a2d58 Merge pull request #6011 from jvanbaarsen/deprecation_warning_fix 
Fixed the I18n deprecation warning
 2014-01-09 05:17:53 -08:00
Dmitriy Zaporozhets 50d2eae864 Merge branch 'refactor/search_context' of /home/git/repositories/gitlab/gitlabhq 2014-01-09 13:17:10 +00:00
Dmitriy Zaporozhets a9d7efa12f Remove invalid test 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-09 15:16:10 +02:00
Dmitriy Zaporozhets 768d21654a Better search login for global context. Improved tests 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-09 14:23:07 +02:00
Jeroen van Baarsen c466f4cc44 Fixed the I18n deprecation warning 2014-01-09 13:17:02 +01:00
dosire f46620e6f4 Instead of working with remotes Dmitriy suggested to use urls. 2014-01-09 12:05:24 +01:00
Dmitriy Zaporozhets fc60c391ae Improve search page UX 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-09 12:51:20 +02:00
Dmitriy Zaporozhets b49ebf5737 Use new context for search 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-09 12:37:12 +02:00
Dmitriy Zaporozhets 4791084d7c Search::GlobalContext and Search::ProjectContext for separation between 2 types of search 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-09 12:36:55 +02:00
dosire 0f8c36b8d7 Ask people to link bakc and be prepared for feedback. 2014-01-09 09:30:01 +01:00
Dmitriy Zaporozhets cb589d231a Fix public project search 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2014-01-09 10:29:55 +02:00