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

1517 commits

Author SHA1 Message Date
Alex Denisov
562af7a6a2 Merge branch 'master' into normalize_capitalization 2012-09-06 11:40:56 +03:00
Alex Denisov
09a86bd4d6 Capitlization of /gitlab/i normalized. #1367 2012-09-06 11:21:35 +03:00
Dmitriy Zaporozhets
982a4095c1 Use tw style for some buttons. Improved deploy key UI 2012-09-05 08:56:59 +03:00
Robert Speicher
0bc4ecfedd Change projects/empty to include the clone_panel partial instead of duplicating 2012-09-04 12:05:21 -04:00
Robert Speicher
82a3996883 Remove projects/_show partial 
I have no earthly idea what this file was for, but I couldn't find it being
rendered anywhere.
 2012-09-04 12:05:21 -04:00
Robert Speicher
7e76610d0a Update the projects js file to coffeescript; refactor the clone panel switcher 2012-09-04 12:05:20 -04:00
Robert Speicher
6471d8c652 Change @project instance variable to a local in views/help/markdown 
It was erroneously appending the project name to the page's title, even
though the Help system isn't specific to one project.
 2012-09-04 03:18:26 -04:00
Robert Speicher
b44e9a08d5 Add Milestone link to API help TOC 
[ci skip]
 2012-09-03 20:38:41 -04:00
randx
f557686eb2 git clone panel available on files tab too 2012-09-03 22:30:14 +03:00
randx
8ca0b75d05 Tables refactored 2012-09-03 21:53:16 +03:00
Dmitriy Zaporozhets
c7cfe3d83b devise session templates to haml. Fix problem with missing message in commit 2012-09-03 08:15:07 +03:00
Dmitriy Zaporozhets
6997543ac2 Merge pull request #1351 from tsigo/nonrelative_resque 
Give Resque route a name and use that for the iframe src
 2012-09-02 11:58:13 -07:00
randx
beb5e1bd6b Sanitize glm helper 2012-09-01 23:35:04 +03:00
Robert Speicher
0de5d08e37 Give Resque route a name and use that for the iframe src 
Closes #1350
 2012-08-31 19:28:32 -04:00
Dmitriy Zaporozhets
ed954ebae2 Merge pull request #1326 from AlexDenisov/issue_status_changed_notifications 
Issue status changed notifications
 2012-08-31 00:51:31 -07:00
randx
65abd8b20a Freeze project path in admin area 2012-08-31 09:05:44 +03:00
randx
5e510ada7a Js validation for title presence in issue, mr, milestone 2012-08-30 22:28:45 +03:00
randx
b9ff0c79b4 Changed filters to readable one. Styled some stuff 2012-08-30 22:15:34 +03:00
randx
4a6596af27 Fixed bunch of js bugs with comments. Also added development tips 2012-08-30 21:31:55 +03:00
randx
92137b7beb Removed class 'small' for some buttons. Fixed issue creation 2012-08-30 20:00:16 +03:00
Dmitriy Zaporozhets
cd3d50caf2 Changed colors for buttons. Imporved preview area. Added clone panel to empty project 2012-08-30 09:27:02 +03:00
Dmitriy Zaporozhets
793db070f0 Restyled projects list on dashboard 2012-08-30 08:13:36 +03:00
randx
51558bd57a Refactoring scss & improving some UI elements 2012-08-29 22:29:50 +03:00
randx
1dd938d20c SCSS refactoring & cleanup. First iteration 2012-08-29 21:23:43 +03:00
Alex Denisov
4d65532158 Issue_status_changed email added 2012-08-29 09:49:39 +03:00
randx
e5adca1b81 Preview as button. Disable note submit unless content 2012-08-29 08:13:38 +03:00
Robert Speicher
8a49cdc3b4 Add milestone API docs to doc/README and views/help/api 
Also removes `closed` attribute option from create action.
 2012-08-29 08:45:00 -04:00
Dmitriy Zaporozhets
1f5e2658f5 Merge pull request #1412 from tsigo/more_coffeescript 
Convert main.js to CoffeeScript
 2012-09-09 06:48:33 -07:00
Robert Speicher
3b89f14090 Convert main.js to coffee 
Remove duplicate 's' hotkey code
 2012-09-09 07:28:41 -04:00
Robert Speicher
1c01536829 Fix spelling of "empty" in disableButtonIfEmptyField function name 2012-09-09 07:28:41 -04:00
Dmitriy Zaporozhets
2e8b5ebefd Merge pull request #1386 from tsigo/github_markup 
Use GitHub::Markup to parse markup files
 2012-09-09 03:34:50 -07:00
Robert Speicher
52c521ffe8 Use GitHub::Markup to parse markup files 
Closes #1382
 2012-09-05 16:52:49 -04:00
randx
b03ee4666b Handle invalid ssh exception 2012-08-29 00:44:26 +03:00
Riyad Preukschas
1f1ce5fbd4 Revamp GFM user docs. 2012-08-27 21:20:26 +02:00
Riyad Preukschas
58a581782b Update forms to show consistent link to GFM. 2012-08-27 20:55:01 +02:00
Dmitriy Zaporozhets
cb6fcb6562 Merge pull request #1301 from Mikulas/help-web-hooks-typo 
fix web hooks help view commit count off by one
 2012-08-27 04:58:32 -07:00
Alex Denisov
aaeb37419a Send notifiation on create UserProject relation (access granted) 2012-08-27 00:13:03 +03:00
randx
2c32574ac3 Project git clone panel 2012-08-25 23:39:01 +03:00
Dmitriy Zaporozhets
efde86537a Merge pull request #1110 from gliptak/patch-1 
Display configured git repository location on error page
 2012-08-25 13:04:41 -07:00
Mikuláš Dítě
e0cd807020 fix web hooks help view commit count off by one 2012-08-25 20:48:30 +02:00
randx
6ff0652e9e Admin area -> user form 2012-08-25 20:31:19 +03:00
randx
fee26c58e2 Move snippets api doc to separate file 2012-08-25 19:21:11 +03:00
Florian Unglaub
48443d20ca Merge branch 'master' of git://github.com/gitlabhq/gitlabhq 2012-08-24 15:25:52 +02:00
Joe Hillenbrand
0dbde913dc Hide gravatar tip if gravatar is disabled. 2012-08-24 16:04:07 -07:00
randx
3dd7703b80 Feature: Labels page. Index page 2012-08-24 13:05:40 +03:00
Cyril
e2f19befbc fix inline forms 2012-08-23 23:04:43 +02:00
Dmitriy Zaporozhets
0e5dbd1caf Merge pull request #1231 from NARKOZ/preview_notes 
Preview window is not closed after post
 2012-08-23 06:56:55 -07:00
Dmitriy Zaporozhets
aa50408ecb 1. Better message if no ssh key 
2. SSH Keys Help page
 2012-08-22 03:56:53 +03:00
randx
f088eaa972 Refactoring & minor css changes 2012-08-21 21:26:56 +03:00
randx
c625293b99 Handle post-receive files via gitolite, not gitlab 2012-08-21 20:14:06 +03:00
Dmitriy Zaporozhets
2e7ca8c866 Show only tm events related to this project 2012-08-21 08:20:11 +03:00
randx
b2b88b2ff2 Added font for head panel. Major restyle for header 2012-08-20 22:51:37 +03:00
randx
8eaead6a01 Text message for mergeing MR 2012-08-19 00:45:46 +03:00
randx
3f9749dd86 Fix branch selector. Few css fixed also 2012-08-18 23:53:58 +03:00
Florian Unglaub
a64aff2f1c Omniauth Support 2012-08-17 15:20:55 +02:00
Dmitriy Zaporozhets
93401ef988 Few css improvements 2012-08-17 09:26:59 +03:00
Dmitriy Zaporozhets
4ce034ca65 Merge pull request #1247 from tsigo/feature/no_milestone_filter 
Allow filtering issues that have no milestone or assignee
 2012-08-16 22:33:56 -07:00
Robert Speicher
feee3838e1 Combine unassigned_issue and unassigned_milestone into unassigned_filter 2012-08-16 18:13:22 -04:00
Robert Speicher
66399d558d Merge branch 'master' into hooray_apostrophes 2012-08-16 14:03:06 -04:00
Dmitriy Zaporozhets
05da3801f5 Restyled erros pages & avatar class 2012-08-16 09:13:50 +03:00
Martin Bastien
6641761e5c Fix current class for hooks tab in admin section 
Signed-off-by: Martin Bastien <martin.bastien@studiofrenetic.com>
 2012-08-15 00:03:13 -04:00
Robert Speicher
70174a1e1a More minor translation/grammar fixes on error pages 2012-08-14 17:26:38 -04:00
Nihad Abbasov
0b7e67ad12 fix note preview link, and hide preview and errors after posting a comment 2012-08-14 01:24:27 -07:00
Robert Speicher
6af38f5145 "Cant" -> "Can't" 2012-08-13 21:02:40 -04:00
Robert Speicher
5a90d044f7 Allow filtering by issues with no assigned... assignee 
Continues #1222
 2012-08-13 20:49:18 -04:00
Dmitriy Zaporozhets
6ebd360cf2 Modern theme restyled. Better Profile -> Ui page 2012-08-13 08:52:10 +03:00
Robert Speicher
b1ea0b3c01 Allow filtering by issues with no assigned milestone 
Closes #1222
 2012-08-13 01:38:00 -04:00
randx
bd0c971aa9 Merge branch 'fix_commits_dashboard' of https://github.com/jouve/gitlabhq into jouve-fix_commits_dashboard 
Conflicts:
	app/views/events/_commit.html.haml
 2012-08-12 00:33:32 +03:00
Robert Speicher
7754189187 Fully embrace Ruby 1.9 hash syntax 
Didn't bother with files in db/, config/, or features/
 2012-08-10 18:25:15 -04:00
Cyril
15fc0f0c10 fix commit events on dashboard 2012-08-10 21:23:54 +02:00
Dmitriy Zaporozhets
5fd0e7ba11 Merge pull request #1198 from NARKOZ/preview_notes 
ability to preview notes
 2012-08-10 06:42:31 -07:00
Nihad Abbasov
9639780359 render notes preview on server-side 2012-08-09 23:47:48 -07:00
randx
f197fa1fbf Fix github issue #1153 2012-08-08 17:08:43 +03:00
Dmitriy Zaporozhets
839757598b Wiki pages page 2012-08-09 07:34:29 +03:00
Dmitriy Zaporozhets
8ffb6126a9 slim comment form 2012-08-09 06:36:55 +03:00
Nihad Abbasov
1ec3bd3f8d ability to preview notes 2012-08-08 01:12:05 -07:00
randx
6171a4d8eb Fixed dashboard broken messages cause of glm 2012-08-03 03:28:02 +03:00
randx
34ba4e1352 Gitlab Markdown help page 2012-08-03 00:20:09 +03:00
Riyad Preukschas
5443021a0e Update notifications mails and notify specs for GFM 2012-08-06 05:08:22 +02:00
Riyad Preukschas
9a0b763eec Fix missing @project errors 2012-08-06 03:16:06 +02:00
Riyad Preukschas
8e6a7a172e Merge branch 'master' into gitlab-flavored-markdown 2012-08-06 01:48:20 +02:00
Valeriy Sizov
3079687b93 Merge pull request #1179 from robbytaylor/master 
Grammar fix after creating a project
 2012-08-02 09:27:10 -07:00
Riyad Preukschas
eb06dd79f8 Update views for GFM 2012-08-02 02:54:57 +02:00
Rob Taylor
516a76c9a9 Fixed grammar in 'please wait' message after creating project 2012-08-01 11:19:20 +01:00
randx
e8261313a7 Fixed firefox css bug with issues table 2012-07-28 05:43:34 +03:00
randx
00b280c3f9 Feature: Bulk Issues update 2012-07-28 03:35:43 +03:00
randx
69e41250d1 Styled New/Edit Project for admin area 2012-07-28 00:42:44 +03:00
randx
c2817e6f3a Team Member Profile: Remove button rebased 2012-07-29 01:40:21 +03:00
randx
4c1267e09f CSS refactoring. Notes better styled 2012-07-29 01:34:51 +03:00
Dmitriy Zaporozhets
354d243878 Merge pull request #983 from JamesEarlDouglas/notify-grammar 
cleanup the wording of the notification footer
 2012-07-28 07:38:17 -07:00
randx
bc7897180d Better visibility of event commit links & commits ids 2012-07-28 00:27:54 +03:00
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
Dmitriy Zaporozhets
375ebcabfd improved activity ui 2012-03-01 20:47:57 +02:00
Dmitriy Zaporozhets
c94159ab08 improved dashboard 2012-03-01 20:40:32 +02:00
Dmitriy Zaporozhets
1924de91c5 fixed compare for push 2012-02-29 23:34:06 +02:00
Dmitriy Zaporozhets
bb164ebf1b Send author to post hook. Display push activity to dashboard 2012-02-29 22:38:24 +02:00
Dmitriy Zaporozhets
93a5b3d811 Merge pull request #485 from deanperry/master 
Fixed spelling mistake - 'yo tour' to 'to your'
 2012-02-28 13:12:08 -08:00
Dmitriy Zaporozhets
a1385d11ac hide admin link for users 2012-02-28 23:08:11 +02:00
Dmitriy Zaporozhets
5c2e89b279 reduced number of recent projects for dashboard to 5 2012-02-28 23:01:50 +02:00
Dmitriy Zaporozhets
376bec26de Added dashboard page. Projects page not root from now 2012-02-28 22:59:36 +02:00
Dean Perry
b9e23b906e fixed spelling mistake - 'Ream more' to 'read more' 2012-02-28 19:35:35 +00:00
Dean Perry
c9c292f350 fixed spelling mistake - 'yo tour' to 'to your' 2012-02-28 19:31:27 +00:00
Dmitriy Zaporozhets
34e1580184 Improved file browse page, prepared for downloads tab 2012-02-28 00:00:19 +02:00
Dmitriy Zaporozhets
bcf03b5de6 tree css fixes 2012-02-27 20:51:12 +02:00
Dmitriy Zaporozhets
1e689bfba3 fixed notes logic 2012-02-27 19:05:27 +02:00
Dmitriy Zaporozhets
3a4b4fb4cd Moving ui styles to one scss file, Added ui class to body 2012-02-27 00:21:53 +02:00
Dmitriy Zaporozhets
065c200c33 removed unnecessary hr tags & titles 2012-02-26 22:06:40 +02:00
Dmitriy Zaporozhets
1e8b111be8 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2012-02-26 21:39:13 +02:00
Dmitriy Zaporozhets
f403da73f5 Fixed ajax loading image. Fixed wrong wording 2012-02-26 21:38:45 +02:00
Dmitriy Zaporozhets
e6ea73c776 Merge pull request #468 from bencevans/patch-1 
Title for a link fixed
 2012-02-25 13:12:49 -08:00
bgondy
0347fe2412 Update app/views/projects/team.html.haml 2012-02-25 16:41:58 +01:00
Ben Evans
2b5c61bdec Title for a link fixed 2012-02-25 11:03:44 +00:00
Dmitriy Zaporozhets
21c141afb1 Merge branch 'notes_refactoring' 2012-02-24 22:39:51 +02:00
Dmitriy Zaporozhets
292a41cbe2 Fixed comments for snippets. Tests fixed 2012-02-24 22:36:44 +02:00
Dmitriy Zaporozhets
d41d8ffb02 Reply button, Comments for Merge Request diff 2012-02-24 22:19:47 +02:00
Christos Trochalakis
e42fb4fda4 Fix broken commit link in branches page 2012-02-24 17:27:44 +02:00
Dmitriy Zaporozhets
215a01f63c move notes login to one controller 2012-02-24 09:16:06 +02:00
Dmitriy Zaporozhets
7d279f9302 better error handling for not found resource, gitolite error 2012-02-22 07:14:54 +02:00
Dmitriy Zaporozhets
8c40aab120 Abilities extended. Resources security improved 2012-02-22 00:31:18 +02:00
Dmitriy Zaporozhets
af82b6773b btn padded class 2012-02-21 23:09:46 +02:00
Dmitriy Zaporozhets
fb17234b05 separated buttons for sidebar 2012-02-21 22:51:18 +02:00
Dmitriy Zaporozhets
9803e0885e Project sidebar improved 2012-02-21 22:46:34 +02:00
Dmitriy Zaporozhets
1c22d4f50f Help message for wiki, styled projects page 2012-02-21 22:04:01 +02:00
Dmitriy Zaporozhets
ce8eba8913 Merge branch 'wiki' 
Conflicts:
	app/views/layouts/_project_menu.html.haml
 2012-02-21 20:32:43 +02:00
Dmitriy Zaporozhets
5c492a7089 make issue, commit row title color lighter 2012-02-20 21:50:11 +02:00
Dmitriy Zaporozhets
29c41e9a0e pollishing UI 2012-02-20 21:38:59 +02:00
Dmitriy Zaporozhets
6a445b4200 fixed forgot password form 2012-02-20 20:37:37 +02:00
vsizov
bdc42488e9 wiki is done 2012-02-20 20:16:55 +03:00
Dmitriy Zaporozhets
5f4a7c3e04 Home tab added, Repository tab removed\n Ability to download branch 2012-02-20 08:38:03 +02:00
Valery Sizov
2e1f119f22 wiki: markdown support 2012-02-19 22:19:31 +02:00
Valery Sizov
d68f8401b3 wiki: improve history 2012-02-19 21:56:18 +02:00
Valery Sizov
85974948e7 Wiki: history 2012-02-19 21:52:05 +02:00
Dmitriy Zaporozhets
313d96e42b fixed mr counter for main menu 2012-02-19 21:34:59 +02:00
Dmitriy Zaporozhets
635d3e09b7 Issues, Merge Requests counters 2012-02-19 21:30:31 +02:00
Valery Sizov
b565cd1972 Wiki: fixed main menu 2012-02-19 21:16:29 +02:00
Valery Sizov
40ce6c9131 Wiki: remove notice line 2012-02-19 19:55:37 +02:00
Valery Sizov
57271da612 Wiki: design fixed 2012-02-19 19:50:13 +02:00
Valery Sizov
4c1b8558df Wiki: base implemetation logic 2012-02-19 19:50:13 +02:00
Valery Sizov
eacea15a21 wiki base sceleton 2012-02-19 19:50:13 +02:00
Dmitriy Zaporozhets
2e83de1924 fixed layout for ipad 2012-02-19 16:31:11 +02:00
Dmitriy Zaporozhets
3f91da6816 Fixed widget counts, improved styles 2012-02-18 15:59:01 +02:00
Dmitriy Zaporozhets
fa7bd43ab9 How to merge instructions 2012-02-18 14:43:35 +02:00
Dmitriy Zaporozhets
94db8a1c33 Usability & design improvements 2012-02-18 14:12:48 +02:00
Dmitriy Zaporozhets
9a24ccdea1 Fixed mistype in permissions, Fixed migration 2012-02-16 09:04:56 +02:00
Dmitriy Zaporozhets
1c62ec09b0 4 roles permission system 2012-02-16 09:03:55 +02:00
Dmitriy Zaporozhets
dac7c44ab3 Updated readme, Roles in progress 2012-02-15 23:51:04 +02:00
Dmitriy Zaporozhets
37224dc9c1 ProtectedBranches model, Master permission for repo\n Allow push to protected branch for masters only 2012-02-15 22:02:33 +02:00
Dmitriy Zaporozhets
8d493019c4 Show commits for merge request immediatly 2012-02-15 01:15:02 +02:00
Dmitriy Zaporozhets
ef396d08fc Fixed encoding issue for diff. Reordered merge request commits 2012-02-15 00:41:51 +02:00
Valery Sizov
65e4ad3147 fixed design new issue form 2012-02-15 00:33:54 +02:00
Dmitriy Zaporozhets
3230577ce0 Merge branch 'master' of dev.gitlabhq.com:gitlabhq 2012-02-15 00:21:07 +02:00
Dmitriy Zaporozhets
4aa2b34e79 Commit show should display author & commiter info 2012-02-15 00:21:00 +02:00
Valery Sizov
7b3b140004 fixed design login form 2012-02-15 00:15:15 +02:00
Dmitriy Zaporozhets
b84b485bbe better commits list style 2012-02-15 00:10:01 +02:00
Dmitriy Zaporozhets
ccfeddec46 Ignore invalid submodule entries 2012-02-14 23:53:41 +02:00
Dmitriy Zaporozhets
a7bcc2eb5c submodules displayed for tree view 2012-02-14 23:48:42 +02:00
Dmitriy Zaporozhets
c062e56b4c Fixed commit diff: content of removed files displayed 2012-02-14 20:00:25 +02:00
Dmitriy Zaporozhets
ae416a76ff per line comments improved. replaced from dbclick to link 2012-02-14 00:20:23 +02:00
root
3f4eb731df Fixed a typo by the third n in 'commit'. 2012-02-13 20:41:16 +02:00
Dmitriy Zaporozhets
41d439401d enable markdown for email notification 2012-02-13 20:40:39 +02:00
Dmitriy Zaporozhets
7fd29a78fa Commits page styled better now 2012-02-13 00:12:18 +02:00
Dmitriy Zaporozhets
ece9f50fb1 fixed unworking infinite scroll 2012-02-12 23:52:27 +02:00
Dmitriy Zaporozhets
48bc4fc214 fixed flash message. better tree css 2012-02-12 19:47:37 +02:00
Dmitriy Zaporozhets
0cd873c2d3 fixed layout for ipad. changed main width 2012-02-12 17:48:17 +02:00
Dmitriy Zaporozhets
ec01fa29fb styled top panel 2012-02-12 13:15:41 +02:00
Dmitriy Zaporozhets
c844723a24 restyled main menu. move from left to top orientation 2012-02-12 02:38:38 +02:00
Dmitriy Zaporozhets
9511ec846d improved diff, restyled login page 2012-02-12 00:29:16 +02:00
Dmitriy Zaporozhets
cc1ba255d6 Lists restyled, blue link colors added 2012-02-11 23:22:33 +02:00
Dmitriy Zaporozhets
bc3735004c Moving to rails 3.2 2012-02-11 20:34:25 +02:00
Dmitriy Zaporozhets
cc043f32d8 Admin area improved 2012-02-11 19:56:18 +02:00
Dmitriy Zaporozhets
a769204ff4 Improved commit author notification 2012-02-10 10:59:39 +08:00
Dmitriy Zaporozhets
c1fe37690a logo updated 2012-02-10 00:07:49 +02:00
Dmitriy Zaporozhets
cd567ee40b Titled dashboard, admin, profile areas. Wider top panel. Restored search input 2012-02-09 09:59:14 +02:00
Dmitriy Zaporozhets
fbd5296e32 layout refactored 2012-02-09 09:59:04 +02:00
Dmitriy Zaporozhets
fcd92f9d95 Browse button in commit list 2012-02-09 09:51:50 +02:00
Dmitriy Zaporozhets
f86df73c1a removed dots from menu, renamed Code to Files 2012-02-08 19:18:38 +02:00
Dmitriy Zaporozhets
4d89322d67 Snippets - fixed after bootstrap 
Project - restyled show page, removed info page
Repository - restyled show page, added download option
Tags - added download options
 2012-02-08 01:00:49 +02:00
Dmitriy Zaporozhets
422e43989b Compare view for commits 2012-02-06 22:32:04 +02:00
Dmitriy Zaporozhets
6c416aaac8 Issues, MR, Wall can be enabled/disabled per project 2012-02-06 19:40:32 +02:00
Dmitriy Zaporozhets
5134aa971c fixed ability to edit team member access 2012-02-06 01:56:26 +02:00
Dmitriy Zaporozhets
e64a174968 project membership widget. css fixes 2012-02-05 21:26:04 +02:00
Dmitriy Zaporozhets
419368f4f4 fix empty page after broken pull request 2012-02-05 19:01:13 +02:00
Dmitriy Zaporozhets
cddf61ef3b Merge pull request #363 from druidvav/master 
Lexer корёжит имена пользователей на русском языке
 2012-02-05 08:30:12 -08:00
Dmitriy Zaporozhets
2efc1068f0 css fixes for .entry class 2012-02-05 13:51:51 +02:00
Dmitriy Zaporozhets
c90f1d5c8b fixed issue, mr crash if assignee/author removed from team 2012-02-05 12:58:02 +02:00
Dmitriy Zaporozhets
5a12bee37d fix 500 on project page after someone leave note on wall 2012-02-05 12:26:27 +02:00
druidvav
03bf55846b Fix for utf-8 names in empty project page. 2012-02-01 14:42:42 +04:00
Dmitriy Zaporozhets
8ebfae9a07 Merge branch 'bootstrap' 
Conflicts:
	Gemfile
	app/views/commits/_commits.html.haml
	app/views/projects/empty.html.haml
 2012-01-30 00:45:35 +02:00
Dmitriy Zaporozhets
b51252e6ca Bootstrap: test fixes 2012-01-30 00:43:14 +02:00
Dmitriy Zaporozhets
fca1ffb888 Bootstrap: Issues, Merge Requests, SSH Key completed 2012-01-29 23:59:12 +02:00
Dmitriy Zaporozhets
20721eff1c Bootstrap: Commits page 2012-01-29 21:58:31 +02:00
Dmitriy Zaporozhets
ae5faf0fd3 Ajax branch/tag switch for tree view 2012-01-29 21:30:03 +02:00
Dmitriy Zaporozhets
a77c8bf9c3 Bootstrap: Issues & MR 2012-01-29 12:04:09 +02:00
Dmitriy Zaporozhets
d81f0b7845 Bootstrap: Merge Request -> Show 2012-01-28 17:21:00 +02:00
Dmitriy Zaporozhets
0a4222fb98 Bootstrap: Activities 2012-01-28 16:47:55 +02:00
vsizov
6572d96bb5 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2012-01-28 16:42:14 +03:00
vsizov
d6a0b8f428 LDAP done 2012-01-28 16:23:17 +03:00
Dmitriy Zaporozhets
15b06b0164 Bootstrap: Deploy keys, Hooks 2012-01-28 12:40:17 +02:00
Valery Sizov
c083df0570 LDAP BASE IMPLEMENRTATION 2012-01-28 13:11:21 +03:00
Dmitriy Zaporozhets
089dca4d6c Bootstrap: network graph 2012-01-28 12:02:03 +02:00
Dmitriy Zaporozhets
c7933d7a78 Bootstrap: team 2012-01-28 11:54:11 +02:00
Dmitriy Zaporozhets
1afd93ee1a Bootstrap: cleaning commits css 2012-01-28 02:08:26 +02:00
Dmitriy Zaporozhets
29b5aa2c76 Bootstrap: Issues restyled 2012-01-28 01:49:14 +02:00
Dmitriy Zaporozhets
7f6e41fa02 Bootstrap: application layout 2012-01-28 00:51:02 +02:00
Dmitriy Zaporozhets
7d750cbf79 Merge pull request #283 from veprbl/master 
Display both author and committer in commits list
 2012-01-27 11:15:24 -08:00
Dmitriy Zaporozhets
05d76fc4d0 Bootstrap: login screen 2012-01-27 19:58:10 +02:00
Dmitriy Zaporozhets
4d9c3f3123 Bootstrap: btn replacing 2012-01-27 09:19:55 +02:00
Dmitriy Zaporozhets
fbdb1da2ab Bootstrap: issues, notes css 2012-01-27 08:57:55 +02:00
Dmitriy Zaporozhets
d4ad362387 Bootstrap: commits page + tree 2012-01-27 01:46:32 +02:00
Dmitriy Zaporozhets
bef29f0797 project, commits page with bootstrap 2012-01-27 00:13:19 +02:00
tomneedham
807721df73 fixed no ssh key message 2012-01-26 19:02:59 +00:00
Dmitriy Zaporozhets
fed0da8076 Cleaning css. layout is broken 2012-01-26 19:25:35 +02:00
Dmitriy Zaporozhets
15b1b51524 css refactoring & utf8 meta tag 2012-01-26 09:50:11 +02:00
Dmitriy Zaporozhets
b4cc04d7e1 Commit diff fixes, per-line comments fixed 2012-01-25 21:10:09 +02:00
Dmitriy Zaporozhets
16a98387c2 merge reques diff: files list displayed 2012-01-23 21:08:12 +02:00
Dmitriy Zaporozhets
7157305d5e cleaning dashboard & tags 2012-01-23 09:54:47 +02:00
Dmitriy Zaporozhets
611c5a87ab Version up to 2.1. Help page filled with simple workflow 2012-01-22 14:25:43 +02:00
Dmitriy Zaporozhets
3b91a103e0 keep current branch when switch from tree to commits 2012-01-22 13:21:59 +02:00
Dmitriy Zaporozhets
2cd5aa694d fixed ... in diff file first line 2012-01-22 13:13:15 +02:00
Dmitriy Zaporozhets
3c2b3f3f56 Keep branch/tag when navigate from commits to tree 2012-01-21 23:57:47 +02:00
Dmitriy Zaporozhets
e48a0b8eab usability improvements 2012-01-21 23:17:29 +02:00
Dmitriy Zaporozhets
c5a48a6a90 add users to project from admin area easily 2012-01-21 19:03:47 +02:00
Dmitriy Zaporozhets
fa8c0c7813 Admin area: add multiple users to project 2012-01-21 18:06:14 +02:00
Dmitriy Zaporozhets
f6f72d4b22 per line comment improved 2012-01-21 15:22:42 +02:00
Dmitriy Zaporozhets
3d7b35a37d per line comment fix 2012-01-20 09:51:48 +02:00
Dmitriy Zaporozhets
fde29a82e6 fixed merge request add new link 2012-01-20 09:48:48 +02:00
Dmitriy Zaporozhets
0aa0cb7903 lil css fixed 2012-01-19 22:18:30 +02:00
Dmitriy Zaporozhets
5e3b7314bd gitlab logo added to top panel 2012-01-19 21:00:50 +02:00
Dmitriy Zaporozhets
00d7bfda95 projects link added. security specs added 2012-01-19 09:27:23 +02:00
Dmitriy Zaporozhets
15c4655527 UI: add new button, top panel restyle etc 2012-01-18 22:15:45 +02:00
Dmitriy Zaporozhets
ccfae82723 project alert/error messages 2012-01-18 01:19:57 +02:00
Dmitriy Zaporozhets
c9ea5f1316 deploy key creation restyled 2012-01-18 00:46:13 +02:00
Dmitriy Zaporozhets
809413d9e7 minimalistic UI: issues index, css refactoring 2012-01-18 00:04:27 +02:00
Dmitriy Zaporozhets
0ad83a2172 css refactoring 2012-01-16 21:07:57 +02:00
Dmitriy Zaporozhets
8cc25ef94e cleaning UI 2012-01-15 22:36:32 +02:00
Dmitriy Zaporozhets
87f07f68bb new layout 2012-01-15 19:42:20 +02:00
Dmitriy Zaporozhets
bed882e647 layout fixes 2012-01-15 12:27:55 +02:00
Dmitriy Zaporozhets
60af43b981 restored search input & project link added 2012-01-15 12:03:29 +02:00
Dmitriy Zaporozhets
d95cfc6144 started cleaning UI 2012-01-14 23:46:06 +02:00
Dmitriy Zaporozhets
1ee69714df cleaning dashboard files 2012-01-14 21:44:08 +02:00
Dmitriy Zaporozhets
cbd78922ee Merge branch 'deploy_keys' 
Conflicts:
	app/views/layouts/project.html.haml
	db/schema.rb
 2012-01-14 21:26:35 +02:00
Dmitriy Zaporozhets
09b877ef29 remove modal window from team member managment 2012-01-14 19:54:41 +02:00
Dmitriy Zaporozhets
693ff1c644 dashboard restyled. colors improved 2012-01-13 23:13:44 +02:00
Dmitriy Zaporozhets
0ba081947d prototype styled. home button added 2012-01-12 09:28:57 +02:00
Dmitriy Zaporozhets
84d1dead66 new layout style 2012-01-12 09:04:57 +02:00
Dmitry Kalinkin
eb2a25f733 Added both committer and author display for commits list 2012-01-12 03:14:53 +04:00
Dmitriy Zaporozhets
6cf000ff52 Merge branch 'per_line_comment' 
Conflicts:
	app/assets/stylesheets/projects.css.scss
 2012-01-12 00:42:17 +02:00
Dmitriy Zaporozhets
99bb4a153d per line comments w/o tests & with dirty code 2012-01-12 00:26:01 +02:00
Dmitriy Zaporozhets
c8b955a44b lil restyle 2012-01-11 16:37:34 +02:00
Dmitriy Zaporozhets
9da4d06a87 per line comments display 2012-01-10 22:08:46 +02:00
Dmitriy Zaporozhets
c66bc99fb7 repo feed to partial 2012-01-10 20:06:41 +02:00
Dmitriy Zaporozhets
3c9d7b7077 Procfile production, resque script 2012-01-09 13:30:19 +02:00
Dmitriy Zaporozhets
7b0cd969e0 Merge branch 'web_hooks_scaffold' 2012-01-08 13:20:56 +02:00
Dmitriy Zaporozhets
473445c76f complete hooks for post receive 2012-01-08 13:20:20 +02:00
Dmitriy Zaporozhets
57ac5fe99f Procfile added. use foreman start to run gitlabhq 2012-01-08 12:20:24 +02:00
Valery Sizov
97e74c5bde Auto-populate the path and code on the name input's onchange event to the sluggified version of name 2012-01-07 12:53:01 +02:00
Dmitriy Zaporozhets
97ba731574 Project activities restyled 2012-01-04 22:19:41 +02:00
Dmitriy Zaporozhets
05993f90e0 removed tags from repo activities 2012-01-04 08:19:41 +02:00
Dmitriy Zaporozhets
0ebc610e49 Project activities perfomance increased. Cache for project activitites disabled. Repository conception changed 2012-01-04 08:17:41 +02:00
Dmitriy Zaporozhets
2d3b6375f3 hooks scaffold 2012-01-04 02:07:56 +02:00
Dmitriy Zaporozhets
2dae0e18e0 web hooks scaffold started 2012-01-04 00:42:14 +02:00
miks
99b8b577e9 DeployKey moved to Key model 2011-12-31 16:24:10 +02:00
Dmitriy Zaporozhets
2c1b06a10f Merge branch 'feature/repository_tab' 2011-12-31 13:13:23 +02:00
Dmitriy Zaporozhets
a667c71312 repo branches and tags 2011-12-31 13:12:10 +02:00
Dmitriy Zaporozhets
d8247012b5 repositories tab specs 2011-12-31 12:52:01 +02:00
Dmitriy Zaporozhets
d34904b86c Merge branch 'grit_ext' 2011-12-30 23:20:16 +02:00
Dmitriy Zaporozhets
0ae9ac155c repo tab added. activities page for repo 2011-12-30 22:56:13 +02:00
Dmitriy Zaporozhets
61a2ce4110 code cleanin 2011-12-30 21:56:34 +02:00
Saito
14023c4e5a remove charencode. 2011-12-30 21:41:39 +08:00
Dmitriy Zaporozhets
0f627a65f4 Project tab r1 is finished 2011-12-30 08:54:42 +02:00
miks
f7b911d239 Path correction 2011-12-29 23:31:27 +02:00
miks
f8ad4d2b42 Merge branch 'master' into deploy_keys 
Conflicts:
	app/models/project.rb
 2011-12-29 21:46:21 +02:00
miks
723104c45f Initial deploy_key feature commit 2011-12-29 21:44:16 +02:00
Dmitriy Zaporozhets
c1c903fb95 Project tab added. activities, team, snippets moved to project tab 2011-12-28 09:38:50 +02:00
Dmitriy Zaporozhets
6e5caa1985 favicon updated 2011-12-28 09:18:50 +02:00
Valery Sizov
de83c91c2f small redesign of controls of notes 2011-12-28 01:29:53 +02:00
Valeriy Sizov
5d6e79f4b9 Merge pull request #237 from CedricGatay/feature/expand_issues_ref_in_commit 
Autolinks to issues in commit message (see #155)
 2011-12-27 14:49:38 -08:00
Valeriy Sizov
47d5d5f5db Merge pull request #203 from mlitwiniuk/top_nav_fix 
Hide admin menu for non-admins
 2011-12-27 14:33:38 -08:00
Cedric Gatay
89a03a3453 1/ rspec'ed 
2/ @commit.safe_message as an argument
3/ preserve in helper
4/ spaces around operators
 2011-12-27 00:37:27 +01:00
Cedric Gatay
5d9f2e7d15 Follow up of my pull request, damn last time refactor ! 2011-12-26 21:44:04 +01:00
Cedric Gatay
443e21ed92 Autolinks to issues in commit message (see #155) 
It matches #[0-9]+ in commit messages.
For example
 * Fix for #12
 * Code review for #56
 * Test for #15, Review on #54, Fix for #42

 It only links to valid issues (existing and belonging to the current project)
 It does not add any link to the commit in the issue page, it only consists in parsing the commit message when displayed.

 This can be considere as a primary work for the issue #155 on gitlabhq/gitlabhq.
 2011-12-26 21:36:20 +01:00
Dmitriy Zaporozhets
53ce00f74a Merge pull request #231 from CedricGatay/feature/commit_author_mail_for_note 
Alert only commit author on note
 2011-12-25 03:41:47 -08:00
Dmitriy Zaporozhets
bac0fa2c28 Merge pull request #215 from mutewinter/missing_favicon_link 
Added missing link to favicon
 2011-12-25 03:27:51 -08:00
Cedric Gatay
c0b47d3245 Alert commit author on note 
Allows to alert only the commit author when a new note is added on a commit, useful when gitlabhq is used for code
reviews, allows less noise with mails...
 2011-12-24 17:28:20 +01:00
Gamaliel A. Toro Herrera
56243c0a63 Solved issue #188 2011-12-22 14:09:41 +01:00
Dmitriy Zaporozhets
f9758c726f fixed activities date output for projects page 2011-12-21 09:48:23 +02:00
Dmitriy Zaporozhets
9a2a861276 Design tab for profile. Colorscheme as db value 2011-12-20 22:47:09 +02:00
Dmitriy Zaporozhets
3d4f524dcb play with tree view 2011-12-20 08:59:14 +02:00
Dmitriy Zaporozhets
6bdcaccb46 Revert "Handle back & forward events" 
This reverts commit f80745b7db.
 2011-12-20 08:49:14 +02:00
Dmitriy Zaporozhets
f80745b7db Handle back & forward events 2011-12-20 08:39:14 +02:00
Dmitriy Zaporozhets
321dbb7bac removed project filter 2011-12-20 08:29:14 +02:00
Dmitriy Zaporozhets
cff9519127 Dashboard perfomance improved. Filter for projects page 2011-12-20 08:24:14 +02:00
Dmitriy Zaporozhets
a2d3b21189 User profile restyle. Feed(Atom) links for commits & issues 2011-12-19 23:32:59 +02:00
Dmitriy Zaporozhets
54fb0f8589 Merge branch 'notification_refactoring' 2011-12-19 15:17:11 +02:00
Valery Sizov
f09e15992f fix show token in profile 2011-12-18 18:09:59 +02:00
Valery Sizov
6a0defc3ca notification for note for merge request 2011-12-18 16:29:58 +02:00
Valery Sizov
32aa2e3f24 notification when assignee issue changed 2011-12-18 16:07:47 +02:00
Valery Sizov
df5b192e4d notification when merge request reassigned 2011-12-18 15:46:06 +02:00
Valery Sizov
db582b6383 Notification when created merge request 2011-12-17 18:07:28 +02:00
Dmitriy Zaporozhets
6db121cbdb rename back button 2011-12-17 11:18:27 +02:00
Jeremy Mack
ad0e02c9de Added missing link to favicon 2011-12-16 13:12:20 -05:00
Dmitriy Zaporozhets
fa3cb28cbe team member show page restyle 2011-12-16 00:41:46 +02:00
Dmitriy Zaporozhets
f94d51d765 moved project remove button to edit section 2011-12-15 21:42:33 +02:00
Maciej Litwiniuk
36b7b5f299 hide admin menu for non-admins 2011-12-15 12:18:33 +01:00
Dmitriy Zaporozhets
42c46f3720 Dashboard tabs restyle, messages if no issue or merge request 2011-12-15 09:22:24 +02:00
Dmitriy Zaporozhets
ed3f3a0d4d Download link for binary 2011-12-15 08:42:24 +02:00
Dmitriy Zaporozhets
0712e78597 Snippet restyle 2011-12-15 08:12:24 +02:00
Dmitriy Zaporozhets
ca4e2ad135 Merge pull request #197 from artiom/187-dashboard-merge-request-indication 
Merge requests in dashboard state indication
 2011-12-14 10:53:50 -08:00
Dmitriy Zaporozhets
e213f94985 Merge pull request #199 from jalada/master 
Image is broken on dashboard if deployed to a subdomain
 2011-12-14 10:53:31 -08:00
David Somers
edece21e22 Use #image_tag for dashboard tabs throbber. 2011-12-14 15:24:39 +00:00
Dmitriy Zaporozhets
ff1cbbc532 Issue restyle 2011-12-14 08:58:35 +02:00
Dmitriy Zaporozhets
87d9e0d88c Issue show page restyled 2011-12-13 23:59:35 +02:00
Dmitriy Zaporozhets
6f32ccf432 merge_requests restyle with forms 2011-12-13 23:56:04 +02:00
Dmitriy Zaporozhets
3a50b6cac9 merge request show page refactored 2011-12-13 23:56:04 +02:00
Dmitriy Zaporozhets
e4bd6442a9 merge request js/css rewrite 2011-12-13 23:56:04 +02:00
Artiom Lunev
8187119eb0 add to merge requests in dashboard indication if closed or not fixes #187 2011-12-13 23:40:29 +02:00
Saito
713802fdf3 add plain text support,keep markdown and plain text in readme 2011-12-13 19:25:58 +08:00
Dmitriy Zaporozhets
3dc94ba8eb ajax-loader for dashboard 2011-12-13 00:08:15 +02:00
Dmitriy Zaporozhets
02e827283d increased breadcrumbs with & commit messages 2011-12-12 22:12:37 +02:00
Dmitriy Zaporozhets
faf7c79eb2 lil js refactoring 2011-12-12 20:08:04 +02:00
Dmitriy Zaporozhets
4df4b38185 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2011-12-12 19:23:01 +02:00
Dmitriy Zaporozhets
5bc97fbd3f middle panel 2011-12-12 19:22:01 +02:00
Saito
7b7549bea6 tree view readme support 2011-12-13 00:42:07 +08:00
Dmitriy Zaporozhets
f34b1be281 dashboard tabs 2011-12-12 09:38:37 +02:00
Dmitriy Zaporozhets
cd779e56e1 dashboard v1 2011-12-08 22:17:53 +02:00
Dmitriy Zaporozhets
4107f2cc2e mixed dashboard - first try 2011-12-08 21:17:53 +02:00
Dmitriy Zaporozhets
8e0126e9ec Merge branch 'issue_dashboard' into improved_dashboard 2011-12-08 15:05:01 +02:00
Ariejan de Vroom
0ffed126e2 fixed tab highlighting for issues 2011-12-08 01:13:11 +01:00
Ariejan de Vroom
e4b1f38c27 Added merge request dashboard, showing all merge requests assigned to 
you across projects.
 2011-12-08 01:07:02 +01:00
Dmitriy Zaporozhets
2677bc3acb network graph header, fixed test 2011-12-08 01:45:36 +02:00
Dmitriy Zaporozhets
23a1ba7362 Fix different styles/button positions 2011-12-08 01:35:57 +02:00
Ariejan de Vroom
f512418b27 Added "Issues" dashboard 
This shows issues assigned to you, across all your projects, in one
place.

References #173
 2011-12-08 00:31:06 +01:00
Dmitriy Zaporozhets
c2789dae34 fix project creation 2011-12-08 00:22:46 +02:00
Dmitriy Zaporozhets
d68ec5e0fb default_branch for project & fixed project destroy 2011-12-07 23:56:57 +02:00
Dmitriy Zaporozhets
1b8f082061 new access rights implemented 2011-12-07 10:04:57 +02:00
Dmitriy Zaporozhets
cb021e5831 repo & project access separated. critical gitolite bugfix 2011-12-07 01:27:07 +02:00
Dmitriy Zaporozhets
1bf775d55d fixed commits links from tree view 2011-12-05 22:20:46 +02:00
Dmitriy Zaporozhets
9e089efe5a gitolite & gitosis support 2011-12-04 01:44:59 +02:00
gitlabhq
6a2c7d80cb fixed image preview 2011-12-01 09:16:53 -05:00
Saito
42ba6d04f8 refactor each_line detect to detect all diff file 2011-12-01 15:59:49 +08:00
Dmitriy Zaporozhets
c2cfc52e44 fix merge request diff 2011-12-01 01:51:16 +02:00
Dmitriy Zaporozhets
570f63daaf line links for commit diff, css fixed for line diff 2011-12-01 01:51:04 +02:00
Dmitriy Zaporozhets
b60b7b2e2b restyle commit show page pt1 2011-12-01 00:24:28 +02:00
Dmitriy Zaporozhets
1ce55d161a new team memeber selectbox replaced 2011-11-30 23:41:00 +02:00
Dmitriy Zaporozhets
6686834c8d fix spelling 2011-11-30 21:24:50 +02:00
Dmitriy Zaporozhets
c34092ebdc fixed commit date 2011-11-30 21:23:17 +02:00
Saito
12c01d7401 fix encode bugs on diff not utf-8 encode's code 2011-11-30 15:05:37 +08:00
Dmitriy Zaporozhets
f114a4f349 css fixes 2011-11-29 20:10:48 +02:00
Dmitriy Zaporozhets
958497fecb fix issue count 2011-11-28 23:34:24 +02:00
Dmitriy Zaporozhets
017dfaee65 Issue sidebar counter should show count of assigned to you 2011-11-28 23:29:46 +02:00
Dmitriy Zaporozhets
bfb0bdbe72 fixed link names 2011-11-28 23:14:43 +02:00
Dmitriy Zaporozhets
22ac0cc7eb Merge branch 'feature/merge_requests' 2011-11-28 22:43:42 +02:00
Dmitriy Zaporozhets
8803fbb593 merge request: notes, diffs, commits 2011-11-28 22:16:57 +02:00
Dmitriy Zaporozhets
6b941cf92c merge request list 2011-11-28 20:30:35 +02:00
Saito
46cbe54189 fix the issue on github #157. 
directly force_encoding is wrong,
must detect the file string's encoding.
then force_encoding the string to it's encoding.
last convert it to utf-8.
 2011-11-28 17:46:41 +08:00
Dmitriy Zaporozhets
6d460aa2d6 merge request entity 2011-11-28 09:39:43 +02:00
Dmitriy Zaporozhets
a031813887 Commit, network graph refactoring 2011-11-27 17:35:49 +02:00
Dmitriy Zaporozhets
32ebd438c2 Issue #263 - dont display ajax loader on commit page if commits < limit 2011-11-27 10:36:28 +02:00
Dmitriy Zaporozhets
3aee553523 colorscheme for code view 2011-11-26 01:42:42 +02:00
Dmitriy Zaporozhets
0accbaae15 snippets restyle 2011-11-26 00:19:14 +02:00
Dmitriy Zaporozhets
a9928eae48 fixed sidebar zero count 2011-11-25 23:44:02 +02:00
Dmitriy Zaporozhets
15fa14f1d6 get rid off modal window for issue create/edit 2011-11-25 23:40:12 +02:00
Dmitriy Zaporozhets
16bd018f08 clickable news feed on dashboard 2011-11-25 22:26:44 +02:00
Dmitriy Zaporozhets
8209a2ff49 cleaning side menu 2011-11-25 21:56:05 +02:00
gitlabhq
a8e4fb6144 Merge branch 'feature/issue_with_branch' 2011-11-25 06:13:15 -05:00
gitlabhq
4aad057f23 issues style fixed 2011-11-25 05:49:28 -05:00
gitlabhq
4e55cc67f5 Issue show page restyled 2011-11-25 05:41:30 -05:00
Martin Knoll
07fefc9206 Fixes issue with logo linking to the server root, instead of the app root. 
If using multiple Rails apps in subfolders, the upper left "GITLAB" button links to '/' and thats kinda wrong.
This fix creates a link to the root_url instead, which works in every case.
 2011-11-25 01:01:58 +01:00
gitlabhq
b7f4f67b9b issue show finished 2011-11-24 11:47:27 -05:00
gitlabhq
2fbf45b2e0 issue message output 2011-11-24 10:15:30 -05:00
gitlabhq
ee2d3de1a6 ability to attach branch to issue 2011-11-24 08:08:20 -05:00
Dmitriy Zaporozhets
7ebba27db2 Merge branch 'master' of dev.gitlabhq.com:gitlabhq 2011-11-22 23:15:09 +02:00
Valery Sizov
a4fbe13fce [#243] – When user adds first key the add a key message should go away 2011-11-22 22:26:07 +02:00
Dmitriy Zaporozhets
b56024100d lil style fixes 2011-11-22 19:57:25 +02:00
Dmitriy Zaporozhets
4451b8df8a 3 events on dashboard, fixed issue gl#250 2011-11-22 19:54:36 +02:00
gitlabhq
3f56202713 dashboard replaced [event] by tag 2011-11-22 08:33:42 -05:00
gitlabhq
78e6dc5fa5 #222 2011-11-22 08:26:53 -05:00
gitlabhq
b5d7fb5eed restyled user profile 2011-11-22 08:14:23 -05:00
gitlabhq
3f0d807955 file name overflow fixed 2011-11-22 07:50:47 -05:00
gitlabhq
a59b709021 file code view restyled 2011-11-22 06:59:20 -05:00
gitlabhq
31e51dd116 button common style + flash messages fix 2011-11-21 02:26:10 -05:00
gitlabhq
46bebac983 commit restyle 2011-11-21 02:16:10 -05:00
Dmitriy Zaporozhets
4bf4efe712 decorators & tree model 2011-11-20 22:32:12 +02:00
Alexander Randa
7c5e83c0c2 changing admin disign for userss update 2011-11-19 00:33:10 +03:00
Alexander Randa
84fc40f198 changing admin disign for projects update 2011-11-19 00:32:26 +03:00
Alexander Randa
22be0785bd changing admin disign for users finish 2011-11-18 23:55:13 +03:00
Alexander Randa
f950d7881c changing admin disign for projects finish 2011-11-18 23:54:56 +03:00
Alexander Randa
0c19b1afd9 disabled empty notice 2011-11-18 22:10:07 +03:00
user
ed63d28e7a Merge branch 'master' of https://github.com/gitlabhq/gitlabhq into admin-panel-disign 2011-11-18 21:31:56 +03:00
Saito
6bd9b90fb6 Merge branch 'master' of dev.gitlabhq.com:gitlabhq 2011-11-18 20:20:24 +08:00
Saito
4281704fb3 fix diff bug with utf-8 2011-11-18 20:16:59 +08:00
Saito
139c4c2f18 fix diff bug 2011-11-18 19:48:23 +08:00
Drew
91d5a906f9 Resolved issue #235 2011-11-18 01:52:13 -05:00
Ricardo Rauch
c0dbebb11d fixing error messages 2011-11-17 16:30:57 -03:00
Alexander Randa
c3eac16fe9 update notice and show-info view 2011-11-17 01:19:00 +03:00
Alexander Randa
4dee4bdb57 change back button position when project creating 2011-11-17 00:22:18 +03:00
Alexander Randa
459c9ba27d bugfix back button on page admin/project/new 2011-11-17 00:13:14 +03:00
gitlabhq
bb35ef2f60 fix branch/tag select 2011-11-16 12:19:18 -05:00
gitlabhq
aa02a3b757 fix projects page 2011-11-16 11:43:16 -05:00
gitlabhq
af08ed6b66 refactoring 2011-11-16 08:38:53 +03:00
Nihad Abbasov
ed5e19a518 allow user to reset his private token 2011-11-15 17:08:20 +04:00