OSDN Git Service
sinm [Mon, 20 Jan 2014 04:47:19 +0000 (07:47 +0300)]
Updated gitlab.yaml.example's issue_closing_pattern to single quotes
… (misused double quotes here)
sinm [Sun, 12 Jan 2014 20:29:29 +0000 (23:29 +0300)]
It's a bad idea to use hash symbol in a yaml value without quotes
Dmitriy Zaporozhets [Sun, 12 Jan 2014 16:47:58 +0000 (18:47 +0200)]
Show selected attachment in comment form
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Sun, 12 Jan 2014 16:32:46 +0000 (18:32 +0200)]
Small UI improvement to snippet form
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Sun, 12 Jan 2014 16:10:58 +0000 (08:10 -0800)]
Merge pull request #5933 from dblessing/feature/assignee_changes_in_timeline
Add note for assignee changes
Dmitriy Zaporozhets [Sun, 12 Jan 2014 16:02:06 +0000 (08:02 -0800)]
Merge pull request #6027 from jvanbaarsen/snippet-fix
Removed expiration from snippets
Jeroen van Baarsen [Sat, 11 Jan 2014 17:40:17 +0000 (18:40 +0100)]
Dropped expiration date from the snippet API
Jeroen van Baarsen [Sat, 11 Jan 2014 17:15:47 +0000 (18:15 +0100)]
Removed expiration from snippets
* Removed the expiration from the project snippets
* Fixed the layout for the project snippets
Dmitriy Zaporozhets [Sat, 11 Jan 2014 15:10:23 +0000 (07:10 -0800)]
Merge pull request #6022 from jvanbaarsen/issue-title-in-title
Added issue title to page title
Dmitriy Zaporozhets [Sat, 11 Jan 2014 15:09:22 +0000 (07:09 -0800)]
Merge pull request #6025 from jvanbaarsen/fix-for-admin-user-edit
Fix for edit user as admin
Dmitriy Zaporozhets [Sat, 11 Jan 2014 15:03:20 +0000 (15:03 +0000)]
Merge branch 'select2' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Sat, 11 Jan 2014 14:05:41 +0000 (16:05 +0200)]
Include missing helper for project_forked_merge_requests tests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Jeroen van Baarsen [Sat, 11 Jan 2014 13:54:49 +0000 (14:54 +0100)]
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
Dmitriy Zaporozhets [Sat, 11 Jan 2014 13:45:29 +0000 (15:45 +0200)]
Remove include of un-existing helper
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Sat, 11 Jan 2014 13:35:39 +0000 (15:35 +0200)]
Remove chosen from tests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Sat, 11 Jan 2014 10:36:10 +0000 (12:36 +0200)]
Select2 dropdown autoWidth
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Sat, 11 Jan 2014 10:11:54 +0000 (12:11 +0200)]
Replace chosen with select2
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Sat, 11 Jan 2014 10:11:32 +0000 (12:11 +0200)]
Remove chosen gem
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Fri, 10 Jan 2014 22:11:29 +0000 (14:11 -0800)]
Merge pull request #5735 from cocoy/fix_5313
Fix #5313 hipchat 0.14.0 to use http_proxy
Jeroen van Baarsen [Fri, 10 Jan 2014 19:31:44 +0000 (20:31 +0100)]
Added issue title to page title
* Fixes: #5966
Dmitriy Zaporozhets [Fri, 10 Jan 2014 12:51:31 +0000 (04:51 -0800)]
Merge pull request #6013 from jvanbaarsen/modal-fix
Fixed modal so it can be closed with ESC
Dmitriy Zaporozhets [Fri, 10 Jan 2014 12:49:02 +0000 (04:49 -0800)]
Merge pull request #6012 from jvanbaarsen/social_clickable
Made the skype and twitter username clickable
Dmitriy Zaporozhets [Fri, 10 Jan 2014 12:47:25 +0000 (04:47 -0800)]
Merge pull request #6002 from jhollingsworth/feature/clone-panel-twbs3
Update clone panel to use input group.
Dmitriy Zaporozhets [Fri, 10 Jan 2014 12:39:45 +0000 (14:39 +0200)]
Fix admin forms UI
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Fri, 10 Jan 2014 12:14:55 +0000 (14:14 +0200)]
Refactor scss
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Fri, 10 Jan 2014 11:58:52 +0000 (13:58 +0200)]
Respect default theme settings. Fixed sign-in button on publica page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Fri, 10 Jan 2014 08:00:31 +0000 (08:00 +0000)]
Merge branch 'need-merge-commit' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Fri, 10 Jan 2014 07:59:08 +0000 (07:59 +0000)]
Merge branch 'contributing-expectations' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Fri, 10 Jan 2014 07:58:32 +0000 (07:58 +0000)]
Merge branch 'dates-are-absolute' of /home/git/repositories/gitlab/gitlabhq
Jeroen van Baarsen [Thu, 9 Jan 2014 16:04:46 +0000 (17:04 +0100)]
Fixed modal so it can be closed with ESC
* Fixes: #5343
Jeroen van Baarsen [Thu, 9 Jan 2014 15:33:56 +0000 (16:33 +0100)]
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
dosire [Thu, 9 Jan 2014 14:58:52 +0000 (15:58 +0100)]
Ordinal numbers do not have the same ordinal.
dosire [Thu, 9 Jan 2014 14:55:57 +0000 (15:55 +0100)]
Since the 22th is fixed we can use absolute dates.
Dmitriy Zaporozhets [Thu, 9 Jan 2014 13:17:53 +0000 (05:17 -0800)]
Merge pull request #6011 from jvanbaarsen/deprecation_warning_fix
Fixed the I18n deprecation warning
Dmitriy Zaporozhets [Thu, 9 Jan 2014 13:17:10 +0000 (13:17 +0000)]
Merge branch 'refactor/search_context' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Thu, 9 Jan 2014 13:13:56 +0000 (15:13 +0200)]
Remove invalid test
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Thu, 9 Jan 2014 12:23:07 +0000 (14:23 +0200)]
Better search login for global context. Improved tests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Jeroen van Baarsen [Thu, 9 Jan 2014 12:17:02 +0000 (13:17 +0100)]
Fixed the I18n deprecation warning
dosire [Thu, 9 Jan 2014 11:05:24 +0000 (12:05 +0100)]
Instead of working with remotes Dmitriy suggested to use urls.
Dmitriy Zaporozhets [Thu, 9 Jan 2014 10:51:20 +0000 (12:51 +0200)]
Improve search page UX
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Thu, 9 Jan 2014 10:37:12 +0000 (12:37 +0200)]
Use new context for search
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Thu, 9 Jan 2014 10:36:55 +0000 (12:36 +0200)]
Search::GlobalContext and Search::ProjectContext for separation between 2 types of search
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
dosire [Thu, 9 Jan 2014 08:30:01 +0000 (09:30 +0100)]
Ask people to link bakc and be prepared for feedback.
Dmitriy Zaporozhets [Thu, 9 Jan 2014 08:29:55 +0000 (10:29 +0200)]
Fix public project search
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Thu, 9 Jan 2014 08:24:46 +0000 (00:24 -0800)]
Merge pull request #5427 from karlhungus/feature_search_code_in_public_repos
Allow public repo searching
Dmitriy Zaporozhets [Thu, 9 Jan 2014 08:12:17 +0000 (10:12 +0200)]
Fix tree table overflow
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Wed, 8 Jan 2014 23:06:19 +0000 (01:06 +0200)]
Better UI for appearence page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Wed, 8 Jan 2014 18:57:58 +0000 (20:57 +0200)]
Fix white line at top of no-ssh-key-message
Dmitriy Zaporozhets [Wed, 8 Jan 2014 18:22:34 +0000 (10:22 -0800)]
Merge pull request #6008 from jhollingsworth/fix/zip-archive-ui
Fix download archive menu for tree view.
Dmitriy Zaporozhets [Wed, 8 Jan 2014 17:57:35 +0000 (19:57 +0200)]
Better style of username for User#show page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Jason Hollingsworth [Wed, 8 Jan 2014 17:33:35 +0000 (11:33 -0600)]
Fix download archive menu for tree view.
This fixes the issue of the menu going outside of the main `container`.
Dmitriy Zaporozhets [Wed, 8 Jan 2014 16:59:23 +0000 (18:59 +0200)]
Fix form styles
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Wed, 8 Jan 2014 16:39:03 +0000 (18:39 +0200)]
Fix new group form
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Jason Hollingsworth [Wed, 8 Jan 2014 03:03:27 +0000 (21:03 -0600)]
Update clone panel to use input group.
Use clone panel in `Git Access` section of wiki.
Dmitriy Zaporozhets [Wed, 8 Jan 2014 15:42:57 +0000 (17:42 +0200)]
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
Dmitriy Zaporozhets [Wed, 8 Jan 2014 15:13:13 +0000 (15:13 +0000)]
Merge branch 'xss/readme' of /home/git/repositories/gitlab/gitlabhq
Dmitriy Zaporozhets [Wed, 8 Jan 2014 15:04:08 +0000 (15:04 +0000)]
New entries in changelog for 6.5
dosire [Wed, 8 Jan 2014 14:58:57 +0000 (15:58 +0100)]
Instructions should create a merge commit and give people a chance to test the branch we are going to merge.
Dmitriy Zaporozhets [Wed, 8 Jan 2014 14:32:03 +0000 (16:32 +0200)]
Dont render README with markup if format is not compatible
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Sytse Sijbrandij [Wed, 8 Jan 2014 13:29:39 +0000 (13:29 +0000)]
Merge branch 'hooks_spelling' of /mnt/ebs/repositories/mmoll/gitlab-ce
Sytse Sijbrandij [Wed, 8 Jan 2014 13:28:40 +0000 (13:28 +0000)]
Merge branch 'fix_links_to_gitlab_cloud' of /mnt/ebs/repositories/razer6/gitlab-ce
Dmitriy Zaporozhets [Wed, 8 Jan 2014 10:42:57 +0000 (12:42 +0200)]
Use css truncation instead of rails
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Wed, 8 Jan 2014 08:55:19 +0000 (00:55 -0800)]
Merge pull request #5969 from jhollingsworth/feature/zip-archive-ui
Add UI for downloading various archive formats.
Jason Hollingsworth [Thu, 2 Jan 2014 16:31:25 +0000 (10:31 -0600)]
Add UI for downloading various archive formats.
Change the “Download” button to a split button with options for zip and
tar.gz.
Added download option to tree view.
Michael Moll [Tue, 7 Jan 2014 14:19:45 +0000 (15:19 +0100)]
minor language fixes
Dmitriy Zaporozhets [Tue, 7 Jan 2014 10:47:56 +0000 (02:47 -0800)]
Merge pull request #5760 from dermoth/master
Fix HTTP push to public repos
Dmitriy Zaporozhets [Tue, 7 Jan 2014 10:31:17 +0000 (02:31 -0800)]
Merge pull request #5937 from RandomInsano/patch-1
Postgres Client Needed for Ubuntu 13.04
Robert Schilling [Tue, 7 Jan 2014 10:05:44 +0000 (11:05 +0100)]
Fix links to GitLab cloud
Drew Blessing [Thu, 26 Dec 2013 16:50:29 +0000 (10:50 -0600)]
Add note for assignee changes
Change to username per @PixnBits suggestion
Dmitriy Zaporozhets [Mon, 6 Jan 2014 14:18:26 +0000 (06:18 -0800)]
Merge pull request #5799 from criteo/import_url_api
Add import_url param in API projects create
Dmitriy Zaporozhets [Mon, 6 Jan 2014 14:17:55 +0000 (06:17 -0800)]
Merge pull request #5934 from dblessing/fix/issue_update_js
Fix issue update js
Dmitriy Zaporozhets [Mon, 6 Jan 2014 14:15:48 +0000 (06:15 -0800)]
Merge pull request #5823 from bobot/feature/api_parent_ids
[API] add parent_ids to specific commit informations
Dmitriy Zaporozhets [Mon, 6 Jan 2014 14:13:45 +0000 (06:13 -0800)]
Merge pull request #5982 from jojosch/fix-label-for-sha
Change the Label for SHA1-Seach inside the Network
Dmitriy Zaporozhets [Mon, 6 Jan 2014 13:58:10 +0000 (15:58 +0200)]
Better cannot-be-merged widget for MR
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Mon, 6 Jan 2014 13:05:57 +0000 (15:05 +0200)]
Style accept widgets for MR
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Mon, 6 Jan 2014 13:05:41 +0000 (15:05 +0200)]
Add .bs-callout styles
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Mon, 6 Jan 2014 12:34:41 +0000 (14:34 +0200)]
increate some input width. Added navbar toggle button
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Mon, 6 Jan 2014 12:19:25 +0000 (14:19 +0200)]
twbs3 fixes for UI
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Mon, 6 Jan 2014 12:19:08 +0000 (14:19 +0200)]
Show search icon for 768px width
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Mon, 6 Jan 2014 12:05:39 +0000 (14:05 +0200)]
Improve project show page for ipad
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Sun, 5 Jan 2014 20:12:03 +0000 (22:12 +0200)]
Fix group test
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Johannes Schleifenbaum [Sun, 5 Jan 2014 12:58:06 +0000 (13:58 +0100)]
Change the Label for SHA1-Seach inside the Network
Dmitriy Zaporozhets [Sun, 5 Jan 2014 11:59:01 +0000 (13:59 +0200)]
Better css for chosen selects
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Sun, 5 Jan 2014 11:58:48 +0000 (13:58 +0200)]
Fix project network ui
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Sun, 5 Jan 2014 11:45:03 +0000 (13:45 +0200)]
Fix blob remove modal style
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Sun, 5 Jan 2014 11:41:09 +0000 (13:41 +0200)]
Fix network tests. Removed console.log
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Sun, 5 Jan 2014 11:29:21 +0000 (13:29 +0200)]
Use latest gon gem
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Sat, 4 Jan 2014 20:45:48 +0000 (12:45 -0800)]
Merge pull request #5891 from jhollingsworth/feature/zip-archive
Add support for various archive formats.
Dmitriy Zaporozhets [Sat, 4 Jan 2014 17:46:52 +0000 (19:46 +0200)]
responsive chosen selects. Hide milestone dropdown for sm displays
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Sat, 4 Jan 2014 17:32:06 +0000 (19:32 +0200)]
twbs3 for system hooks
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Sat, 4 Jan 2014 17:30:38 +0000 (19:30 +0200)]
twbs3 for broadcase messages page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Sat, 4 Jan 2014 17:27:09 +0000 (19:27 +0200)]
twbs3 style for admin, tree, network, commits
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Sat, 4 Jan 2014 17:26:12 +0000 (19:26 +0200)]
Improve group views
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Sat, 4 Jan 2014 17:25:35 +0000 (19:25 +0200)]
Scale graphs
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Fri, 3 Jan 2014 21:46:46 +0000 (23:46 +0200)]
Move nav-tabs to gl_bootstrap
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Fri, 3 Jan 2014 21:46:32 +0000 (23:46 +0200)]
Style admin->projects filter
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Fri, 3 Jan 2014 21:28:00 +0000 (23:28 +0200)]
Move labels css to gl_bootstrap. Fixed label rendering
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Fri, 3 Jan 2014 21:15:13 +0000 (23:15 +0200)]
Fix alerts
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets [Fri, 3 Jan 2014 20:58:48 +0000 (22:58 +0200)]
Merge branch 'dogfood'
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Conflicts:
doc/update/6.0-to-6.4.md
Dmitriy Zaporozhets [Fri, 3 Jan 2014 20:56:22 +0000 (20:56 +0000)]
Merge branch '6-4-fast-track' of /home/git/repositories/gitlab/gitlabhq
OSDN Git Service
