deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
2660 commits 6 branches 43 tags 25 MiB
Commit graph

1026 commits

Author SHA1 Message Date
Dmitriy Zaporozhets f69049c282 Merge pull request #1144 from riyad/break-up-links-with-nested-formating-rebased 
Break up links with nested formating (rebased)
 2012-07-27 13:48:05 -07:00
randx 0590aa9d60 commit.short_id as model method. Styled inline comment form 2012-07-27 11:22:05 +03:00
randx 18f83016b1 Fixed persmission issue in doc. Added validation of hooks in gitlab:app:status 2012-07-26 16:14:34 +03:00
randx c27105f8c3 Fixed dashboard loader, fixed 404 for reporter on empty wiki page. 
Styled Wiki edit page
 2012-07-26 14:45:17 +03:00
Riyad Preukschas f6a67ef207 Update links in events 2012-07-25 22:27:25 +03:00
Riyad Preukschas 0aee7c94d0 Update links to milestones 2012-07-25 21:11:58 +02:00
Riyad Preukschas e6bb4f1491 Update links to merge requests 2012-07-25 21:11:58 +02:00
Riyad Preukschas 73dabcb357 Update links to issues 2012-07-25 21:11:58 +02:00
Riyad Preukschas cbce4528d0 Update links to commits 2012-07-25 21:11:58 +02:00
randx 14c9723724 Styled wiki area. fixed commit feed feature 2012-07-25 22:08:47 +03:00
randx 501ca8e6e8 Fix compare crash after decorator refactoring 2012-07-25 21:45:53 +03:00
randx 61c85332d2 Merge branch 'add_wiki_comments' of git://github.com/seeingidog/gitlabhq into seeingidog-add_wiki_comments 
Conflicts:
	app/controllers/admin/mailer_controller.rb
	app/controllers/notes_controller.rb
 2012-07-25 21:36:30 +03:00
Dmitriy Zaporozhets 5133541f25 Merge pull request #1127 from riyad/use-decorators 
Use CommitDecorator more
 2012-07-25 11:25:55 -07:00
Dmitriy Zaporozhets 05848512bf Merge pull request #1133 from robbytaylor/master 
Updated merge request subheading.
 2012-07-25 11:22:03 -07:00
Nihad Abbasov fbb41100db update help section with issues API docs 2012-07-24 05:52:43 -07:00
Rob Taylor dce6f7beb4 Updated merge request subheading. 
Changed "authored or assigned to you" to read "authored by or assigned to you" which reads better.
 2012-07-24 11:22:13 +01:00
Riyad Preukschas 34cea1cb63 Update views to use CommitDecorator 2012-07-22 13:08:24 +02:00
randx 11721b0dbe Help section for system hooks completed 2012-07-21 10:47:57 +03:00
randx 9c8a1e6517 Fix system hook example 2012-07-21 10:32:42 +03:00
randx 4261acda90 move SSH keys tab closer to begining 2012-07-21 10:27:09 +03:00
randx a69fc5dd23 Endless event loading for dsahboard 2012-07-21 10:23:05 +03:00
Pat Thoyts 787e5e94ac Fix english on the edit user form. 
Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
 2012-07-20 22:18:42 +01:00
Dmitriy Zaporozhets 3c6daec4b1 Merge branch 'sys_hooks' of dev.gitlabhq.com:gitlabhq 2012-07-20 09:08:16 +00:00
Ian Morgan 36efa2042c Add comments to Wiki pages 2012-07-19 20:23:55 -04:00
gliptak 44ec5579bd Display configured git repository location on error page (this is partially addressing issue #1072) 2012-07-19 12:39:02 -03:00
Dmitriy Zaporozhets 1464952597 Fix comments in MR. Fixed event destroy with user 2012-07-19 07:05:57 +03:00
Valeriy Sizov c38578428b System Hooks: CRUD has done 2012-07-19 00:25:10 +03:00
Dmitriy Zaporozhets 494cd02b38 Colored labels for events on dashboard 2012-07-17 08:21:16 +03:00
Dmitriy Zaporozhets a3bb9ca1fa Feature: Unassigned Merge Requests 2012-07-17 08:19:16 +03:00
Dmitriy Zaporozhets 80f2ef2d02 MR index pollished 2012-07-17 08:17:16 +03:00
Dmitriy Zaporozhets 2a705c4f40 Admin logs improved. Commits list box styled 2012-07-16 08:03:10 +03:00
Dmitriy Zaporozhets f88a2617e6 Tree ajax log. progress bar & refactoring 2012-07-10 23:12:38 +03:00
randx 1a2bacfb4b Feature: ajax load for tree commit log 2012-07-10 22:52:38 +03:00
randx b8425cf173 Last push widget improved 2012-07-10 21:26:41 +03:00
randx d3862c0e57 CSS improvements & refactoring 2012-07-10 20:16:23 +03:00
Dmitriy Zaporozhets 1dca367f22 Merge pull request #1067 from SaitoWu/bugfix/encoding 
fix blame encoding error.
 2012-07-10 01:08:31 -07:00
Saito c5b16f0998 fix blame encoding error. 2012-07-10 15:57:43 +08:00
Staicu Ionut ba7b85d0d9 issues counter are now live updated on creation/deleteion/reopening 
buttons on forms are disabled on submit (re-enabled after the request is complete)
 2012-07-10 07:33:04 +03:00
randx be1b40802d Api page in help 2012-07-06 03:05:12 +03:00
randx 6451e837bf Better event feed for dashboard 2012-07-06 02:16:41 +03:00
Dmitriy Zaporozhets 4c24cabf47 Merge pull request #1012 from NARKOZ/devise 
Add 10 minutes lock after 10 failed login attempts (Devise :lockable)
 2012-07-06 08:18:18 -07:00
Nihad Abbasov 2abd054b0c update devise 2012-07-05 23:50:24 -07:00
Dmitriy Zaporozhets 9497b1a76e Compare images 2012-07-05 23:19:37 +03:00
Dmitriy Zaporozhets 31bc2b9495 Fix tree css class conflict 2012-07-06 16:42:13 +03:00
Dmitriy Zaporozhets 0a6b64e6a9 MR: Handle broken diff ex. in case its too huge 2012-07-05 22:59:37 +03:00
Dmitriy Zaporozhets d40b9ce26d Admin gitolite logs. Refactored project creation. Few style fixes. 2012-07-05 21:59:37 +03:00
Dmitriy Zaporozhets df6a75d52d buttons margin fixed 2012-07-05 09:35:23 +03:00
randx 264ee0c5a1 Tabs styled. MR Get Patch 2012-07-05 01:26:23 +03:00
Dmitriy Zaporozhets 031ae7756e Refactored navigation 2012-07-03 20:52:48 +03:00
Dmitriy Zaporozhets a2eda66b30 Disable issues sort. Recent issues on top. Fixed tests 2012-07-02 21:51:48 +03:00
Dmitriy Zaporozhets 9b337b8328 Epic: Gitlab configuration with default values 2012-07-02 21:51:48 +03:00
Dmitriy Zaporozhets b3a0ee8e63 Fix MR tab width 2012-07-02 12:15:23 +03:00
randx 6a58deb536 UI changes: 
* .page_title  class added. Used for better page headers
* improved help page
* added back links for help pages
* show app version & revision on help page

Backend changes:
* Gitab::Version && Gitlab::Revision constants
 2012-07-01 00:35:24 +03:00
James Earl Douglas cc7369305c cleanup the wording of the notification footer 2012-06-29 12:52:38 -07:00
randx 2def1c7217 Merge Request -> show. Refactored. f5 support for diff 2012-06-29 21:55:22 +03:00
gleb 2da45e9cbf Refs #1013 
Renamed protect_resque.rb => resque_authentication
Integrated resque web with the rest of gitlab
 2012-06-29 13:46:24 +02:00
randx 335f9d6410 New Feature: Diff patch file export for commit 2012-06-28 12:51:50 +03:00
randx 5f356d6928 Issues tags: refactoring 2012-06-27 23:13:44 +03:00
Dmitriy Zaporozhets 50fdb2e7df Remove critical status from Issue. Move sort instead 2012-06-27 21:30:35 +03:00
Dmitriy Zaporozhets 1b1e77c728 Issue Labels: Edit, show, index + filter 2012-06-27 21:20:35 +03:00
Dmitriy Zaporozhets 4c1f435ab7 Merge pull request #971 from gingko/master 
Automatic password creation..
 2012-06-26 23:41:49 -07:00
Jakub Troszok 5ab1856291 Fixing requests tests. 2012-06-27 00:55:54 +02:00
Jakub Troszok 4426bc1844 Added option to automaticaly generate passwords for new users. 2012-06-26 23:59:08 +02:00
randx 1c8008c154 Informative search results page 2012-06-27 00:05:47 +03:00
randx 385ca60a6a issues_table css class 2012-06-26 23:34:23 +03:00
randx cbca0457f8 Issues list more compact now 2012-06-26 22:23:49 +03:00
randx 88c625e3f7 Issues can be unassigned now 2012-06-26 21:47:25 +03:00
randx 283bf80676 Comment icons for Issues, MR lists 2012-06-26 21:20:05 +03:00
randx 0321a3c9b4 MR: merged badge. Removed colors from MR list 2012-06-26 19:08:44 +03:00
Valeriy Sizov 1e1c5b7afe Diff refactoring 2012-06-24 01:14:45 +03:00
randx b32465712b Up to 2.6 2012-06-21 20:25:23 +03:00
randx 1903f6ade0 admin area -> search for users 2012-06-21 19:05:09 +03:00
randx 98a45ce6ee admin area -> search for projecs 2012-06-21 18:54:57 +03:00
randx 77cf662034 Pushed widget improved 2012-06-21 18:41:22 +03:00
randx 2d16585eae Few minor css improvements 2012-06-21 17:23:25 +03:00
Dmitriy Zaporozhets 75cf927d3b Issues & MR legend 2012-06-21 08:29:53 +03:00
Zevs 5fd2f7158e remove double negative 2012-06-21 00:21:13 +03:00
randx 1a05f2f7c9 Get rid of deprecated link_to_function 2012-06-20 21:29:55 +03:00
Zevs 6507c1085e Revert "Handle Commit "show suppressed diff" link with a doc-ready event handler." 
This reverts commit ef1598b4af.
 2012-06-20 21:01:27 +03:00
Zevs a9c7de8815 Revert "Handle MR "show all commits" link with a doc-ready event handler." 
This reverts commit 5b1ede6280.
 2012-06-20 21:01:00 +03:00
Zevs 581a822326 Revert "Invert "unless .empty?" to "if .present?"; unless-else is evil." 
This reverts commit 7484bcfff7.
 2012-06-20 21:00:34 +03:00
Valeriy Sizov 65c35394eb Merge pull request #951 from robbkidd/remove_link_to_function 
Replace calls to deprecated link_to_function with doc-ready functions.
 2012-06-20 10:43:32 -07:00
randx 4ac0160a11 Hande error with huge commits 2012-06-20 20:08:18 +03:00
Wouter D'Haeseleer c3d1f2eb9b make a hyperlink from the counted keys 
Refs Ticket #948
 2012-06-20 17:16:56 +02:00
Robb Kidd ef1598b4af Handle Commit "show suppressed diff" link with a doc-ready event handler. 
Replaces link_to_function use which was deprecated in Rails v3.2.4.
https://github.com/rails/rails/commit/9dc57fe9c

Still absent is a graceful degrade for no-JS.
 2012-06-20 11:11:17 -04:00
Valeriy Sizov e27a1d31e0 Merge pull request #937 from jdamick/master 
Modified the login screen for primarily LDAP authentication
 2012-06-19 01:40:01 -07:00
Robb Kidd 5b1ede6280 Handle MR "show all commits" link with a doc-ready event handler. 
Replaces link_to_function use which was deprecated in Rails v3.2.4.
https://github.com/rails/rails/commit/9dc57fe9c

Still absent is a graceful degrade for no-JS.
 2012-06-18 18:36:25 -04:00
Robb Kidd 7484bcfff7 Invert "unless .empty?" to "if .present?"; unless-else is evil. 2012-06-18 18:32:46 -04:00
randx 034ddb85fe Assignee filter for issues 2012-06-18 20:50:06 +03:00
randx 22d6dc2b3b Cucumber features: Team, SSH keys 2012-06-18 19:34:09 +03:00
jdamick 9a4e5a8bd5 removed dead code from the form 2012-06-18 11:51:17 -04:00
jdamick 848b5e99fc moved the ldap login to its own partial and cleaned up the forms a little bit 2012-06-18 11:45:49 -04:00
jdamick 50dabb5452 customizing the user login screen for primarily ldap authentication 2012-06-18 11:45:49 -04:00
Dmitriy Zaporozhets dbc7ef21d1 Merge pull request #932 from gitlabhq/cucumber 
Cucumber
 2012-06-16 03:46:14 -07:00
randx 781fd1a80c Cucumber -> Dashboard features 2012-06-16 12:50:14 +03:00
Gosha Arinich 482f1a7d19 Add HTML anchors for comments #929 2012-06-15 18:53:00 +03:00
Ben Phelps 6ff99fe945 Change "in" to "ago" in last edited message. 2012-06-14 20:51:01 -05:00
randx 36e88b960a CSS refactoring 2012-06-13 20:02:30 +03:00
Dmitriy Zaporozhets a243253b10 Refactored project archive. Improved MR usability form 2012-06-13 09:03:53 +03:00
randx edd81a79c5 Dashboard refactoring: 
* dashboard should be in dashboard controller not project index
* projects index removed
 2012-06-12 23:13:42 +03:00
randx 093159a868 Styled snippets. Raw button for snippet 2012-06-12 21:41:46 +03:00
randx b96af79bb8 Specs for last push widget 2012-06-12 21:15:34 +03:00
Dmitriy Zaporozhets e0d1fba15e Recent push event 2012-06-12 17:43:16 +03:00
Dmitriy Zaporozhets 6fa95a3d34 CSS refactored 2012-06-12 14:58:44 +03:00
Dmitriy Zaporozhets 0e33bf6eb0 Refactored IssuesController 2012-06-12 11:31:38 +03:00
randx 04bf40a923 Refactored theme css, added Modern theme pre version 2012-06-11 20:52:32 +03:00
Dmitriy Zaporozhets a6dad85d2f Get rid of modularity gem, Styled 'nothing here' message 2012-06-11 13:55:38 +03:00
randx 2d68e7f4cd MR -> remove source branch -> UI pollished 2012-06-05 19:45:18 +03:00
Zevs d6ed9920d6 #888 prevent to remove source_branch 2012-06-05 00:11:07 +03:00
Zevs 3b41b1839b ability to remove source branch after merge 2012-06-05 00:11:07 +03:00
Andrey Vakarev 3bd06d55e0 Remove trailing whitespaces and trailing lines 2012-06-04 01:37:27 +03:00
nathanvda 3792d624b6 Use the faster alternative methods in grit to count tags and branches (which I added). This is much faster in all cases, but especially on large repositories the difference should be obvious. 2012-06-03 03:24:59 +02:00
Dmitriy Zaporozhets 16427f4c40 Merge pull request #880 from NARKOZ/dashboard-feed 
Dashboard feed
 2012-06-01 07:25:54 -07:00
Nihad Abbasov f8f6ff065e add projects atom feed 2012-05-31 23:42:02 -07:00
randx 96308f7534 Milestones: progressbar from bootstrap. Bradcrumbs styles 2012-06-01 00:10:52 +03:00
randx 17d4cac208 Rescue encoding error on controller level 2012-05-31 23:36:52 +03:00
randx a719bfc931 Graph: navigation with keyboard 2012-05-31 23:31:17 +03:00
randx 78f4c789b3 Improved Commit diff -> Images. Red border for removed & green for added images 2012-05-30 21:02:30 +03:00
randx b826a684c7 Fix MR modal bug 2012-05-30 19:46:09 +03:00
Saito 202807c21a remove detect_enoding. detect_encoding means force_encoding to the file.data's encoding, not encoding to utf8. will cause encoding problem. 2012-05-30 11:56:00 +08:00
randx 89043d6b89 MR: Accept section polished. Show permission info 2012-05-28 20:19:54 +03:00
randx d72f8db08a Merge branch 'fix_encoding' of https://github.com/brodock/gitlabhq into brodock-fix_encoding 
Conflicts:
	lib/gitlab/encode.rb
 2012-05-27 12:20:35 +03:00
Gabriel Mazetto 50c2c16a4d Better algorithm to deal with encodings. Moved fallback rescue message from view to encode library. 
This helps fix cases where UTF-8 is wrongly identified as ISO-8859-1. We will only try to convert strings if we are 100% sure about the charset, otherwise, we will fallback to UTF-8.
 2012-05-26 20:15:06 -03:00
randx d29ec9d773 Images refactored, Feed icon replaced, Fixed comment form focus 2012-05-27 01:12:28 +03:00
Gabriel Mazetto 39def0dcbb Better fix for encoding problems on rendering of inline file visualizations like README files. 2012-05-26 15:56:11 -03:00
Dmitriy Zaporozhets ddc7568fec Milestone show, Team index: Better UI 2012-05-24 09:23:52 +03:00
Eric 837a78db2e fix merge_requests.html 2012-05-23 15:20:41 +06:00
Dmitriy Zaporozhets f33cf247b6 Merge pull request #833 from Nek-/patch-utf8 
Added force utf8 encoding
 2012-05-19 03:34:20 -07:00
Dmitriy Zaporozhets 5d24082787 Preparing to v2.5 2012-05-19 13:17:34 +03:00
Nek 8c7c43b94f Added force utf8 encoding 2012-05-19 12:12:49 +02:00
Dmitriy Zaporozhets 860e3ab526 Event feed: Icons for some events 2012-05-19 12:25:56 +03:00
Dmitriy Zaporozhets 1e4d15b406 Password & token split up, icon to button for top panel 2012-05-19 12:25:56 +03:00
Dmitriy Zaporozhets 02dc256514 Branches pages polished. few css improvements 2012-05-18 00:23:18 +03:00
Dmitriy Zaporozhets 9cd8f7b082 New Feature: Git Blame for file 2012-05-17 19:11:45 +03:00
RickXing 4c503be0f1 fix bug in mailer 2012-05-17 14:30:24 +08:00
Robb Kidd e660043d22 Make Notify#new_merge_request_email resque friendly. 2012-05-15 22:37:34 -04:00
Robb Kidd 39061af9f8 Make Notify#new_issue_email resque friendly. 2012-05-15 22:37:34 -04:00
Robb Kidd 41c00a20a9 Make Notify#note_wall_email resque friendly 
Update method to take ids and then perform #finds itself during mailer
queue worker kick-off.
 2012-05-15 22:37:34 -04:00
Robb Kidd 0a9a2c2a0b Make Notify#note_commit_email resque friendly 
Update method to take ids and then perform #finds itself during mailer
queue worker kick-off. Also, the faux SHA1 cannot have underscores or
it will not match the commit pattern defined in the routes.
 2012-05-15 22:37:34 -04:00
Robb Kidd 435fd8f087 Make Notify#note_issue_email resque friendly 
Update method to take ids and then perform #finds itself during mailer
queue worker kick-off.
 2012-05-15 22:37:34 -04:00
Robb Kidd bb22360d1a Make Notify#note_merge_request_email resque friendly 
Update method to take ids and then perform #finds itself during mailer
queue worker kick-off.
 2012-05-15 22:37:33 -04:00
Robb Kidd 5fe75649b3 Rename changed_mr_email to reassigned_mr_email & make resque friendly 
#changed_merge_request_email was really sending emails about merge
request reassignments. Updated method name to reflect that.

Update method to take ids and then perform #finds itself during mailer
queue worker kick-off.
 2012-05-15 22:37:33 -04:00
Robb Kidd dd921053c8 Rename changed_issue_email to reassigned_issue_email & make resque friendly 
#changed_issue_email was really sending emails about issue reassignments.
Updated method name to reflect that.

Update method to take ids and then perform #finds itself during mailer
queue worker kick-off.
 2012-05-15 22:35:53 -04:00
Dmitriy Zaporozhets be79c9def9 CSS improvements for diff & file view 2012-05-15 19:35:18 +03:00
RickXing 465a195117 show rendered file if it is .markdown file 2012-05-15 09:23:14 +08:00
RickXing 25b80767bd use resque mailer to send mail background 2012-05-12 17:01:09 +08:00
Adnan Abdulhussein f20c079375 spelling mistake 'successfull' 2012-05-03 20:35:15 +01:00
Wouter D'Haeseleer edcbe1178c Make permission overview structured 
The current overview is a mess.
This pull commit will make it look more clean.

All permissions are alliged between the columns and the master rights
have been enchanced with all its rights.
 2012-05-03 12:44:03 +02:00
Valery Sizov 43dcc9575a Task #735 Automerge should not be checked on every load of MR show page 2012-04-27 00:53:55 +03:00
Dmitriy Zaporozhets 28cb43135c Hooks UI improved, Request tests added 2012-04-26 20:43:12 +03:00
Dmitriy Zaporozhets 2746be6ce3 Home button should targeted on root page of context 2012-04-24 21:47:01 +03:00
gitlabhq c9af8e7579 New project page improved. User profile improved. Show issues, participant on Milestone show page. 2012-04-24 21:49:34 +03:00
gitlabhq d97a9aa4a4 fixed email markdown 2012-04-23 15:32:56 +03:00
Dmitriy Zaporozhets 71819dc344 logo changed for header 2012-04-22 16:01:59 +03:00
Dmitriy Zaporozhets 08994f3f60 Merge remote-tracking branch 'origin/merge_button' 
Conflicts:
	app/assets/javascripts/merge_requests.js
	db/schema.rb
 2012-04-21 12:22:56 +03:00
Dmitriy Zaporozhets 7c8fbe8f7f Merge branch 'master' of github.com:gitlabhq/gitlabhq into arthurschreiber-use_redcarpet_for_markdown 2012-04-21 01:44:52 +03:00
Dmitriy Zaporozhets 9cb51c6ea2 Merge branch 'use_redcarpet_for_markdown' of https://github.com/arthurschreiber/gitlabhq into arthurschreiber-use_redcarpet_for_markdown 
Conflicts:
	Gemfile
	Gemfile.lock
 2012-04-21 01:44:15 +03:00
Dmitriy Zaporozhets 680ee045d8 Merge pull request #709 from blueyed/master 
Fix typo: "less then" => "less than"
 2012-04-20 15:27:53 -07:00
Daniel Hahler c851639a75 Fix typo: "less then" => "less than". 2012-04-20 23:36:09 +02:00
Arthur Schreiber 5b6019f357 Using github's linguist to better detect filetypes and to do syntax highlighting. 2012-04-20 23:21:12 +02:00
Arthur Schreiber c437e2d7d4 Switch to Redcarpet for Markdown Rendering. 
This gives us Github Flavored Markdown, which is awesome.
 2012-04-20 23:01:45 +02:00
Dmitriy Zaporozhets 9ee345750c fixed admin root path for header 2012-04-20 22:51:57 +03:00
randx 35e21b3402 Admin dashboard 2012-04-20 19:41:49 +03:00
randx 1d601616a3 Pagination and better perfomance for projects page. 2012-04-20 19:11:49 +03:00
Ricky Elrod 3f1a004c47 Fix a few grammatical mistakes in profile view. 2012-04-19 08:01:58 -03:00
Tiago Ribeiro 8b5ef3c24f Fixed typo in label 2012-04-18 02:34:14 +01:00
Dmitriy Zaporozhets 5ef3b38429 MR commits suppressed if too many. few icons 2012-04-17 22:08:07 +03:00
Dmitriy Zaporozhets 3b7998e197 Milestone filter for issues improved 2012-04-17 21:03:01 +03:00
Dmitriy Zaporozhets ac7bb20682 fixed app crash on new issue via get 2012-04-17 20:35:27 +03:00
Dmitriy Zaporozhets 3250a024ef 1. Improved admin -> new project form 
2. Fixed bug: post-receive file was not added when create project via admin
 2012-04-17 20:27:18 +03:00
Dmitriy Zaporozhets f1795a4911 Issues form improved, Show milestone for Issue show 2012-04-17 00:22:59 +03:00
Dmitriy Zaporozhets c9def945d4 User blocking improved. Admin area styled 2012-04-16 23:33:03 +03:00
Valery Sizov a8e4f3ed88 Auto-merge: 'already can not be merged' alert 2012-04-16 23:05:08 +03:00
Valery Sizov 8269a3a735 Auto-merge: checking via AJAX 2012-04-16 22:08:03 +03:00
Dmitriy Zaporozhets c0df0cd70c Commit header improved. finalize PR 667 2012-04-16 01:10:09 +03:00
Dmitriy Zaporozhets a7ed8276d7 Merge branch 'nicer_commit_headers' of https://github.com/arthurschreiber/gitlabhq into arthurschreiber-nicer_commit_headers 2012-04-15 21:01:35 +03:00
Arthur Schreiber ad25dac8b6 Change the design a bit to look more like before. 2012-04-14 12:38:12 +02:00
Arthur Schreiber c530543c1a Nicer commit headers. 2012-04-14 12:38:12 +02:00
Dmitriy Zaporozhets 95fde9bd7a Projects page as dashboard. Old dashboard removed 2012-04-14 11:20:45 +03:00
Dmitriy Zaporozhets 5f31989a05 Search improved 2012-04-14 11:16:11 +03:00
randx 497ee5fbbc Ability to block user 2012-04-13 08:12:34 +03:00
Dmitriy Zaporozhets fb6d4511a0 restored dark theme 2012-04-12 00:54:07 +03:00
Dmitriy Zaporozhets 0e62b1cbaa preserve for code browse 2012-04-11 23:59:53 +03:00
Dmitriy Zaporozhets 088860de4e feed few fixes 2012-04-11 23:50:13 +03:00
Dmitriy Zaporozhets 740e54c3fc Merge pull request #667 from keikubo/master 
The indents errors of pre blocks in haml
 2012-04-11 13:34:15 -07:00
Dmitriy Zaporozhets e7add858cf bug fixes & bootstrap buttons 2012-04-11 23:32:45 +03:00
Dmitriy Zaporozhets b7558a2063 Removed encoding monkey patch 2012-04-11 23:03:56 +03:00
Kei Kubo 42f04bf70c bug fix: broken indents fixed in markdown rendered statements 2012-04-11 19:36:52 +00:00
Kei Kubo 700eec6672 added = preserve to some pre statements 2012-04-11 19:13:38 +00:00
Kei Kubo 51ca0abf10 bug fix: <pre> indent error fixed in projects/empty.html 2012-04-11 10:35:49 -07:00
Dmitriy Zaporozhets ba3c359fd5 b2 fixes 2012-04-10 21:39:04 +03:00
Dmitriy Zaporozhets 8f22834c4e bootstrap 2 integration complete. 2012-04-10 20:50:27 +03:00
Dmitriy Zaporozhets 2587de74df Minor fixes 2012-04-10 20:06:17 +03:00
randx 627efddf63 migrated to bootstrap 2 2012-04-10 08:51:08 +03:00
Dmitriy Zaporozhets d98b183361 first pack of tests for milestones 2012-04-09 01:01:42 +03:00
Dmitriy Zaporozhets 23d950855d Milestone basic scaffold 2012-04-09 00:28:58 +03:00
Dmitriy Zaporozhets 667edcdd75 Dashboard issues/mr pages improved 2012-04-08 00:18:32 +03:00
Dmitriy Zaporozhets 88974b500f projects list on dashboard with commit links 2012-04-07 23:13:18 +03:00
Andrea Dal Ponte f30d56494e admin_user_path correction 2012-04-06 12:00:13 +02:00
Dmitriy Zaporozhets 86676476e6 Handling big commits & big diff 2012-04-06 01:00:15 +03:00
randx 897da534fa Fix issues with push 600+ commits. refactored, improved push events 2012-04-04 07:39:04 +03:00
Dmitriy Zaporozhets a951e6f8ae GitlabSerialize: cause of invalid yaml in some events we migrate to json serialization 2012-04-04 02:25:33 +03:00
Dmitriy Zaporozhets 8aa5076d68 pollished team index 2012-04-04 01:21:31 +03:00
Dmitriy Zaporozhets c40c627a3b team profile restyled 2012-04-02 21:13:44 +03:00
Dmitriy Zaporozhets c9db6bb3f2 prevent app crash for events without git resources 2012-04-02 19:51:20 +03:00
Dmitriy Zaporozhets 00dc34e192 Events improved & refactored. Dashboard pollished 2012-04-02 00:24:45 +03:00
Dmitriy Zaporozhets 90748cf724 Merge Button v1 complete 2012-03-30 20:49:34 +03:00
Staicu Ionut 2b01c65e50 - when you add a new ssh key, the title field automatically fills with the email (if is present in the key sting) 2012-03-30 18:30:56 +03:00
randx 3824f9b372 Unverify MR on every push. Ajax for MR accept. better UI 2012-03-30 08:15:04 +03:00
randx 411d84f385 Better merge handling. show if MR can be accepted or not 2012-03-30 08:05:04 +03:00
Dmitriy Zaporozhets cd74f9da91 Link for auto merge, db field for MR 2012-03-30 00:27:42 +03:00
randx 69ef81404c UI improved, .main_box css class for show pages 2012-03-28 10:46:51 +03:00
Dmitriy Zaporozhets bae4efa7cf Merge branch 'master' of dev.gitlabhq.com:gitlabhq 2012-03-28 00:31:22 +03:00
Dmitriy Zaporozhets 46906ca9db Issues, Merge Request show page polished. Fixed +n overflow 2012-03-28 00:31:14 +03:00
Valery Sizov 442d5dbef2 fixed yellow background in markdown documents 2012-03-27 23:04:21 +03:00
Dmitriy Zaporozhets 1647f46b1f Project show page polished 2012-03-26 23:11:15 +03:00
Dmitriy Zaporozhets 788de6f1c8 Better commit show page 2012-03-26 22:41:56 +03:00
Dmitriy Zaporozhets 7d56a51bdc Js refactoring and ajax animation replaced 2012-03-26 21:41:58 +03:00
Dmitriy Zaporozhets f1c534c68e Merge branch 'master' of github.com:gitlabhq/gitlabhq 2012-03-26 20:30:06 +03:00
Gosha Arinich 73404f6281 there should be no space after '(' and before ')' 2012-03-26 12:11:02 +03:00
randx dfe9f3674c fix image width for markdown 2012-03-26 07:40:51 +03:00
Dmitriy Zaporozhets 39ea486e1f Fixed specs. Some css fixes 2012-03-25 19:44:29 +03:00
Dmitriy Zaporozhets 8652cd8989 Preparing 591 for merge. Restyled issues & merge requests. Fixed issue edit. 2012-03-25 19:05:24 +03:00
Steven Verbeek 54dc2d5c32 Changed Note to Comment 2012-03-24 18:19:26 -03:00
Steven Verbeek d3cb694edb Fixed icon, added helper 2012-03-24 14:42:45 -03:00
Steven Verbeek a805d3131f Fixed line ending issues on windows. 2012-03-24 14:36:14 -03:00
Steven Verbeek c2c4424ff8 Started note attachment changes, and text changes 2012-03-24 13:57:01 -03:00
Steven Verbeek e5fa0bb127 Started note attachment changes, and text changes 2012-03-24 13:40:21 -03:00
Steven Verbeek fb4c033aeb Started note attachment changes, and text changes 2012-03-24 13:30:04 -03:00
Steven Verbeek b91128cc6a Started note attachment changes, and text changes 2012-03-24 13:26:25 -03:00
Steven Verbeek 194467b8f8 Started note attachment changes, and text changes 2012-03-24 13:19:20 -03:00
Steven Verbeek 46605c9175 Started note attachment changes, and text changes 2012-03-24 13:08:42 -03:00
Steven Verbeek 6c40e89853 merging upstream changes 2012-03-24 00:36:54 -03:00
Dmitriy Zaporozhets 1c6df8e075 Improved profile & team member show 2012-03-24 01:01:36 +02:00
Dmitriy Zaporozhets fa8219e0a7 better MR list, dashboard pollished 2012-03-22 22:57:04 +02:00
Dmitriy Zaporozhets 81da8e46f2 Remove button for empty repo. Last push on dashboard. Better notes count indicator for issues 2012-03-22 22:28:02 +02:00
Dmitriy Zaporozhets e241d1e670 Fix form label for ssl requests 2012-03-22 20:02:38 +02:00
randx 52d8ed9e4f Pagination for Merge Requests. Fixed for issues 2012-03-22 00:09:57 +02:00
randx 755a894c91 Issues pagination 2012-03-22 00:09:56 +02:00
Valery Sizov 039b6db483 design improve of form of key 2012-03-22 00:09:53 +02:00
Valery Sizov 8bb4c6de56 improve how to merge tips 2012-03-21 23:59:12 +02:00
Steven Verbeek fafc34b0db merging upstream changes 2012-03-21 00:21:34 -03:00
Dmitriy Zaporozhets b57faf9282 Push events polished 2012-03-20 23:59:35 +02:00
Steven Verbeek 35d0de8f36 merging upstream changes 2012-03-19 21:57:29 -03:00
Steven Verbeek 2a7cd2f1b5 Fixed tab indent. 2012-03-19 21:43:25 -03:00
Steven Verbeek 550274e136 Added badge, made the issue list smaller height wise, and moved # NOTES over to # comments 2012-03-19 21:32:08 -03:00
Dmitriy Zaporozhets cadf12c60c Merged activities & projects pages 2012-03-20 00:05:35 +02:00
Dmitriy Zaporozhets 724ea16c34 Activities page added. Dashboard few specs. Preparing for 2.3 2012-03-19 22:52:16 +02:00
Steven Verbeek c43ac3c721 Small fix. 2012-03-17 13:13:42 -03:00
Steven Verbeek 66d64ad4f4 Fixed code in issue details, changed form description to details. 2012-03-17 13:02:48 -03:00
Steven Verbeek 9cbd1aef20 Fixed row messed up. Started on overall look. 2012-03-17 03:31:38 -03:00
Steven Verbeek aeed7da6d4 Fixed HR 2012-03-17 02:48:22 -03:00
Steven Verbeek 1c2c860c22 Fixed css issues with issues :) 2012-03-17 02:46:47 -03:00
Steven Verbeek c93fda2737 Added markdown is enabled. 2012-03-17 02:24:51 -03:00
Steven Verbeek 1b96985025 Re-added back to issues list, but moved it above title. Added css to move issue meta data around. 2012-03-17 02:22:12 -03:00
Steven Verbeek 7712d81f9b Moved OPEN and removed back link (you can easily click on issues to get to the same spot) 2012-03-17 02:17:04 -03:00
Steven Verbeek 3263f2e1ab Fixed markdown. 2012-03-17 02:13:36 -03:00
Steven Verbeek 4dc1331676 Markdown for issue description, added issue title 2012-03-17 02:09:16 -03:00
Steven Verbeek 94fd9a6e47 Added issue description. 2012-03-17 00:24:40 -03:00
Steven Verbeek 8a9e90dac5 Changed some more wording 2012-03-16 23:48:29 -03:00
Steven Verbeek b6fdb8557b Changed title to issue message (name) and changed Save to Submit new issue. 2012-03-16 23:43:28 -03:00
Dmitriy Zaporozhets 341b4414ea styled title block for mr, issue, commit 2012-03-16 21:11:03 +03:00
Dmitriy Zaporozhets 2ec12c9bb8 Impoved merge requests show page. Minor style improvements across project 2012-03-16 01:45:46 +02:00
Dmitriy Zaporozhets 7f76d6cfee counters for dashboard panel 2012-03-16 01:31:46 +02:00
Dmitriy Zaporozhets 5d2bd5ec3a Simple search implementation 2012-03-16 01:14:39 +02:00
Dmitriy Zaporozhets b2c13bdd77 button styled 2012-03-15 23:44:04 +02:00
Dmitriy Zaporozhets 7b75f3cfd3 show who merged request 2012-03-15 23:32:00 +02:00
Dmitriy Zaporozhets 2e2e0522d4 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2012-03-15 19:39:28 +02:00
Ariejan de Vroom cbc56a96ac Updated upvotes view for issue and merge request show 2012-03-15 13:03:56 +02:00
Dmitriy Zaporozhets 5a3f23f395 Persist Merge Request diff. Auto merge request close on push 2012-03-15 00:57:43 +02:00
Ariejan de Vroom 27e3699814 Links +upvote buttons directly to the notes section 2012-03-15 00:56:42 +02:00
Ariejan de Vroom 2d00f2dfe4 Added 'x notes' and +1 counters to issues and merge requests. Refs #549 2012-03-15 00:51:03 +02:00
Ariejan de Vroom 8d8b82127f Count +1 votes in issue notes. 2012-03-14 15:31:31 +02:00
Ariejan de Vroom ed11ca13e8 Added form hint about markdown for the project description 2012-03-14 12:39:33 +02:00
Ariejan de Vroom 317963b1ab Use markdown to render the project description. 2012-03-14 12:34:03 +02:00
Dmitriy Zaporozhets 3676838dc9 Rspec test repo replaced.\nMerge Requests improved 2012-03-13 23:54:49 +02:00
Dmitriy Zaporozhets 781f5aa6fb classic theme improved, images refactored 2012-03-13 22:17:13 +02:00
Dmitriy Zaporozhets e44ee826ac tree browse -> file icons 2012-03-12 23:52:10 +02:00
Loïc Gerbaud 3ae93e6f97 Typo : "vist" -> "visit" on dashboard 2012-03-12 13:15:48 +01:00
Dmitriy Zaporozhets af0b65ddb8 projects page improved 2012-03-11 11:46:15 +02:00
Dmitriy Zaporozhets 4d24c3bb21 fixed snippet show 2012-03-10 23:57:53 +02:00
Dmitriy Zaporozhets a10ad7183e Usability improved. Nothing to show messages for issues, MR 2012-03-10 23:41:05 +02:00
Dmitriy Zaporozhets 51f7d94991 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2012-03-09 20:05:07 +02:00
Dmitriy Zaporozhets fc058605c2 fixed app crash if edit empty project from admin 2012-03-09 20:04:26 +02:00
Dmitriy Zaporozhets 3c3d26f3e7 Merge pull request #529 from abhid/branch-commit-url-fix 
This might fix the issue with commits showing up in the format.
 2012-03-08 02:08:25 -08:00
Dmitriy Zaporozhets d4ebde9378 help updated 2012-03-08 00:15:31 +02:00
Dmitriy Zaporozhets a9ef0bc343 test fix, css refactoring 2012-03-07 23:55:46 +02:00
Abhi Devireddy 32f04fc345 This might fix the issue with commits showing up in the format. 
Needs to be tested.
 2012-03-07 11:41:39 -06:00
Dmitriy Zaporozhets c9b64974c0 increased dashboard width 2012-03-07 00:16:43 -08:00
Dmitriy Zaporozhets 94befdd502 Events improved. Open/close issue, merge request events displayed 2012-03-07 00:13:43 -08:00
Abhi Devireddy a7c8ce6a4d Removed hardcoded SSH Username on project create/edit form 2012-03-06 17:39:07 -06:00
Dmitriy Zaporozhets eb7bbedb20 Polishin & fixed tree switch 2012-03-06 00:29:40 +02:00
Dmitriy Zaporozhets cb59aade4e Cleaning and refactoring 2012-03-06 00:26:40 +02:00
Dmitriy Zaporozhets 0727edd8a0 Removed issues,mr delete buttons. Refactored models 2012-03-04 15:35:15 +02:00
Dmitriy Zaporozhets bc6915f24a projects page finished 2012-03-04 03:00:19 +02:00
Dmitriy Zaporozhets d6b051c5be get rid of sidebar 2012-03-03 13:03:03 +02:00
Dmitriy Zaporozhets 62707bb730 fixed invalid issues link on dashboard 2012-03-03 11:23:03 +02:00
Dmitriy Zaporozhets 6de7dc1e67 New projects page 2012-03-03 00:09:17 +02:00
Dmitriy Zaporozhets 5263dd4297 Events displayed on project page. \n Fixed theme issue. \n New issue, mr events enabled 2012-03-01 22:43:04 +02:00
Dmitriy Zaporozhets 00028702fc design tab improved. Themes added 2012-03-01 21:23:50 +02:00