summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* 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.
* | fix permissions for files APINihad Abbasov2014-06-061-1/+8
| |
* | Merge pull request #7075 from jvanbaarsen/split-spinach-testsDmitriy Zaporozhets2014-06-051-0/+21
|\ \ | | | | | | Splitted the Spinach tests to prevent time-outs
| * | Splitted the Spinach tests to prevent time-outsJeroen van Baarsen2014-06-041-0/+21
| | | | | | | | | | | | Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
* | | Move gitlab-ssl nginx config from gitlab-recipesAchilleas Pipinellis2014-06-051-0/+164
|/ /
* | Ensure sidekiq is displayed by setting X-Frame-Options.GitLab2014-06-031-0/+1
| |
* | Bump gitlab-shell versionDmitriy Zaporozhets2014-05-311-1/+1
| | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2014-05-302-1/+2
|\ \
| * \ Merge pull request #6882 from Tandrial/masterDmitriy Zaporozhets2014-05-301-1/+1
| |\ \ | | | | | | | | Satellites access fix
| | * | Satellites access fixMichael Krane2014-04-271-1/+1
| | | |
| * | | Merge pull request #6986 from agjmills/masterDmitriy Zaporozhets2014-05-301-0/+1
| |\ \ \ | | | | | | | | | | added SYSV chkconfig property so gitlab starts after MySQLd / nginx
| | * | | added SYSV chkconfig property so gitlab starts after MySQLd / nginxAlexander Mills2014-05-161-0/+1
| | | | |
* | | | | Dont allow git tag rewrite/removal unless you are masterDmitriy Zaporozhets2014-05-301-0/+3
|/ / / / | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Merge pull request #7014 from asedge/api_create_tagDmitriy Zaporozhets2014-05-291-0/+16
|\ \ \ \ | | | | | | | | | | Add CreateTagService. Use new service to allow tag creation through API.
| * | | | Add CreateTagService. Use new service to allow tag creation through API.Sean Edge2014-05-231-0/+16
| | |_|/ | |/| |
* | | | Use new Projects::TransferService classDmitriy Zaporozhets2014-05-281-3/+5
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Remove old rake taskDmitriy Zaporozhets2014-05-281-111/+0
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Move from script to bin directory.Marin Jankovski2014-05-273-11/+11
| | | |
* | | | Merge branch 'compare-api' into 'master'Dmitriy Zaporozhets2014-05-272-0/+41
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Compare api Fixes #1165
| * | | | Better specs for Compare APIDmitriy Zaporozhets2014-05-271-1/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Expose timeout and same_ref compare fieldsDmitriy Zaporozhets2014-05-272-1/+7
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | Add compare branches endpoint to APIDmitriy Zaporozhets2014-05-262-0/+33
| |/ / / | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Merge branch 'no_link_inside_code_block' into 'master'Dmitriy Zaporozhets2014-05-271-18/+3
|\ \ \ \ | | | | | | | | | | | | | | | No link inside code block
| * | | | Add feature spec.Marin Jankovski2014-05-261-3/+3
| | | | |
View Lorry Controller Status