summaryrefslogtreecommitdiff
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into feature/sm/35954-create-kubernetes-cluster-on-gke-...Shinya Maeda2017-10-0611-122/+178
|\
| * Merge branch 'fix_webhook_user_avatar_on_push' into 'master'Rémy Coutable2017-10-051-1/+1
| |\
| | * Use full URL of user avatar on webhook pushfix_webhook_user_avatar_on_pushVitaliy @blackst0ne Klachkov2017-10-051-1/+1
| * | Merge branch 'zj-gitaly-namespace-service' into 'master'Douwe Maan2017-10-054-6/+92
| |\ \
| | * | Fix namespace deletion testsZeger-Jan van de Weg2017-10-051-0/+2
| | * | Gitaly namespace service enabled for GitLabZeger-Jan van de Weg2017-10-054-6/+90
| * | | Merge branch 'rc/fix/gh-import-branches-performance' into 'master'Sean McGivern2017-10-056-115/+85
| |\ \ \
| | * | | Minor improvements after latest reviewRémy Coutable2017-10-052-6/+2
| | * | | Improve & simplify GitHub's representation classesRémy Coutable2017-10-054-17/+15
| | * | | Ensure the `import:github` task doesn't schedule an import jobRémy Coutable2017-10-051-4/+9
| | * | | Set `label_ids` and `assignee_ids` after the initial `save!`.Rémy Coutable2017-10-054-20/+42
| | * | | Fetch the remote if a PR has been created/updated after the last fetchRémy Coutable2017-10-051-4/+14
| | * | | Don't mark the import as finished if it wasn't successful in the `import:gith...Rémy Coutable2017-10-051-4/+10
| | * | | Ensure Github::Import#execute returns false if any errors occuredRémy Coutable2017-10-051-1/+1
| | * | | Set `ref_fetched` to `true` in Github::Import#fetch_pull_requestsRémy Coutable2017-10-051-0/+1
| | * | | Don't even check if the branch exists locally as we only use its name in GH i...Rémy Coutable2017-10-052-56/+4
| | * | | Don't check for commit existence in Github::Representation::Branch#exists?Rémy Coutable2017-10-052-9/+5
| | * | | Keep only the changes that are known to work wellRémy Coutable2017-10-052-23/+28
| | * | | Fetch and map refs/pull to refs/merge-requests in the GH importJames Lopez2017-10-052-28/+11
| | | |/ | | |/|
* | | | Security fix: redirection in google_api/authorizations_controllerShinya Maeda2017-10-061-0/+5
* | | | Use utc for time comparisionShinya Maeda2017-10-061-3/+8
* | | | Merge remote-tracking branch 'origin/master' into feature/sm/35954-create-kub...Kamil Trzcinski2017-10-0519-107/+115
|\ \ \ \ | |/ / /
| * | | Merge branch 'digitalmoksha/gitlab-ce-feature/verify_secondary_emails' into '...Sean McGivern2017-10-051-8/+2
| |\ \ \
| | * \ \ Merge branch 'master' into digitalmoksha/gitlab-ce-feature/verify_secondary_e...Douwe Maan2017-10-0582-611/+1574
| | |\ \ \
| | * | | | moved devise_for :emails to live under `profiles`, removing the needBrett Walker2017-09-231-1/+0
| | * | | | fix calls to Emails::DestroyServiceBrett Walker2017-09-231-2/+2
| | * | | | tweaks for rubocopBrett Walker2017-09-231-0/+1
| | * | | | Send a confirmation email when the user adds a secondary email address. Utili...Brett Walker2017-09-231-2/+0
| * | | | | Only add identities to a user if we find one in Gitlab::OAuth::User.38801-add-or-update-identities-should-only-work-if-gl-user-existsTiago Botelho2017-10-051-0/+2
| | |_|_|/ | |/| | |
| * | | | Merge branch 'use-simple-tmp-ref-path' into 'master'Sean McGivern2017-10-051-1/+1
| |\ \ \ \
| | * | | | Use simple path for tmp ref, avoiding extra dirLin Jen-Shin2017-10-051-1/+1
| | | |_|/ | | |/| |
| * | | | Merge branch 'declarative-policy-optimisations' into 'master'Robert Speicher2017-10-052-19/+32
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Speed up cached_pass? for composite rulesSean McGivern2017-10-051-8/+12
| | * | | Speed up DeclarativePolicy::Runner#steps_by_scoreSean McGivern2017-10-041-11/+20
| * | | | Remove 'Repo' prefix from API entitesVitaliy @blackst0ne Klachkov2017-10-0514-79/+78
| | |/ / | |/| |
* | | | spec/lib/google_api/auth_spec. spec/lib/google_api/cloud_platform/client_specShinya Maeda2017-10-051-1/+2
* | | | Merge branch 'master' into feature/sm/35954-create-kubernetes-cluster-on-gke-...Shinya Maeda2017-10-056-20/+84
|\ \ \ \ | |/ / /
| * | | Merge branch 'master' into 'master'Rémy Coutable2017-10-041-1/+1
| |\ \ \
| | * | | Sidekiq::MemoryKiller: Add missing space in log messageBenjamin Drung2017-10-041-1/+1
| | |/ /
| * | | Merge branch 'capture-rev-list-errors' into 'master'Sean McGivern2017-10-041-1/+1
| |\ \ \
| | * | | Include RevList error messages in exceptionscapture-rev-list-errorsJacob Vosmaer2017-10-031-1/+1
| * | | | Merge branch 'gitaly-fetch-ref' into 'master'Sean McGivern2017-10-041-13/+52
| |\ \ \ \
| | * | | | Let fetch_ref pull from Gitaly instead of from diskJacob Vosmaer2017-10-041-13/+52
| | | |/ / | | |/| |
| * | | | Merge branch 'missing-exception-variable' into 'master'Sean McGivern2017-10-041-1/+1
| |\ \ \ \
| | * | | | Add missing exception variableJacob Vosmaer2017-10-041-1/+1
| | |/ / /
| * | | | Merge branch 'merge-request-notes-performance' into 'master'Sean McGivern2017-10-041-2/+7
| |\ \ \ \
| | * | | | Use a UNION ALL for getting merge request notesmerge-request-notes-performanceYorick Peterse2017-10-021-2/+7
| * | | | | Load only the currently needed JS locale fileTim Zallmann2017-10-041-1/+1
| | |/ / / | |/| | |
| * | | | Merge branch 'gitaly-delete-branch' into 'master'Douwe Maan2017-10-042-1/+21
| |\ \ \ \
| | * | | | Add OperationService.UserDeleteBranch Gitaly RPCgitaly-delete-branchAlejandro Rodríguez2017-10-032-1/+21