summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix a number of discovered typos, capitalization of developer andEwan Edwards2015-02-0328-72/+72
* Make all non-config/non-operational mentions of URL consistentlyEwan Edwards2015-01-3010-23/+23
* Fix specs for iconsDmitriy Zaporozhets2015-01-301-0/+3
* Set right test as trickyDmitriy Zaporozhets2015-01-291-2/+2
* Fix semaphore spinach tagsDmitriy Zaporozhets2015-01-291-2/+2
* Skip tricky test for semaphoreDmitriy Zaporozhets2015-01-292-2/+8
* Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2015-01-2913-53/+56
|\
| * Merge pull request #8670 from tsigo/rs-fa-icon-helperDmitriy Zaporozhets2015-01-299-41/+42
| |\
| | * Use `icon` helper method in helper modulesRobert Speicher2015-01-287-27/+19
| | * Move `spinner` helper into IconsHelperRobert Speicher2015-01-282-9/+9
| | * Add `icon` helper methodRobert Speicher2015-01-281-5/+14
| * | Merge pull request #8687 from tsigo/rs-pry-railsDmitriy Zaporozhets2015-01-292-2/+4
| |\ \
| | * | Use pry-rails gem instead of pryRobert Speicher2015-01-292-2/+4
| * | | Merge pull request #8688 from tsigo/rs-clean-spec-outputDmitriy Zaporozhets2015-01-294-10/+10
| |\ \ \
| | * | | Update shoulda-matchersRobert Speicher2015-01-293-6/+6
| | * | | Remove errant print statements from votes specRobert Speicher2015-01-291-4/+4
| | |/ /
* | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqDmitriy Zaporozhets2015-01-297-15/+47
|\ \ \ \
| * \ \ \ Merge branch 'improve-calendar-widget' into 'master'Dmitriy Zaporozhets2015-01-307-15/+47
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Use tile avatars for user/group show pagesDmitriy Zaporozhets2015-01-293-2/+6
| | * | | Remove : from headersDmitriy Zaporozhets2015-01-292-3/+3
| | * | | Improve contribution calendar on user pageDmitriy Zaporozhets2015-01-293-10/+38
* | | | | Update changelog with version 7.7.2Dmitriy Zaporozhets2015-01-291-0/+4
|/ / / /
* | | | Merge pull request #8642 from fchasen/masterDmitriy Zaporozhets2015-01-291-1/+4
|\ \ \ \ | |/ / / |/| | |
| * | | use new hash syntaxFred Chasen2015-01-231-4/+4
| * | | Split up line and use single qoutes to declare Cors settingsFred Chasen2015-01-231-1/+4
| * | | Expose Link header in CORS Api callsFred Chasen2015-01-231-1/+1
* | | | Merge pull request #8676 from tsigo/rs-repository-cacheDmitriy Zaporozhets2015-01-293-37/+83
|\ \ \ \
| * | | | Refactor Repository to use new RepositoryCache classRobert Speicher2015-01-293-37/+83
| | |/ / | |/| |
* | | | Fix calendar jsDmitriy Zaporozhets2015-01-291-2/+0
* | | | Bump gitlab-shell versionDmitriy Zaporozhets2015-01-291-1/+1
* | | | Merge branch 'ldap-email-match' into 'master'Dmitriy Zaporozhets2015-01-292-2/+23
|\ \ \ \ | |/ / / |/| | |
| * | | Improvements to LDAP::User modelDmitriy Zaporozhets2015-01-292-2/+23
|/ / /
* | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqDmitriy Zaporozhets2015-01-295-22/+39
|\ \ \
| * \ \ Merge branch 'calendar-via-ajax' into 'master'Dmitriy Zaporozhets2015-01-295-22/+39
| |\ \ \
| | * | | Improve user calendar authentification and testsDmitriy Zaporozhets2015-01-292-6/+8
| | * | | Load contribution calendar via AJAXDmitriy Zaporozhets2015-01-294-17/+32
| |/ / /
* | | | Merge branch 'master' into 'master'Robert Schilling2015-01-291-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Bump Gitlab for Docker to 7.7.1Vincent Robert2015-01-291-1/+1
|/ / /
* | | Make sure we dont have exception on date parsingDmitriy Zaporozhets2015-01-291-2/+2
* | | Cleanup and make contribution calendar fasterDmitriy Zaporozhets2015-01-298-163/+40
* | | Merge branch 'gitlab_importer' into 'master'Dmitriy Zaporozhets2015-01-294-2/+22
|\ \ \
| * | | update changelogValery Sizov2015-01-281-0/+2
| * | | an ability to clone project with oauth2 tokenValery Sizov2015-01-283-2/+20
* | | | Merge branch 'ux-fixes' into 'master'Dmitriy Zaporozhets2015-01-296-6/+26
|\ \ \ \
| * | | | Better wordingDmitriy Zaporozhets2015-01-281-1/+1
| * | | | Fix test for merge requestDmitriy Zaporozhets2015-01-281-1/+3
| * | | | Improve wording for fork project pageDmitriy Zaporozhets2015-01-281-1/+2
| * | | | Improve UX for widget if merge request can not be mergedDmitriy Zaporozhets2015-01-282-2/+10
| * | | | Project/Group access dropdown should contain link to permissions help pageDmitriy Zaporozhets2015-01-282-2/+11
| | |_|/ | |/| |
* | | | Merge branch 'haynes/gitlab-ce-commit_calendar'Dmitriy Zaporozhets2015-01-2816-8/+364
|\ \ \ \
View Lorry Controller Status