Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #443 from CedricGatay/fix/incorrectLineNumberingInDiffv2.2.0 | Dmitriy Zaporozhets | 2012-02-22 | 1 | -2/+2 |
|\ | | | | | Incorrect line numbering in diff | ||||
| * | Incorrect line numbering in diff | Cedric Gatay | 2012-02-22 | 1 | -2/+2 |
|/ | | | | | When displaying a diff, the line number always starts at one, even if the first diff is not at the first line Fixes this to display correct line numbering on first diff | ||||
* | Abilities extended. Resources security improved | Dmitriy Zaporozhets | 2012-02-22 | 16 | -52/+51 |
| | |||||
* | btn padded class | Dmitriy Zaporozhets | 2012-02-21 | 3 | -3/+6 |
| | |||||
* | separated buttons for sidebar | Dmitriy Zaporozhets | 2012-02-21 | 1 | -6/+10 |
| | |||||
* | Project sidebar improved | Dmitriy Zaporozhets | 2012-02-21 | 3 | -9/+25 |
| | |||||
* | Help message for wiki, styled projects page | Dmitriy Zaporozhets | 2012-02-21 | 11 | -32/+71 |
| | |||||
* | Merge branch 'wiki' | Dmitriy Zaporozhets | 2012-02-21 | 22 | -17/+294 |
|\ | | | | | | | | | Conflicts: app/views/layouts/_project_menu.html.haml | ||||
| * | wiki: rspec | vsizov | 2012-02-21 | 8 | -260/+40 |
| | | |||||
| * | Wiki abilities | Dmitriy Zaporozhets | 2012-02-20 | 3 | -17/+41 |
| | | |||||
| * | wiki is done | vsizov | 2012-02-20 | 8 | -7/+42 |
| | | |||||
| * | wiki: markdown support | Valery Sizov | 2012-02-19 | 1 | -3/+1 |
| | | |||||
| * | wiki: improve history | Valery Sizov | 2012-02-19 | 1 | -1/+6 |
| | | |||||
| * | Wiki: history | Valery Sizov | 2012-02-19 | 7 | -4/+41 |
| | | |||||
| * | Wiki: fixed main menu | Valery Sizov | 2012-02-19 | 1 | -1/+1 |
| | | |||||
| * | Wiki: remove notice line | Valery Sizov | 2012-02-19 | 1 | -2/+0 |
| | | |||||
| * | fix shema after rebase | Valery Sizov | 2012-02-19 | 1 | -4/+0 |
| | | |||||
| * | Wiki: design fixed | Valery Sizov | 2012-02-19 | 5 | -11/+18 |
| | | |||||
| * | Wiki: base implemetation logic | Valery Sizov | 2012-02-19 | 8 | -68/+35 |
| | | |||||
| * | wiki base sceleton | Valery Sizov | 2012-02-19 | 20 | -0/+432 |
| | | |||||
* | | make issue, commit row title color lighter | Dmitriy Zaporozhets | 2012-02-20 | 4 | -5/+7 |
| | | |||||
* | | pollishing UI | Dmitriy Zaporozhets | 2012-02-20 | 5 | -7/+14 |
| | | |||||
* | | fixed forgot password formv2.2.0pre | Dmitriy Zaporozhets | 2012-02-20 | 4 | -27/+21 |
| | | |||||
* | | Some css fixes | Dmitriy Zaporozhets | 2012-02-20 | 1 | -1/+6 |
| | | |||||
* | | css shadow for some components | Dmitriy Zaporozhets | 2012-02-20 | 3 | -8/+15 |
| | | |||||
* | | Home tab added, Repository tab removed\n Ability to download branch | Dmitriy Zaporozhets | 2012-02-20 | 22 | -94/+125 |
| | | |||||
* | | fixed bug with branch/commit detection in select | Dmitriy Zaporozhets | 2012-02-20 | 1 | -1/+1 |
| | | |||||
* | | fixed mr counter for main menu | Dmitriy Zaporozhets | 2012-02-19 | 1 | -1/+1 |
| | | |||||
* | | Issues, Merge Requests counters | Dmitriy Zaporozhets | 2012-02-19 | 4 | -13/+27 |
|/ | |||||
* | Merge branch 'master' of dev.gitlabhq.com:gitlabhq | Dmitriy Zaporozhets | 2012-02-19 | 2 | -6/+6 |
|\ | |||||
| * | Merge pull request #422 from steveprentice/master | Valeriy Sizov | 2012-02-19 | 2 | -6/+6 |
| |\ | | | | | | | This makes gitlabhq compatible with more LDAP servers (specifically OpenLDAP). | ||||
| | * | Use the omniauth-ldap info object instead of the raw ldap info in extra. | Steve Prentice | 2012-02-17 | 2 | -6/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
* | | | fixed layout for ipad | Dmitriy Zaporozhets | 2012-02-19 | 5 | -15/+30 |
| | | | |||||
* | | | preparing to v2.2 | Dmitriy Zaporozhets | 2012-02-19 | 3 | -3/+3 |
|/ / | |||||
* | | fix travis after config rename | Dmitriy Zaporozhets | 2012-02-19 | 1 | -0/+2 |
| | | |||||
* | | Merge branch 'config-examples' of https://github.com/artiom/gitlabhq into ↵ | Dmitriy Zaporozhets | 2012-02-19 | 3 | -0/+2 |
|\ \ | | | | | | | | | | | | | | | | | | | artiom-config-examples Conflicts: .gitignore | ||||
| * | | rename database config to example | Artiom Lunev | 2011-12-12 | 2 | -1/+2 |
| | | | |||||
| * | | rename gitlab config file to example | Artiom Lunev | 2011-12-12 | 2 | -0/+1 |
| | | | |||||
* | | | Merge pull request #426 from RLovelett/resque-update | Dmitriy Zaporozhets | 2012-02-19 | 2 | -3/+3 |
|\ \ \ | | | | | | | | | Fixes :public Warning In Resque When Running Any Rails Command | ||||
| * | | | Fixes the issue with Resque where it was complaining about :public no longer ↵ | Ryan Lovelett | 2012-02-18 | 2 | -3/+3 |
|/ / / | | | | | | | | | | being used. | ||||
* | | | Fixed widget counts, improved styles | Dmitriy Zaporozhets | 2012-02-18 | 19 | -80/+102 |
| | | | |||||
* | | | How to merge instructions | Dmitriy Zaporozhets | 2012-02-18 | 7 | -1/+388 |
| | | | |||||
* | | | Usability & design improvements | Dmitriy Zaporozhets | 2012-02-18 | 21 | -91/+192 |
| |/ |/| | |||||
* | | Fixed mistype in permissions, Fixed migration | Dmitriy Zaporozhets | 2012-02-16 | 2 | -2/+6 |
| | | |||||
* | | Fixed permission migration | Dmitriy Zaporozhets | 2012-02-16 | 1 | -1/+1 |
| | | |||||
* | | 4 roles permission system | Dmitriy Zaporozhets | 2012-02-16 | 18 | -111/+66 |
| | | |||||
* | | Updated readme, Roles in progress | Dmitriy Zaporozhets | 2012-02-15 | 15 | -66/+164 |
| | | |||||
* | | ProtectedBranches model, Master permission for repo\n Allow push to ↵ | Dmitriy Zaporozhets | 2012-02-15 | 14 | -53/+229 |
| | | | | | | | | protected branch for masters only | ||||
* | | Show current commit id in branch/tag select | Dmitriy Zaporozhets | 2012-02-15 | 1 | -0/+7 |
| | | |||||
* | | Merge branch 'master' of dev.gitlabhq.com:gitlabhq | Dmitriy Zaporozhets | 2012-02-15 | 1 | -1/+1 |
|\ \ |