summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #443 from CedricGatay/fix/incorrectLineNumberingInDiffv2.2.0Dmitriy Zaporozhets2012-02-221-2/+2
|\ | | | | Incorrect line numbering in diff
| * Incorrect line numbering in diffCedric Gatay2012-02-221-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 improvedDmitriy Zaporozhets2012-02-2216-52/+51
|
* btn padded classDmitriy Zaporozhets2012-02-213-3/+6
|
* separated buttons for sidebarDmitriy Zaporozhets2012-02-211-6/+10
|
* Project sidebar improvedDmitriy Zaporozhets2012-02-213-9/+25
|
* Help message for wiki, styled projects pageDmitriy Zaporozhets2012-02-2111-32/+71
|
* Merge branch 'wiki'Dmitriy Zaporozhets2012-02-2122-17/+294
|\ | | | | | | | | Conflicts: app/views/layouts/_project_menu.html.haml
| * wiki: rspecvsizov2012-02-218-260/+40
| |
| * Wiki abilitiesDmitriy Zaporozhets2012-02-203-17/+41
| |
| * wiki is donevsizov2012-02-208-7/+42
| |
| * wiki: markdown supportValery Sizov2012-02-191-3/+1
| |
| * wiki: improve historyValery Sizov2012-02-191-1/+6
| |
| * Wiki: historyValery Sizov2012-02-197-4/+41
| |
| * Wiki: fixed main menuValery Sizov2012-02-191-1/+1
| |
| * Wiki: remove notice lineValery Sizov2012-02-191-2/+0
| |
| * fix shema after rebaseValery Sizov2012-02-191-4/+0
| |
| * Wiki: design fixedValery Sizov2012-02-195-11/+18
| |
| * Wiki: base implemetation logicValery Sizov2012-02-198-68/+35
| |
| * wiki base sceletonValery Sizov2012-02-1920-0/+432
| |
* | make issue, commit row title color lighterDmitriy Zaporozhets2012-02-204-5/+7
| |
* | pollishing UIDmitriy Zaporozhets2012-02-205-7/+14
| |
* | fixed forgot password formv2.2.0preDmitriy Zaporozhets2012-02-204-27/+21
| |
* | Some css fixesDmitriy Zaporozhets2012-02-201-1/+6
| |
* | css shadow for some componentsDmitriy Zaporozhets2012-02-203-8/+15
| |
* | Home tab added, Repository tab removed\n Ability to download branchDmitriy Zaporozhets2012-02-2022-94/+125
| |
* | fixed bug with branch/commit detection in selectDmitriy Zaporozhets2012-02-201-1/+1
| |
* | fixed mr counter for main menuDmitriy Zaporozhets2012-02-191-1/+1
| |
* | Issues, Merge Requests countersDmitriy Zaporozhets2012-02-194-13/+27
|/
* Merge branch 'master' of dev.gitlabhq.com:gitlabhqDmitriy Zaporozhets2012-02-192-6/+6
|\
| * Merge pull request #422 from steveprentice/masterValeriy Sizov2012-02-192-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 Prentice2012-02-172-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 ipadDmitriy Zaporozhets2012-02-195-15/+30
| | |
* | | preparing to v2.2Dmitriy Zaporozhets2012-02-193-3/+3
|/ /
* | fix travis after config renameDmitriy Zaporozhets2012-02-191-0/+2
| |
* | Merge branch 'config-examples' of https://github.com/artiom/gitlabhq into ↵Dmitriy Zaporozhets2012-02-193-0/+2
|\ \ | | | | | | | | | | | | | | | | | | artiom-config-examples Conflicts: .gitignore
| * | rename database config to exampleArtiom Lunev2011-12-122-1/+2
| | |
| * | rename gitlab config file to exampleArtiom Lunev2011-12-122-0/+1
| | |
* | | Merge pull request #426 from RLovelett/resque-updateDmitriy Zaporozhets2012-02-192-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 Lovelett2012-02-182-3/+3
|/ / / | | | | | | | | | being used.
* | | Fixed widget counts, improved stylesDmitriy Zaporozhets2012-02-1819-80/+102
| | |
* | | How to merge instructionsDmitriy Zaporozhets2012-02-187-1/+388
| | |
* | | Usability & design improvementsDmitriy Zaporozhets2012-02-1821-91/+192
| |/ |/|
* | Fixed mistype in permissions, Fixed migrationDmitriy Zaporozhets2012-02-162-2/+6
| |
* | Fixed permission migrationDmitriy Zaporozhets2012-02-161-1/+1
| |
* | 4 roles permission systemDmitriy Zaporozhets2012-02-1618-111/+66
| |
* | Updated readme, Roles in progressDmitriy Zaporozhets2012-02-1515-66/+164
| |
* | ProtectedBranches model, Master permission for repo\n Allow push to ↵Dmitriy Zaporozhets2012-02-1514-53/+229
| | | | | | | | protected branch for masters only
* | Show current commit id in branch/tag selectDmitriy Zaporozhets2012-02-151-0/+7
| |
* | Merge branch 'master' of dev.gitlabhq.com:gitlabhqDmitriy Zaporozhets2012-02-151-1/+1
|\ \