summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'branches_with_no_parent' into 'master'Dmitriy Zaporozhets2014-07-141-1/+3
|\ | | | | | | | | | | | | | | | | | | Branches with no parent cannot be merged Solves `undefined method 'reduce' for false:FalseClass` Fixes #1415 See merge request !967
| * Branches without parent commit cannot be merged.Marin Jankovski2014-07-141-1/+3
| |
* | Remove thread-unsafe Dir.chdir from Satellite#lockJacob Vosmaer2014-07-141-1/+1
|/ | | | This is made possible by changes in gitlab-grit 2.6.10.
* Dont allow ? in project pathDmitriy Zaporozhets2014-07-081-1/+1
| | | | | | | Because it causes 500 error on every page where link to such project exists Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge pull request #7152 from bhuisgen/masterDmitriy Zaporozhets2014-07-081-1/+9
|\ | | | | Fix LDAP TLS authentication
| * Fix LDAP TLS authenticationBoris HUISGEN2014-06-191-1/+9
| |
* | Remove duplicated calls.Marin Jankovski2014-07-071-18/+11
| |
* | Add sanitize option to gitlab check rake task.Marin Jankovski2014-07-071-3/+26
| |
* | Merge pull request #7208 from MrMarvin/ce_rake_cleanup_ldap_usersDmitriy Zaporozhets2014-07-041-0/+24
|\ \ | | | | | | Adds rake task to clean up deleted LDAP users
| * | adds rake task to clean up deleted LDAP usersMarvin Frick2014-06-261-0/+24
| | |
* | | Dont show 'Remove source brnach' checkbox for forkDmitriy Zaporozhets2014-07-041-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | Remove source button checkbox always try to remove branch in target project. For fork source & target projects are differents - so we hide checkbox from UI. After MR accepted you can easily remove branch with 'Remove branch' button that do remove branch call to valid project Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge branch 'contributors-api' into 'master'Dmitriy Zaporozhets2014-07-033-0/+25
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Contributors api Fixes #1266 See merge request !934
| * | | Use Contributor class instead of hashDmitriy Zaporozhets2014-07-023-2/+6
| | | |
| * | | Move API contributors logic to repository modelDmitriy Zaporozhets2014-07-022-23/+10
| | | |
| * | | Collect contributors info via APIDmitriy Zaporozhets2014-07-021-0/+22
| | | |
| * | | Add contributors API endpointDmitriy Zaporozhets2014-07-021-0/+12
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Merge pull request #7204 from cirosantilli/user-validation-msgDmitriy Zaporozhets2014-07-021-0/+23
|\ \ \ \ | |/ / / |/| | | Fix username validation message to match regexp.
| * | | Fix username validation message to match regexp.Ciro Santilli2014-06-261-0/+23
| |/ / | | | | | | | | | Also used for project, group and web ui new file names.
* | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2014-06-301-1/+1
|\ \ \
| * \ \ Merge pull request #7170 from cirosantilli/add-trailing-newlinesSytse Sijbrandij2014-06-301-1/+1
| |\ \ \ | | |/ / | |/| | [minor-refactor] Add trailing newline to all text files.
| | * | Add trailing newline to all text files.Ciro Santilli2014-06-211-1/+1
| | |/ | | | | | | | | | Present in the large majority of files of each respective type.
* | | Fix signup and project visibilityDmitriy Zaporozhets2014-06-301-1/+1
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Make app works with strong paramsDmitriy Zaporozhets2014-06-264-4/+17
|/ / | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Return better error when account exists when attempting oauth account create.Marin Jankovski2014-06-241-1/+7
| |
* | Merge pull request #7013 from jvanbaarsen/better-webhook-informationDmitriy Zaporozhets2014-06-241-0/+25
|\ \ | | | | | | Return a little more information in Issue webhook
| * | Added an UrlBuilder for building rails named routesJeroen van Baarsen2014-06-131-0/+25
| | | | | | | | | | | | Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
* | | Move checking of recepients to a service.Marin Jankovski2014-06-231-5/+3
| | |
* | | Show @all in autocomplete list.Marin Jankovski2014-06-231-1/+6
| | |
* | | Merge branch 'gitlab_cache_clear' into 'master'Dmitriy Zaporozhets2014-06-231-1/+6
|\ \ \ | | | | | | | | | | | | Patch `rake cache:clear` for large amounts of keys
| * | | Patch `rake cache:clear` for large amounts of keysJacob Vosmaer2014-06-201-1/+6
| | |/ | |/|
* | | Merge branch 'remove-observers' into 'master'Dmitriy Zaporozhets2014-06-231-5/+8
|\ \ \ | |/ / |/| | | | | | | | | | | Remove observers from application Part of #1133
| * | Fix notes creation via APIDmitriy Zaporozhets2014-06-181-5/+8
| | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Fix mistake in reference_jira_issue methodAndrew Kumanyaev2014-06-181-1/+1
|/ / | | | | Use local variable instead global
* | Merge remote-tracking branch 'origin/issue_closing_widget'Dmitriy Zaporozhets2014-06-141-0/+16
|\ \ | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: CHANGELOG
| * | Detect closing issues in Merge Request descriptionJacob Vosmaer2014-06-131-0/+16
| | |
* | | Dont expose user email via APIDmitriy Zaporozhets2014-06-134-22/+30
|/ / | | | | | | | | | | | | | | | | | | | | | | | | To prevent leaking of users info we reduce amount of user information retrieved via API for normal users. What user can get via API: * if not admin: only id, state, name, username and avatar_url * if admin: all user information * about himself: all informaion Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Wipe wall notes featureDmitriy Zaporozhets2014-06-133-54/+1
|/ | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Skip init script checks on omnibus-gitlabJacob Vosmaer2014-06-121-0/+14
| | | | Omnibus-gitlab does not use the init script.
* Merge branch 'huge-repo-improve' into 'master'Dmitriy Zaporozhets2014-06-111-1/+1
|\ | | | | | | | | | | | | | | | | | | | | Better support for huge repositories This MR contains next improvements to GitLab: * You can see repo commits count even if it is > 100k commits * Prevent 500 for commit page for large repos * Add notice about huge push over http to unicorn config * File action in satellites uses default 30 seconds timeout instead of old 10 seconds one * Show spinner when loading data for network graph
| * Use same 30 seconds satellite timeout for all actionsDmitriy Zaporozhets2014-06-111-1/+1
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Strip apostrophe from email generated usernames.Marin Jankovski2014-06-112-2/+6
|/
* Merge branch 'email_with_apostrophe' into 'master'Dmitriy Zaporozhets2014-06-111-0/+21
|\ | | | | | | | | | | Email with apostrophe Fixes #1225
| * Test for the apostrophe in the emailMarin Jankovski2014-06-111-0/+0
| |
| * Remove email_validator gem and allow apostrophe as a valid character in email.Marin Jankovski2014-06-111-0/+21
| |
* | Merge pull request #7024 from skv-headless/linkto_issues_on_main_dashboardDmitriy Zaporozhets2014-06-112-36/+63
|\ \ | |/ |/| links to issues on main dashboard
| * links to issues on main dashboardskv2014-05-262-36/+63
| |
* | Replace milestone observer with servicesDmitriy Zaporozhets2014-06-101-19/+16
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Remove thread vars usage from API notes and mr'sDmitriy Zaporozhets2014-06-102-33/+26
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Remove set of thread variablesDmitriy Zaporozhets2014-06-102-16/+1
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Update check task and add to monthly release doc lines about ↵Marin Jankovski2014-06-101-1/+17
| | | | | | | | gitlab_shell_version file.
View Lorry Controller Status