| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | | Log Sidekiq arguments | Jacob Vosmaer | 2014-07-28 | 1 | -0/+10 | |
| | | | | ||||||
| * | | | Merge pull request #7141 from PuzzleFlow/uid_should_always_be_string | Dmitriy Zaporozhets | 2014-07-23 | 1 | -1/+3 | |
| |\ \ \ | | | | | | | | | Ensure that uid in OAuth is a string | |||||
| | * | | | ensure that uid is a string | Paweł Świątkowski | 2014-06-21 | 1 | -1/+3 | |
| | | |/ | |/| | ||||||
| * | | | Merge pull request #7318 from jvanbaarsen/constant-warning-fix | Dmitriy Zaporozhets | 2014-07-23 | 2 | -9/+9 | |
| |\ \ \ | | | | | | | | | Removed some constant allready defined warnings | |||||
| | * | | | Removed some constant allready defined warnings | Jeroen van Baarsen | 2014-07-16 | 2 | -9/+9 | |
| | | |/ | |/| | | | | | | | Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com> | |||||
| * | | | Add support to set satellites timeout | Ayrton Araújo | 2014-07-21 | 1 | -1/+1 | |
| |/ / | ||||||
| * | | Merge branch 'branches_with_no_parent' into 'master' | Dmitriy Zaporozhets | 2014-07-14 | 1 | -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 Jankovski | 2014-07-14 | 1 | -1/+3 | |
| | | | | ||||||
| * | | | Remove thread-unsafe Dir.chdir from Satellite#lock | Jacob Vosmaer | 2014-07-14 | 1 | -1/+1 | |
| |/ / | | | | | | | This is made possible by changes in gitlab-grit 2.6.10. | |||||
| * | | Dont allow ? in project path | Dmitriy Zaporozhets | 2014-07-08 | 1 | -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/master | Dmitriy Zaporozhets | 2014-07-08 | 1 | -1/+9 | |
| |\ \ | | | | | | | Fix LDAP TLS authentication | |||||
| | * | | Fix LDAP TLS authentication | Boris HUISGEN | 2014-06-19 | 1 | -1/+9 | |
| | |/ | ||||||
| * | | Dont show 'Remove source brnach' checkbox for fork | Dmitriy Zaporozhets | 2014-07-04 | 1 | -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 Zaporozhets | 2014-07-03 | 1 | -0/+9 | |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | Contributors api Fixes #1266 See merge request !934 | |||||
| | * | | Use Contributor class instead of hash | Dmitriy Zaporozhets | 2014-07-02 | 1 | -1/+1 | |
| | | | | ||||||
| | * | | Move API contributors logic to repository model | Dmitriy Zaporozhets | 2014-07-02 | 1 | -0/+9 | |
| | | | | ||||||
| * | | | Merge pull request #7204 from cirosantilli/user-validation-msg | Dmitriy Zaporozhets | 2014-07-02 | 1 | -0/+23 | |
| |\ \ \ | |/ / |/| | | Fix username validation message to match regexp. | |||||
| | * | | Fix username validation message to match regexp. | Ciro Santilli | 2014-06-26 | 1 | -0/+23 | |
| | | | | | | | | | | | | | Also used for project, group and web ui new file names. | |||||
| * | | | Make app works with strong params | Dmitriy Zaporozhets | 2014-06-26 | 2 | -1/+10 | |
| |/ / | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
| * | | Return better error when account exists when attempting oauth account create. | Marin Jankovski | 2014-06-24 | 1 | -1/+7 | |
| | | | ||||||
| * | | Merge pull request #7013 from jvanbaarsen/better-webhook-information | Dmitriy Zaporozhets | 2014-06-24 | 1 | -0/+25 | |
| |\ \ | | | | | | | Return a little more information in Issue webhook | |||||
| | * | | Added an UrlBuilder for building rails named routes | Jeroen van Baarsen | 2014-06-13 | 1 | -0/+25 | |
| | | | | | | | | | | | | | Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com> | |||||
| * | | | Move checking of recepients to a service. | Marin Jankovski | 2014-06-23 | 1 | -5/+3 | |
| | | | | ||||||
| * | | | Show @all in autocomplete list. | Marin Jankovski | 2014-06-23 | 1 | -1/+6 | |
| | |/ |/| | ||||||
| * | | Fix mistake in reference_jira_issue method | Andrew Kumanyaev | 2014-06-18 | 1 | -1/+1 | |
| | | | | | | | Use local variable instead global | |||||
| * | | Detect closing issues in Merge Request description | Jacob Vosmaer | 2014-06-13 | 1 | -0/+16 | |
| |/ | ||||||
| * | Merge branch 'huge-repo-improve' into 'master' | Dmitriy Zaporozhets | 2014-06-11 | 1 | -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 actions | Dmitriy Zaporozhets | 2014-06-11 | 1 | -1/+1 | |
| | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
| * | | Strip apostrophe from email generated usernames. | Marin Jankovski | 2014-06-11 | 2 | -2/+6 | |
| |/ | ||||||
| * | Merge pull request #7024 from skv-headless/linkto_issues_on_main_dashboard | Dmitriy Zaporozhets | 2014-06-11 | 2 | -36/+63 | |
| |\ | | | | | links to issues on main dashboard | |||||
| | * | links to issues on main dashboard | skv | 2014-05-26 | 2 | -36/+63 | |
| | | | ||||||
| * | | Remove set of thread variables | Dmitriy Zaporozhets | 2014-06-10 | 1 | -6/+1 | |
| | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
| * | | Dont allow git tag rewrite/removal unless you are master | Dmitriy Zaporozhets | 2014-05-30 | 1 | -0/+3 | |
| |/ | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
| * | Dont allow remove of protected branch | Dmitriy Zaporozhets | 2014-05-22 | 1 | -8/+12 | |
| | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
| * | Move user access check to Gitlab::UserAccess | Jacob Vosmaer | 2014-05-15 | 2 | -12/+19 | |
| | | ||||||
| * | Improve ad_disabled method name | Jacob Vosmaer | 2014-05-14 | 2 | -2/+2 | |
| | | ||||||
| * | Document the Active Directory magic numbers | Jacob Vosmaer | 2014-05-14 | 1 | -0/+3 | |
| | | ||||||
| * | Use LDAP::Access.open to reuse the LDAP connection | Jacob Vosmaer | 2014-05-14 | 1 | -2/+2 | |
| | | ||||||
| * | Fix syntax error in AD disabled user filter | Jacob Vosmaer | 2014-05-14 | 1 | -1/+1 | |
| | | ||||||
| * | Check for the AD disabled flag in Access#allowed? | Jacob Vosmaer | 2014-05-14 | 1 | -1/+5 | |
| | | ||||||
| * | Add LDAP::Person#ad_disabled? | Jacob Vosmaer | 2014-05-14 | 1 | -0/+7 | |
| | | | | | | Check the bit for disabled Active Directory users. The filter is based on http://ctogonewild.com/2009/09/03/bitmask-searches-in-ldap/ . | |||||
| * | Backport Adapter#dn_matches_filter? from EE | Jacob Vosmaer | 2014-05-14 | 1 | -0/+4 | |
| | | ||||||
| * | Backport Adapter#ldap_search from EE | Jacob Vosmaer | 2014-05-14 | 1 | -1/+17 | |
| | | ||||||
| * | Add support for Jira ticket mentions in format JIRA-123. | Marin Jankovski | 2014-05-13 | 1 | -4/+16 | |
| | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: CHANGELOG-EE | |||||
| * | Use uid as username when creating user with LDAP | Julien Pivotto | 2014-05-12 | 1 | -1/+3 | |
| | | | | | | | | Without that commit, each user created by a LDAP login would have the first part of their email address as nickname. This is not useful for LDAP, where a uid attribute is already set. | |||||
| * | Clean up conditional statement in `name` method. | C. Morgan Hamill | 2014-05-08 | 1 | -3/+3 | |
| | | | | Reverse the conditional order to avoid awkward `if !` construction. | |||||
| * | Clean up of `name` fallback code. | C. Morgan Hamill | 2014-05-07 | 1 | -3/+3 | |
| | | | | | Don't use `unless` for the conditional. Avoid double-quotes where possible. | |||||
| * | Provide fallback for missing `name` value. | C. Morgan Hamill | 2014-05-07 | 1 | -1/+5 | |
| | | | | | If `auth.info.name` is `nil`, then use `auth.info.first_name + auth.info.last_name` as the value of `name`. | |||||
| * | Add CompareAction class for collecting commits and diffs using satellites | Dmitriy Zaporozhets | 2014-05-07 | 1 | -0/+53 | |
| | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
| * | Clean working directory in satellite | Dmitriy Zaporozhets | 2014-05-05 | 1 | -0/+1 | |
| | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | |||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |