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
17d4cac208
Rescue encoding error on controller level
2012-05-31 23:36:52 +03:00
Nihad Abbasov
7c7761099c
fix deprecation warnings
2012-05-29 19:16:28 +05: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
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
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
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
1e4d15b406
Password & token split up, icon to button for top panel
2012-05-19 12:25:56 +03:00
Dmitriy Zaporozhets
9cd8f7b082
New Feature: Git Blame for file
2012-05-17 19:11:45 +03:00
Dmitriy Zaporozhets
28cb43135c
Hooks UI improved, Request tests added
2012-04-26 20:43:12 +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
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
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
45b18365d5
Fix an issue with MR unavailable if remove source branch
2012-04-19 23:06:45 +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
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
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
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
86676476e6
Handling big commits & big diff
2012-04-06 01:00:15 +03:00
Dmitriy Zaporozhets
6e2a6d925f
cleanup after prev commit
2012-04-05 01:58:23 +03:00
Dmitriy Zaporozhets
80ddd2c09d
Better encoding handling. Updated grit
2012-04-05 01:51:49 +03:00
Dmitriy Zaporozhets
11e4709fde
fix compatibility with old events
2012-04-04 02:49:58 +03:00
Dmitriy Zaporozhets
90748cf724
Merge Button v1 complete
2012-03-30 20:49:34 +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
78d620b3b6
Raw gitlab automerge feature
2012-03-29 18:03:05 +03:00
Dmitriy Zaporozhets
788de6f1c8
Better commit show page
2012-03-26 22:41:56 +03:00
Dmitriy Zaporozhets
8652cd8989
Preparing 591 for merge. Restyled issues & merge requests. Fixed issue edit.
2012-03-25 19:05:24 +03: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
6f2c193204
Fix issues search
2012-03-22 20:09:47 +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
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
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
5a3f23f395
Persist Merge Request diff. Auto merge request close on push
2012-03-15 00:57:43 +02:00
Dmitriy Zaporozhets
3676838dc9
Rspec test repo replaced.\nMerge Requests improved
2012-03-13 23:54:49 +02:00
Andrey Janzen
34ea7fdb36
fix typo
2012-03-12 09:02:05 +07:00
Dmitriy Zaporozhets
94befdd502
Events improved. Open/close issue, merge request events displayed
2012-03-07 00:13:43 -08:00
Abhi Devireddy
1bc0bd3244
Adapt to new web_hook_data method
...
Uses the first key that the user has for testing post receive hook.
2012-03-06 22:26:39 -06: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
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
c94159ab08
improved dashboard
2012-03-01 20:40:32 +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
376bec26de
Added dashboard page. Projects page not root from now
2012-02-28 22:59:36 +02:00
Dmitriy Zaporozhets
cd5c4bac50
notes count for wall
2012-02-27 20:34:55 +02:00
Dmitriy Zaporozhets
8470d70da6
notes controller refactored
2012-02-27 20:29:27 +02:00
Dmitriy Zaporozhets
1e689bfba3
fixed notes logic
2012-02-27 19:05:27 +02:00
Dmitriy Zaporozhets
460eeb13b7
Increased count of notes loaded when visit wall page
2012-02-24 22:48:27 +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
Dmitriy Zaporozhets
215a01f63c
move notes login to one controller
2012-02-24 09:16:06 +02:00
Dmitriy Zaporozhets
81092c0198
Status codes for errors, New error pages
2012-02-23 21:04:20 +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
9803e0885e
Project sidebar improved
2012-02-21 22:46:34 +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
49d58492f2
Wiki abilities
2012-02-20 21:16:55 +03: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
85974948e7
Wiki: history
2012-02-19 21:52:05 +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
Valeriy Sizov
a44b85be9e
Merge pull request #422 from steveprentice/master
...
This makes gitlabhq compatible with more LDAP servers (specifically OpenLDAP).
2012-02-19 03:45:55 -08:00
Dmitriy Zaporozhets
94db8a1c33
Usability & design improvements
2012-02-18 14:12:48 +02:00
Steve Prentice
2bb2dee057
Use the omniauth-ldap info object instead of the raw ldap info in extra.
...
This helps with compatibility with more LDAP providers as the implementation
doesn't depend on the exact names of the LDAP fields. The LDAP strategy
helps maps the attributes to the fields in the info object and we use the
info object to get the email and name.
This makes the LDAP auth compatible with most OpenLDAP servers as well.
2012-02-17 09:10:50 -08: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
Dmitriy Zaporozhets
a7bcc2eb5c
submodules displayed for tree view
2012-02-14 23:48:42 +02:00
Dmitriy Zaporozhets
ece9f50fb1
fixed unworking infinite scroll
2012-02-12 23:52:27 +02:00
Dmitriy Zaporozhets
cc043f32d8
Admin area improved
2012-02-11 19:56:18 +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
3d77183c16
Fix encoding issues for compare view
2012-02-07 19:21:16 +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
e64a174968
project membership widget. css fixes
2012-02-05 21:26:04 +02:00
Dmitriy Zaporozhets
0f83558bea
fixed branch switch for code view
2012-02-05 12:23:14 +02: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
fca1ffb888
Bootstrap: Issues, Merge Requests, SSH Key completed
2012-01-29 23:59:12 +02:00
Dmitriy Zaporozhets
ae5faf0fd3
Ajax branch/tag switch for tree view
2012-01-29 21:30:03 +02:00