Commit Graph
7736 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets c307fd22ea Merge branch 'xss/readme' of /home/git/repositories/gitlab/gitlabhq 2014-01-08 15:13:13 +00:00
Dmitriy Zaporozhets 449a8eb95c New entries in changelog for 6.5 2014-01-08 15:04:08 +00:00
Dmitriy Zaporozhets d6c037de81 Dont render README with markup if format is not compatible
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-08 16:32:03 +02:00
Dmitriy Zaporozhets 0377069841 Use css truncation instead of rails
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-08 12:42:57 +02:00
Dmitriy Zaporozhets 18fac5879d Merge pull request #5969 from jhollingsworth/feature/zip-archive-ui
Add UI for downloading various archive formats.
2014-01-08 00:55:19 -08:00
Jason Hollingsworth 97c72d7417 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.
2014-01-07 20:50:36 -06:00
Dmitriy Zaporozhets 1ad2a93678 Merge pull request #5760 from dermoth/master
Fix HTTP push to public repos
2014-01-07 02:47:56 -08:00
Dmitriy Zaporozhets a00874a9ef Merge pull request #5937 from RandomInsano/patch-1
Postgres Client Needed for Ubuntu 13.04
2014-01-07 02:31:17 -08:00
Dmitriy Zaporozhets 6579de0727 Merge pull request #5799 from criteo/import_url_api
Add import_url param in API projects create
2014-01-06 06:18:26 -08:00
Dmitriy Zaporozhets 651a0dd5fe Merge pull request #5934 from dblessing/fix/issue_update_js
Fix issue update js
2014-01-06 06:17:55 -08:00
Dmitriy Zaporozhets 1c0929f5ac Merge pull request #5823 from bobot/feature/api_parent_ids
[API] add parent_ids to specific commit informations
2014-01-06 06:15:48 -08:00
Dmitriy Zaporozhets 354a28546d Merge pull request #5982 from jojosch/fix-label-for-sha
Change the Label for SHA1-Seach inside the Network
2014-01-06 06:13:45 -08:00
Dmitriy Zaporozhets 92cb787495 Better cannot-be-merged widget for MR
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-06 15:58:10 +02:00
Dmitriy Zaporozhets d187ffebee Style accept widgets for MR
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-06 15:05:57 +02:00
Dmitriy Zaporozhets b62d4f6dca Add .bs-callout styles
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-06 15:05:41 +02:00
Dmitriy Zaporozhets 8f85c5cdd5 increate some input width. Added navbar toggle button
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-06 14:34:41 +02:00
Dmitriy Zaporozhets 0b017e8e17 twbs3 fixes for UI
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-06 14:19:25 +02:00
Dmitriy Zaporozhets 7399c8c928 Show search icon for 768px width
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-06 14:19:08 +02:00
Dmitriy Zaporozhets 2ee8d5aa43 Improve project show page for ipad
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-06 14:05:39 +02:00
Dmitriy Zaporozhets a6da154ed3 Fix group test
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-05 22:12:03 +02:00
Johannes Schleifenbaum 0e61011499 Change the Label for SHA1-Seach inside the Network 2014-01-05 13:58:06 +01:00
Dmitriy Zaporozhets d28ee0df12 Better css for chosen selects
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-05 13:59:01 +02:00
Dmitriy Zaporozhets 7a84c5c86c Fix project network ui
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-05 13:58:48 +02:00
Dmitriy Zaporozhets 70f705887a Fix blob remove modal style
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-05 13:45:03 +02:00
Dmitriy Zaporozhets ac6c050773 Fix network tests. Removed console.log
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-05 13:41:09 +02:00
Dmitriy Zaporozhets 46e0e59217 Use latest gon gem
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-05 13:29:21 +02:00
Dmitriy Zaporozhets d25b5d029d Merge pull request #5891 from jhollingsworth/feature/zip-archive
Add support for various archive formats.
2014-01-04 12:45:48 -08:00
Dmitriy Zaporozhets e680228bf2 responsive chosen selects. Hide milestone dropdown for sm displays
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-04 19:46:52 +02:00
Dmitriy Zaporozhets 35287f1028 twbs3 for system hooks
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-04 19:32:06 +02:00
Dmitriy Zaporozhets b4d29d700a twbs3 for broadcase messages page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-04 19:30:38 +02:00
Dmitriy Zaporozhets 0a364762d9 twbs3 style for admin, tree, network, commits
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-04 19:27:09 +02:00
Dmitriy Zaporozhets 09c2f8c7b1 Improve group views
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-04 19:26:12 +02:00
Dmitriy Zaporozhets b765d7d739 Scale graphs
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-04 19:25:35 +02:00
Dmitriy Zaporozhets b1b3f485a1 Move nav-tabs to gl_bootstrap
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-03 23:46:46 +02:00
Dmitriy Zaporozhets 6dfbd3f771 Style admin->projects filter
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-03 23:46:32 +02:00
Dmitriy Zaporozhets d0a56e2280 Move labels css to gl_bootstrap. Fixed label rendering
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-03 23:28:00 +02:00
Dmitriy Zaporozhets 423ffe29d5 Fix alerts
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-03 23:15:13 +02:00
Dmitriy Zaporozhets 779355ae8e Merge branch 'dogfood'
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	doc/update/6.0-to-6.4.md
2014-01-03 22:58:48 +02:00
Dmitriy Zaporozhets 97c9bc056f Merge branch '6-4-fast-track' of /home/git/repositories/gitlab/gitlabhq 2014-01-03 20:56:22 +00:00
Dmitriy Zaporozhets 904745560a Merge branch 'exclude_subdomains_in_header' of /home/git/repositories/gitlab/gitlabhq 2014-01-03 20:54:53 +00:00
Marin Jankovski 8a0bfa4998 Do not include subtomains in STS header. 2014-01-03 16:02:57 +01:00
Jason Hollingsworth 7cc2520541 Add support for various archive formats.
Used mime-types gem instead of hardcoding content types.
Allow multiple extensions in archive route (.tar.gz, .tar.bz2).
Change content disposition from infile(?) to attachment for api.
Fixed api would return “archive” instead of {project}-{hash}.{ext}
2014-01-02 10:18:56 -06:00
Dmitriy Zaporozhets b512fbc0ec Style search page for twbs3
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-02 14:33:15 +02:00
Dmitriy Zaporozhets 7617ff56f2 Merge branch 'bootstrap3' of /home/git/repositories/gitlab/gitlabhq 2014-01-02 12:14:27 +00:00
Dmitriy Zaporozhets 3567107cdb Disable unused bootstrap components
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-02 13:40:18 +02:00
Dmitriy Zaporozhets 3230df5fbe Style new branch/tag forms
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-02 13:36:47 +02:00
Dmitriy Zaporozhets 66a91c4fab Style deploy keys form
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-02 13:32:27 +02:00
Dmitriy Zaporozhets 34245ceb99 Fix snippet form
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-02 13:26:58 +02:00
Dmitriy Zaporozhets a81002d920 Fix wiki tests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2014-01-02 13:11:52 +02:00
dosire 689f6f7051 Also update links to recipes. 2014-01-02 09:16:02 +01:00