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

1105 commits

Author SHA1 Message Date
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
Nathan Anderson 19a9cd7f9d Included good default font for Windows. 2012-06-19 07:56:09 -03:00
Nathan Anderson 77860f3537 Included good default for Windows and standardized <pre> font families 2012-06-19 07:55:01 -03:00
Dmitriy Zaporozhets acdbc1b4c5 Better fonts for code 2012-06-19 13:48:39 +03: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 2dd17623c9 Refactor code themes 2012-06-18 20:18:14 +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
Dmitriy Zaporozhets a78908c697 mailObserver quickfix 2012-06-14 12:45:22 +03:00
Dmitriy Zaporozhets 72b9c14ebc refactored mail observer 2012-06-14 08:24:10 +03:00
Dmitriy Zaporozhets f5ee330a13 Few css fixes for dark theme 2012-06-14 10:43:45 +03:00
randx 36e88b960a CSS refactoring 2012-06-13 20:02:30 +03:00
Nihad Abbasov e735763f27 remove useless index method from projects controller 
see edd81a79c5
 2012-06-13 05:22:40 -07: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 9ef9c58f55 Better UI for projects list on dahboard 2012-06-12 22:04:57 +03:00
randx 5f5cd2be13 ui-box style improved 2012-06-12 21:55:10 +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 40af6e1ad2 few improvements for ui 2012-06-12 16:36:27 +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
Dmitriy Zaporozhets 0a70aca3b1 Models Refactoring: Move methods to roles 2012-06-07 15:44:57 +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
Andrey Vakarev 6ee4548c99 Removed empty helpers (probably auto-generated) 2012-06-03 22:32:40 +03:00
Andrey Vakarev 16b49124be Remove unused methods 2012-06-03 22:27:34 +03:00
Dmitriy Zaporozhets a35a12980e Merge pull request #887 from nathanvda/improve_tag_count 
Improve performance when handling large repo's
 2012-06-03 08:05:54 -07:00
Dmitriy Zaporozhets aadf9d607e Merge pull request #885 from avakarev/clean-up-application_helper 
Clean up application_helper.rb code
 2012-06-03 00:54:34 -07: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
Andrey Vakarev 2048750029 Clean up application_helper.rb code 2012-06-03 04:08:01 +03:00
Andrey Vakarev fb4b571fa6 Clean up tab_helper.rb code 2012-06-03 03:58:49 +03:00
randx cbea0af290 custom select styled, tree table no round borders 2012-06-02 01:00:29 +03:00
Dmitriy Zaporozhets 16427f4c40 Merge pull request #880 from NARKOZ/dashboard-feed 
Dashboard feed
 2012-06-01 07:25:54 -07:00
Nihad Abbasov cc3c6ad0ef allow login via private token only for atom feeds 2012-06-01 06:56:28 -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
Dmitriy Zaporozhets 2cf8010792 Merge pull request #868 from SaitoWu/bugfix/encoding 
Bugfix/encoding
 2012-05-30 00:24:43 -07:00
Saito 34cc38b6f5 diff now no need to force_encoding to utf8 2012-05-30 11:56:48 +08: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
Nihad Abbasov 7c7761099c fix deprecation warnings 2012-05-29 19:16:28 +05:00
Nihad Abbasov 058d80b336 fix file extension 
[ci skip]
 2012-05-29 18:55:55 +05:00
Nihad Abbasov 865cf830c4 get rid of unused assets, use gems instead 2012-05-29 18:45:18 +05:00
Nihad Abbasov 8c7caaa69c use chosen-rails 2012-05-29 17:50:10 +05:00
Nihad Abbasov faa0ec7c63 cleanup User model 2012-05-29 17:13:41 +05:00
randx 89043d6b89 MR: Accept section polished. Show permission info 2012-05-28 20:19:54 +03:00
randx 020caf1274 Fixed wrong module name 2012-05-27 12:34:25 +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 48a36851e6 It's dangerous to rescue errors here as it will hide bugs. define_tree_vars already catch all situations where something may not exist. 2012-05-26 15:56:11 -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
Gabriel Mazetto eb5749ed39 Fixed encoding problems with plain/text blobs being sent without charset. 2012-05-26 15:55:53 -03:00
randx 3272620f72 lib/ refactoring. Module Gitlabhq renamed to Gitlab 2012-05-26 13:37:49 +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 1b2068eaa9 Gem updates & githost logger 
* Grit gem updated
* gitolite-client updated
* logger added
* few fixes
 2012-05-21 23:17:41 +03:00
Andrey Vakarev fed1c98047 Refactoring: get rid of ruby antipattern unless/else and use if/else instead 2012-05-20 03:01:13 +03: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
mikkyhouse 2b319d0496 Merge pull request #828 from CedricGatay/feature/chosen_0.9.8_searchContains 
Chosen 0.9.8 + Autocomplete contains
 2012-05-17 09:46:03 -07:00
Cedric Gatay 0bdcf2e1dc Chosen 0.9.8 + Autocomplete contains 
Bumped Chosen to 0.9.8 (latest) and added default option to allow autocompletes to find items containing entered text.
 2012-05-17 18:41:15 +02: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
Demelziraptor e5bbefc980 change find_or_first to work with default branch 2012-05-16 14:47:59 +01:00
Robb Kidd 991d23e216 Change calls to Notify methods to send IDs instead of objects. 2012-05-15 22:37:34 -04: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 2d124d9496 Add delegate for project's name on Note. 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
Robb Kidd 345f176a74 Update new_user_email to take id for User and perform find itself. 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
Nick Kugaevsky 6a4ae93f57 CSS fix: main menu buttons dividers 2012-05-15 18:50:27 +04:00
Nick Kugaevsky 451118f19a Activity stream: event labels css fix — proper paddings. 2012-05-15 17:47:01 +04:00
Nick Kugaevsky 7406fb5b12 Activity stream: commit labels css fix — proper paddings and highlighting on hover. 2012-05-15 17:46:18 +04:00
Dmitriy Zaporozhets fab42a612e Merge pull request #814 from kugaevsky/patch-1 
Minor headers styles in readme fix: increased line-height for h1..h4.
 2012-05-15 01:08:30 -07:00
Dmitriy Zaporozhets 17bd6b13bc Merge pull request #821 from oreofish/showmarkdown 
show rendered file if it is .markdown file
 2012-05-15 00:18:49 -07:00
RickXing 465a195117 show rendered file if it is .markdown file 2012-05-15 09:23:14 +08:00
Robb Kidd e0b709266e Fix missing call to MergeRequest.find in Notify#changed_merge_request_email 2012-05-14 20:19:28 -04:00
Nick Kugaevsky c0fa68572e Minor headers styles in readme fix: increased line-height for h1..h4. 2012-05-12 16:50:57 +04: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
Valeriy Sizov 12bb1d8f39 Merge pull request #775 from netdata/gravatar_empty_issue 
When the email address is empty gitlab will give a 500 error
 2012-05-03 06:19:49 -07:00
Valeriy Sizov 28bc6c5247 Merge pull request #777 from netdata/Show_better_permissions_overview 
Make permission overview structured
 2012-05-03 06:17:37 -07:00
Wouter D'Haeseleer babb6a1a6b Define a default value as suggested by ariejan 2012-05-03 14:19:06 +02:00
Wouter D'Haeseleer c808295e9e Allow short project names 
We have some projects which a length of 2.
With this I lower the minimum lenght to 1.
As I could not found a specific reason why it is set to 3...
 2012-05-03 12:53:24 +02: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
Wouter D'Haeseleer 825d2d69af When the email address is empty gitlab will give a 500 error 
Since some conversion tools do commits with an empty commiters email
address gitlab will fail with a 500 error
 2012-05-03 12:20:27 +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
mgesmundo 7c59722ddc Cosmetic change in menu 2012-04-26 11:55:46 +03:00
Valeriy Sizov f72a5d11bd Merge pull request #732 from mmozuras/ldap_name_utf8 
Force utf-8 encoding for ldap omniauth_info.name
 2012-04-24 13:59:27 -07: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
mmozuras 03cc55dba6 Force utf-8 encoding for ldap omniauth_info.name 2012-04-24 10:42:30 +03:00
gitlabhq d97a9aa4a4 fixed email markdown 2012-04-23 15:32:56 +03:00
Dmitriy Zaporozhets 511d07c47c Merge pull request #713 from gitlabhq/fast_automerge 
Fast automerge
 2012-04-22 06:38:39 -07:00
Valery Sizov e5f8397fd4 fast automerge: done 2012-04-22 16:14:01 +03:00
Dmitriy Zaporozhets 71819dc344 logo changed for header 2012-04-22 16:01:59 +03:00
Valery Sizov dcbb875c46 fast automerge: base implementation 2012-04-22 15:19:09 +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
Dmitriy Zaporozhets 9c76bd9540 Project linguist integration 2012-04-21 01:26:22 +03: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
Dmitriy Zaporozhets 60bf502bf1 Merge pull request #698 from Sindacious/master 
Display Milestones without a due date as active
 2012-04-20 00:53:20 -07:00
Dmitriy Zaporozhets 1845429268 Use try for commit prev_commit_id detection 2012-04-19 23:35:35 +03:00
Dmitriy Zaporozhets 45b18365d5 Fix an issue with MR unavailable if remove source branch 2012-04-19 23:06:45 +03:00
James Newton 69fd4763d2 display milestones that are not marked with a due date as active 2012-04-19 13:24:02 -05: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