Commit Graph

126 Commits

Author SHA1 Message Date
Vokhmin Alexey V d747ffd070 #214: updated #branches page, integrated AngularJS 2013-07-11 14:34:44 +04:00
Vokhmin Alexey V e36a0386a2 #184: not show link when submodule does not exist 2013-06-14 13:54:08 +04:00
warpc 079d7110e0 Merge pull request #87 from abf/rosa-build:82-extend-abilities-of-personal-platforms
[refs #82]: Extend abilities of personal platforms
2013-04-17 14:34:36 +04:00
Vokhmin Alexey V 165532414d #93: update URL to submodule 2013-04-11 15:19:24 +04:00
Vokhmin Alexey V 8b77323f5f #93: remove _commit_info partial 2013-04-11 14:09:32 +04:00
Vokhmin Alexey V c7603fd607 #93: fixed path to blob 2013-04-10 15:57:07 +04:00
Vokhmin Alexey V 7fe0079bd7 #93: some refactoring 2013-04-10 15:46:39 +04:00
Vokhmin Alexey V 0bc804e69d #93: added icon for submodule, fixed messages of Tree, Submodule, Blob 2013-04-10 15:40:11 +04:00
Vokhmin Alexey V 511ccbc61a #93: update styles 2013-04-10 13:15:53 +04:00
Vokhmin Alexey V cb808207b4 #93: showed submodules 2013-04-09 23:24:52 +04:00
Vokhmin Alexey V 958017b3ed #82: update for adding new packages into repository 2013-04-08 18:27:50 +04:00
Vokhmin Alexey V 7c02610a20 #52: remove unnecessary code 2013-03-28 02:02:08 +04:00
Vokhmin Alexey V 390d80a9a2 #52: added highlighting for line 2013-03-28 01:10:34 +04:00
Alexander Machehin d85039d5be Support git over ssh: hooks, support gitlab-shell api, UI, refactroing 2013-03-07 14:09:08 +06:00
Alexander Machehin 836a030438 fixing errors with wrong branch (again) #944 2013-02-22 14:54:04 +06:00
Vokhmin Alexey V c6aa58c063 Merge branch 'master' into 907-save-project-tags-on-file-store 2013-02-14 17:15:16 +04:00
Vokhmin Alexey V 5c286a6aa0 #907: add ProjectTags table, update UI, logic 2013-02-14 16:46:25 +04:00
Alexander Machehin 1ffd0380f2 Revert "#907: escape branch name"
This reverts commit 3c1328d3a65a44d98f80dbf08bc986db4b1064fb.
2013-02-14 12:56:18 +06:00
Vokhmin Alexey V 5721c6d0b6 #907: remove "()" 2013-02-13 23:45:19 +04:00
Vokhmin Alexey V b9ed67584f #907: update #tags UI 2013-02-13 23:44:32 +04:00
Vokhmin Alexey V 7fc8e33993 #907: small refactoring of UI 2013-02-13 23:29:08 +04:00
Vokhmin Alexey V 2bcd874169 #907: escape branch name 2013-02-13 23:12:07 +04:00
Vokhmin Alexey V 58ac925368 #907: refactoring #tags && #branches views 2013-02-13 21:40:16 +04:00
Vokhmin Alexey V 5d050f944e #903: small refactoring according to Alexander's commen 2013-02-13 21:06:37 +04:00
Vokhmin Alexey V c762d2b6e0 #907: update #tags action 2013-02-13 15:23:58 +04:00
Vokhmin Alexey V fe51bc77ac #907: change link name 2013-02-13 14:33:15 +04:00
Vokhmin Alexey V 3929c4bb57 #907: update #branches UI 2013-02-13 14:25:09 +04:00
Vokhmin Alexey V 77d3a01614 #907: add #branches, #tags actions 2013-02-12 20:35:14 +04:00
Alexander Machehin 421fa2880c [refs #765] add CodeMirror resizable ability 2013-01-28 14:15:01 +06:00
Alexander Machehin b132a56937 Merge branch 'master' into 674-diff_between_commits
Conflicts:
	db/schema.rb  fresh
2012-12-04 00:02:45 +06:00
Alexander Machehin 0669fb2789 [refs #674] small changes 2012-12-03 22:52:11 +06:00
Alexander Machehin 611402c4c2 [refs #674] add stats 2012-12-03 17:11:55 +06:00
Alexander Machehin 76606036cb [refs #737] remove branch from commit message 2012-11-28 19:15:15 +06:00
Alexander Machehin 8ed71e0f03 [refs #674] fixed undefined method 'binary?' for nil:NilClass when rename the file 2012-11-27 23:35:58 +06:00
Alexander Machehin 7be2df7578 [refs #674] first step of the diff between commits 2012-11-20 01:15:15 +06:00
Alexander Machehin 95e5804358 [refs #90] fixed git timeout error on the big diff 2012-10-26 20:03:46 +06:00
Alexander Machehin ecf8e7e5ee [refs #579] fixed wiki & refactoring 2012-10-18 18:51:28 +06:00
Alexander Machehin c5d6707b8f [refs #579] fixed commit comments errors 2012-10-13 01:57:54 +06:00
Alexander Machehin 993454fc29 [refs #579] alpha version of the pull discussion 2012-10-11 23:50:40 +06:00
Alexander Machehin e085784d51 Merge branch 'master' into 579-code_line_comments
Conflicts:
	app/assets/stylesheets/design/custom.scss
	app/helpers/diff_helper.rb
	app/models/ability.rb
	app/views/projects/comments/_list.html.haml
	app/views/projects/git/commits/_commit_diff.html.haml
	lib/ext/git/inline_callback.rb
2012-10-05 15:32:29 +06:00
Alexander Machehin 527dd210bf [refs #579] alpha version of inline comments for commit 2012-10-05 00:40:12 +06:00
Vokhmin Alexey V e310f5607c #90: removed unnecessary code 2012-09-27 23:30:59 +04:00
Vokhmin Alexey V 3fdca32e0e #90: updated styles 2012-09-27 20:59:48 +04:00
Vokhmin Alexey V da006871ba #90: small refactoring, moved views 2012-09-27 20:32:28 +04:00
Vokhmin Alexey V f41aaecd72 #90: added commits and comments for commits to pull-request discussion 2012-09-27 19:40:19 +04:00
Vokhmin Alexey V 613db04375 #90: added limit for commits into the pull request 2012-09-26 21:00:58 +04:00
Alexander Machehin 47a73a4ddb [refs #90] fixed existing project name 2012-09-25 21:47:08 +06:00
Alexander Machehin dfbf8a8d58 Merge branch 'master' into 90-pull
Fucking conflicts:
	app/controllers/projects/issues_controller.rb
	app/models/ability.rb
	app/views/projects/issues/show.html.haml
	config/routes.rb
	db/schema.rb
	lib/tasks/import.rake
	spec/models/comment_for_commit_spec.rb
	vendor/assets/javascripts/bootstrap-tab.js
	vendor/assets/stylesheets/bootstrap.css
2012-09-25 17:55:30 +06:00
Alexander Machehin a492367a17 [refs #616] some fixes and refactoring 2012-09-18 16:00:21 +06:00
Vladimir Sharshov fc4eb189b5 Add new staging server;
Remove special application config;
Change localization (builded to built);
Add quotes to git command.
2012-09-14 00:46:56 +04:00
Alexander Machehin c1c9f9680e [refs #90] remove code duplication 2012-08-10 22:40:09 +06:00
Alexander Machehin 9bf2f728a7 [refs #90] change new action from post to get 2012-08-08 23:21:49 +06:00
Alexander Machehin 6a04f4ad7a Merge again branch 'master' into 90-pull
Conflicts:
	db/schema.rb
2012-08-06 11:19:06 +06:00
Vladimir Sharshov 8bc229f933 [refs #597] Add help page for new git repo. Remove link to README in project pages, small refactoring. 2012-08-03 18:31:04 +04:00
Alexander Machehin b299a51610 Merge branch 'master' into 90-pull
Conflicts:
	db/schema.rb
2012-08-01 13:06:41 +06:00
Pavel Chipiga 1269806aae Hide another raw link for huge blobs. Refs #263 2012-07-31 22:24:27 +03:00
Pavel Chipiga 8e91159b5b Improve and refacror huge blob display. Fix wiki create and display. Fix build_lists test. Refs #263 2012-07-31 20:32:49 +03:00
Alexander Machehin 25bdbb01d6 [refs #90] project fullname 2012-07-27 18:52:31 +06:00
Alexander Machehin 944c6fc0e2 Merge branch 'master' into 90-pull
Conflicts:
	app/assets/stylesheets/design/custom.scss
	app/controllers/projects/git/commits_controller.rb
	app/helpers/git_helper.rb
	app/models/project.rb
	app/views/projects/git/commits/_commit_diff.html.haml
	db/schema.rb
	lib/ext/core/string.rb
2012-07-27 18:37:25 +06:00
Pavel Chipiga 35e673d44e Minor gems update. Fix string length, refactor git helper and module, add branches_and_tags method, refactor build_list filter, cleanup and refactor templates. Take back test. Filter incorrect symbols during git encoding fix. Fix git http level bug. Refs #263 2012-07-27 00:15:57 +03:00
Alexander Machehin d130409640 Merge branch 'master' into 90-pull
Conflicts:
	app/assets/stylesheets/design/custom.scss
2012-07-20 15:33:11 +06:00
Alexander Machehin 35b953ac11 [refs #90] add commit/pull lines ref 2012-07-19 22:42:37 +06:00
Pavel Chipiga 2cc3798cdc Merge branch 'master' into 263-refactoring 2012-07-19 18:58:47 +03:00
Alexander Machehin b7911f3585 [refs #90] fixed create pull button text 2012-07-18 16:29:55 +06:00
Alexander Machehin 08534810f6 [refs #569] tuning fork modal 2012-07-17 20:25:02 +06:00
Alexander Machehin cd681ab0ae [refs #569] fixed fork modal 2012-07-17 19:49:13 +06:00
Pavel Chipiga 611b22baa5 Update gems, fix conflicts. Raise 404 error instead of redirect. Refactor git controllers. Refactor git methods, move to modules. Cleanup git helpers, refactor and remove unused variables from views, refactor git templates. Refactor project load. Refactor git routes and links, refactor constraints. Fix branches with slashes and dots. Apply github linguist and libmagic for binary file detection. Other refactor and code cleanup. Fix specs and deprecations. Refs #263 2012-07-17 11:02:56 +03:00
Alexander Machehin 7b0c135a24 [refs #90] fixed pull button 2012-07-04 20:22:23 +06:00
Alexander Machehin 1ffb1b3940 Merge branch 'master' into 90-pull
Conflicts:
	Gemfile
	app/assets/stylesheets/design/custom.scss
	app/models/project.rb
	db/schema.rb
2012-06-27 16:20:38 +06:00
Alexander Machehin 8542c60838 [refs #522] to fork check own projects 2012-06-15 00:12:44 +06:00
Alexander Machehin 5f50bacbe6 [refs #90] some refactoring with rtruncate method 2012-06-08 13:38:24 +06:00
Alexander Machehin 62128d2c72 [refs #90] change diff anchors to digits 2012-06-08 01:20:06 +06:00
Alexander Machehin 0b9c0fdd07 [refs #90] fixed rendering file rename 2012-06-08 01:19:18 +06:00
Alexander Machehin 74aee232f9 [refs #90] some fixes and merge button 2012-05-17 22:49:29 +06:00
Alexander Machehin 85d4489009 [refs #90] dont work pull 2012-05-12 00:23:09 +06:00
Pavel Chipiga 2539ef4795 Great controllers and routes refactor - separate them to namespaces. Add user/group routes in github style, refactor. Implement templates inheritance. Refactor and cleanup views. Fix specs. Other minor fixes. Refs #263 2012-05-02 12:18:07 +03:00